Hi all,
You may be aware that the OpenSSL license is incompatible with the GPL
(http://people.gnome.org/~markmc/openssl-and-the-gpl.html) and so SIPp,
which is licensed under the GPL, can't be distributed if linked against
it. See https://sourceforge.net/mailarchive/message.php?msg_id=27062924
for an example of how this is causing problems - the Debian SIPp
package, which lacks this OpenSSL support, can't do authentication nor
TLS.
It seemed to me that we shouldn't really need to link with OpenSSL for
authentication - all we're doing there is an MD5 digest. So I've created
a patch, which does the following:
* Includes md5.h and md5.c from
https://sourceforge.net/projects/libmd5-rfc/ (which is zlib-licensed and
GPL-compatible)
* Updates auth.c to use these MD5 functions instead
* Updates the Makefile to use these files for authentication support by
default
* Removed any #ifdef _USE_OPENSSL statements which related to
authentication
* Merged auth-username patch from Dmitry Semyonov (#2892694)
* Merged auth-int patch from Jordan Walbesser (#2776238)
* Reorganised the help text so that authentication parameters aren't in
a separate section along with TLS ones.
Note that for actual TLS transport support SIPp will still need to be
built against OpenSSL, but I think this is less mainstream and so I'm
more comfortable with its being excluded from Debian et al. That said, I
do want to try and move to GnuTLS at some point to eradicate the
licensing issue entirely.
I've tested this with a simple user/password pair ("alpha"/"beta") and
it generates identical responses to SIPp with OpenSSL for both MD5 and
AKAv1-MD5.
I'd like any comments on the patch itself, the desirability of this new
feature, and the merits of a move to GnuTLS.
Best,
Rob
diff --git a/Makefile b/Makefile
index ee57ed1..7c6d8af 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,10 @@ VERINFO=-DSVN_VERSION="\"$(SVN_VERSION)\""
OUTPUT=sipp
# C & C++ object files to be built
-OBJ= xp_parser.o message.o scenario.o screen.o call.o comp.o sipp.o stat.o \
- actions.o variables.o infile.o deadcall.o task.o socketowner.o listener.o \
- opentask.o reporttask.o watchdog.o
+OBJ= rijndael.o md5.o milenage.o auth.o xp_parser.o message.o scenario.o \
+ screen.o call.o comp.o sipp.o stat.o actions.o variables.o infile.o \
+ deadcall.o task.o socketowner.o listener.o opentask.o reporttask.o \
+ watchdog.o
# Libraries directories
LIBDIR_linux=
@@ -159,23 +160,23 @@ INCDIR=$(INCDIR_$(SYSTEM))
-include local.mk
-# Building without TLS and authentication (no openssl pre-requisite)
+# Building without TLS (no openssl pre-requisite)
all:
$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)
unittest:
$(MAKE) UNITTEST="-DSIPP_UNITTEST" OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)
-# Building with TLS and authentication
+# Building with TLS
ossl:
- $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" $(OUTPUT)
+ $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="sslinit.o sslthreadsafe.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" $(OUTPUT)
#Building with PCAP play
pcapplay:
$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT)
pcapplay_ossl:
- $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lpcap `if test -f ./ext; then echo -L./ext/lib; fi;`" PCAPPLAY="-DPCAPPLAY `if test -f ./ext; then echo -I./ext/include; fi;`" $(OUTPUT)
+ $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="sslinit.o sslthreadsafe.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lpcap `if test -f ./ext; then echo -L./ext/lib; fi;`" PCAPPLAY="-DPCAPPLAY `if test -f ./ext; then echo -I./ext/include; fi;`" $(OUTPUT)
pcapplay_hp_li_ia:
@_HPUX_LI_FLAG=-D_HPUX_LI ; export _HPUX_LI_FLAG ; $(MAKE) pcapplay
@@ -187,7 +188,7 @@ pcapplay_cygwin:
$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT)
pcapplay_ossl_cygwin:
- $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT)
+ $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="sslinit.o sslthreadsafe.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT)
$(OUTPUT): $(OBJ_TLS) $(OBJ_PCAPPLAY) $(OBJ)
$(CCLINK) $(LFLAGS) $(MFLAGS) $(LIBDIR_$(SYSTEM)) \
diff --git a/auth.c b/auth.c
index 3e96037..1509879 100644
--- a/auth.c
+++ b/auth.c
@@ -29,7 +29,7 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <openssl/md5.h>
+#include "md5.h"
#include "milenage.h"
#include "screen.hpp"
@@ -90,10 +90,11 @@ int createAuthHeaderAKAv1MD5(char * user, char * OP,
/* This function is from RFC 2617 Section 5 */
-void hashToHex (unsigned char *_b, unsigned char *_h)
+void hashToHex (md5_byte_t *_b_raw, unsigned char *_h)
{
unsigned short i;
unsigned char j;
+ unsigned char *_b = (unsigned char *) _b_raw;
for (i = 0; i < MD5_HASH_SIZE; i++) {
j = (_b[i] >> 4) & 0xf;
@@ -215,14 +216,14 @@ int createAuthHeaderMD5(char * user, char * password, int password_len, char * m
char * uri, char * msgbody, char * auth,
char * algo, char * result) {
- unsigned char ha1[MD5_HASH_SIZE], ha2[MD5_HASH_SIZE];
- unsigned char resp[MD5_HASH_SIZE], body[MD5_HASH_SIZE];
+ md5_byte_t ha1[MD5_HASH_SIZE], ha2[MD5_HASH_SIZE];
+ md5_byte_t resp[MD5_HASH_SIZE], body[MD5_HASH_SIZE];
unsigned char ha1_hex[HASH_HEX_SIZE+1], ha2_hex[HASH_HEX_SIZE+1];
unsigned char resp_hex[HASH_HEX_SIZE+1], body_hex[HASH_HEX_SIZE+1];
char tmp[MAX_HEADER_LEN], authtype[16], cnonce[32], nc[32], opaque[64];
static unsigned int mync = 1;
int has_opaque = 0;
- MD5_CTX Md5Ctx;
+ md5_state_t Md5Ctx;
// Extract the Auth Type - If not present, using 'none'
cnonce[0] = '\0';
@@ -243,19 +244,16 @@ int createAuthHeaderMD5(char * user, char * password, int password_len, char * m
}
// Load in A1
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, user, strlen(user));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, tmp, strlen(tmp));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, password, password_len);
- MD5_Final(ha1, &Md5Ctx);
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, user, strlen(user));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, tmp, strlen(tmp));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, password, password_len);
+ md5_finish(&Md5Ctx, ha1);
hashToHex(&ha1[0], &ha1_hex[0]);
sprintf(result, "Digest username=\"%s\",realm=\"%s\"",user,tmp);
- if (cnonce[0] != '\0') {
- sprintf(result, "%s,cnonce=\"%s\",nc=%s,qop=%s",result,cnonce,nc,authtype);
- }
// Construct the URI
if (auth_uri == NULL) {
@@ -266,24 +264,28 @@ int createAuthHeaderMD5(char * user, char * password, int password_len, char * m
// If using Auth-Int make a hash of the body - which is NULL for REG
if (stristr(authtype, "auth-int") != NULL) {
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, msgbody, strlen(msgbody));
- MD5_Final(body, &Md5Ctx);
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, msgbody, strlen(msgbody));
+ md5_finish(&Md5Ctx, body);
hashToHex(&body[0], &body_hex[0]);
+ sprintf(authtype, "auth-int");
}
// Load in A2
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, method, strlen(method));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, tmp, strlen(tmp));
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, method, strlen(method));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, tmp, strlen(tmp));
if (stristr(authtype, "auth-int") != NULL) {
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, &body_hex, HASH_HEX_SIZE);
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, (md5_byte_t *) &body_hex, HASH_HEX_SIZE);
}
- MD5_Final(ha2, &Md5Ctx);
+ md5_finish(&Md5Ctx, ha2);
hashToHex(&ha2[0], &ha2_hex[0]);
+ if (cnonce[0] != '\0') {
+ sprintf(result, "%s,cnonce=\"%s\",nc=%s,qop=%s",result,cnonce,nc,authtype);
+ }
sprintf(result, "%s,uri=\"%s\"",result,tmp);
// Extract the Nonce
@@ -292,21 +294,21 @@ int createAuthHeaderMD5(char * user, char * password, int password_len, char * m
return 0;
}
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, &ha1_hex, HASH_HEX_SIZE);
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, tmp, strlen(tmp));
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, (md5_byte_t *) &ha1_hex, HASH_HEX_SIZE);
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, tmp, strlen(tmp));
if (cnonce[0] != '\0') {
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, nc, strlen(nc));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, cnonce, strlen(cnonce));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, authtype, strlen(authtype));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, nc, strlen(nc));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, cnonce, strlen(cnonce));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, authtype, strlen(authtype));
}
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, &ha2_hex, HASH_HEX_SIZE);
- MD5_Final(resp, &Md5Ctx);
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, (md5_byte_t *) &ha2_hex, HASH_HEX_SIZE);
+ md5_finish(&Md5Ctx, resp);
hashToHex(&resp[0], &resp_hex[0]);
sprintf(result, "%s,nonce=\"%s\",response=\"%s\",algorithm=%s",result,tmp,resp_hex,algo);
@@ -320,20 +322,20 @@ int createAuthHeaderMD5(char * user, char * password, int password_len, char * m
int createAuthResponseMD5(char * user, char * password, int password_len, char * method,
char * uri, char * realm, char *nonce, unsigned char * result) {
- unsigned char ha1[MD5_HASH_SIZE], ha2[MD5_HASH_SIZE];
- unsigned char resp[MD5_HASH_SIZE];
+ md5_byte_t ha1[MD5_HASH_SIZE], ha2[MD5_HASH_SIZE];
+ md5_byte_t resp[MD5_HASH_SIZE];
unsigned char ha1_hex[HASH_HEX_SIZE+1], ha2_hex[HASH_HEX_SIZE+1];
char tmp[MAX_HEADER_LEN];
- MD5_CTX Md5Ctx;
+ md5_state_t Md5Ctx;
// Load in A1
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, user, strlen(user));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, realm, strlen(realm));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, password, password_len);
- MD5_Final(ha1, &Md5Ctx);
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, user, strlen(user));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, realm, strlen(realm));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, password, password_len);
+ md5_finish(&Md5Ctx, ha1);
hashToHex(&ha1[0], &ha1_hex[0]);
if (auth_uri) {
@@ -343,20 +345,20 @@ int createAuthResponseMD5(char * user, char * password, int password_len, char *
}
// Load in A2
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, method, strlen(method));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, tmp, strlen(tmp));
- MD5_Final(ha2, &Md5Ctx);
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, method, strlen(method));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, tmp, strlen(tmp));
+ md5_finish(&Md5Ctx, ha2);
hashToHex(&ha2[0], &ha2_hex[0]);
- MD5_Init(&Md5Ctx);
- MD5_Update(&Md5Ctx, &ha1_hex, HASH_HEX_SIZE);
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, nonce, strlen(nonce));
- MD5_Update(&Md5Ctx, ":", 1);
- MD5_Update(&Md5Ctx, &ha2_hex, HASH_HEX_SIZE);
- MD5_Final(resp, &Md5Ctx);
+ md5_init(&Md5Ctx);
+ md5_append(&Md5Ctx, (md5_byte_t *) &ha1_hex, HASH_HEX_SIZE);
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, nonce, strlen(nonce));
+ md5_append(&Md5Ctx, ":", 1);
+ md5_append(&Md5Ctx, (md5_byte_t *) &ha2_hex, HASH_HEX_SIZE);
+ md5_finish(&Md5Ctx, resp);
hashToHex(&resp[0], result);
return 1;
diff --git a/call.cpp b/call.cpp
index 794f515..dac7b8c 100644
--- a/call.cpp
+++ b/call.cpp
@@ -403,10 +403,10 @@ void call::init(scenario * call_scenario, struct sipp_socket *socket, struct soc
use_ipv6 = ipv6;
queued_msg = NULL;
-#ifdef _USE_OPENSSL
dialog_authentication = NULL;
dialog_challenge_type = 0;
+#ifdef _USE_OPENSSL
m_ctx_ssl = NULL ;
m_bio = NULL ;
#endif
@@ -614,11 +614,9 @@ call::~call()
}
-#ifdef _USE_OPENSSL
if(dialog_authentication) {
free(dialog_authentication);
}
-#endif
if (use_tdmmap) {
tdm_map[tdm_map_number] = false;
@@ -2448,9 +2446,6 @@ char* call::createSendingMessage(SendingMessage *src, int P_index, char *msg_buf
* been keyword substituted) to build the md5 hash
*/
if (auth_marker) {
-#ifndef _USE_OPENSSL
- ERROR("Authentication requires OpenSSL!");
-#else
if (!dialog_authentication) {
ERROR("Authentication keyword without dialog_authentication!");
}
@@ -2514,7 +2509,6 @@ char* call::createSendingMessage(SendingMessage *src, int P_index, char *msg_buf
if (msgLen) {
*msgLen += (authlen - auth_marker_len);
}
-#endif
}
if (auth_comp_allocated) {
@@ -3294,7 +3288,6 @@ bool call::process_incoming(char * msg, struct sockaddr_storage *src)
// WARNING("next_req_url is [%s]", next_req_url);
}
-#ifdef _USE_OPENSSL
/* store the authentication info */
if ((call_scenario->messages[search_index] -> bShouldAuthenticate) &&
(reply_code == 401 || reply_code == 407)) {
@@ -3316,7 +3309,6 @@ bool call::process_incoming(char * msg, struct sockaddr_storage *src)
/* Store the code of the challenge for building the proper header */
dialog_challenge_type = reply_code;
}
-#endif
/* If we are not advancing state, we should quite before we change this stuff. */
if (!call_scenario->messages[search_index]->advance_state) {
@@ -3632,7 +3624,6 @@ call::T_ActionResult call::executeAction(char * msg, message *curmsg)
}
}
}
-#ifdef _USE_OPENSSL
} else if (currentAction->getActionType() == CAction::E_AT_VERIFY_AUTH) {
bool result;
char *lf;
@@ -3665,7 +3656,6 @@ call::T_ActionResult call::executeAction(char * msg, message *curmsg)
}
M_callVariableTable->getVar(currentAction->getVarId())->setBool(result);
-#endif
} else if (currentAction->getActionType() == CAction::E_AT_JUMP) {
double operand = get_rhs(currentAction);
msg_index = (int)operand - 1;
diff --git a/call.hpp b/call.hpp
index b09d45b..63366a9 100644
--- a/call.hpp
+++ b/call.hpp
@@ -171,11 +171,9 @@ private:
#endif
-#ifdef _USE_OPENSSL
/* holds the auth header and if the challenge was 401 or 407 */
char * dialog_authentication;
int dialog_challenge_type;
-#endif
unsigned int next_retrans;
int nb_retrans;
diff --git a/md5.c b/md5.c
new file mode 100644
index 0000000..c35d96c
--- /dev/null
+++ b/md5.c
@@ -0,0 +1,381 @@
+/*
+ Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ L. Peter Deutsch
+ gh...@aladdin.com
+
+ */
+/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
+/*
+ Independent implementation of MD5 (RFC 1321).
+
+ This code implements the MD5 Algorithm defined in RFC 1321, whose
+ text is available at
+ http://www.ietf.org/rfc/rfc1321.txt
+ The code is derived from the text of the RFC, including the test suite
+ (section A.5) but excluding the rest of Appendix A. It does not include
+ any code or documentation that is identified in the RFC as being
+ copyrighted.
+
+ The original and principal author of md5.c is L. Peter Deutsch
+ <gh...@aladdin.com>. Other authors are noted in the change history
+ that follows (in reverse chronological order):
+
+ 2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
+ either statically or dynamically; added missing #include <string.h>
+ in library.
+ 2002-03-11 lpd Corrected argument list for main(), and added int return
+ type, in test program and T value program.
+ 2002-02-21 lpd Added missing #include <stdio.h> in test program.
+ 2000-07-03 lpd Patched to eliminate warnings about "constant is
+ unsigned in ANSI C, signed in traditional"; made test program
+ self-checking.
+ 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+ 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
+ 1999-05-03 lpd Original version.
+ */
+
+#include "md5.h"
+#include <string.h>
+
+#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+# define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+# define BYTE_ORDER 0
+#endif
+
+#define T_MASK ((md5_word_t)~0)
+#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
+#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
+#define T3 0x242070db
+#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
+#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
+#define T6 0x4787c62a
+#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
+#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
+#define T9 0x698098d8
+#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
+#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
+#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
+#define T13 0x6b901122
+#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
+#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
+#define T16 0x49b40821
+#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
+#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
+#define T19 0x265e5a51
+#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
+#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
+#define T22 0x02441453
+#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
+#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
+#define T25 0x21e1cde6
+#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
+#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
+#define T28 0x455a14ed
+#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
+#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
+#define T31 0x676f02d9
+#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
+#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
+#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
+#define T35 0x6d9d6122
+#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
+#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
+#define T38 0x4bdecfa9
+#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
+#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
+#define T41 0x289b7ec6
+#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
+#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
+#define T44 0x04881d05
+#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
+#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
+#define T47 0x1fa27cf8
+#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
+#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
+#define T50 0x432aff97
+#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
+#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
+#define T53 0x655b59c3
+#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
+#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
+#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
+#define T57 0x6fa87e4f
+#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
+#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
+#define T60 0x4e0811a1
+#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
+#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
+#define T63 0x2ad7d2bb
+#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
+
+
+static void
+md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
+{
+ md5_word_t
+ a = pms->abcd[0], b = pms->abcd[1],
+ c = pms->abcd[2], d = pms->abcd[3];
+ md5_word_t t;
+#if BYTE_ORDER > 0
+ /* Define storage only for big-endian CPUs. */
+ md5_word_t X[16];
+#else
+ /* Define storage for little-endian or both types of CPUs. */
+ md5_word_t xbuf[16];
+ const md5_word_t *X;
+#endif
+
+ {
+#if BYTE_ORDER == 0
+ /*
+ * Determine dynamically whether this is a big-endian or
+ * little-endian machine, since we can use a more efficient
+ * algorithm on the latter.
+ */
+ static const int w = 1;
+
+ if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
+#endif
+#if BYTE_ORDER <= 0 /* little-endian */
+ {
+ /*
+ * On little-endian machines, we can process properly aligned
+ * data without copying it.
+ */
+ if (!((data - (const md5_byte_t *)0) & 3)) {
+ /* data are properly aligned */
+ X = (const md5_word_t *)data;
+ } else {
+ /* not aligned */
+ memcpy(xbuf, data, 64);
+ X = xbuf;
+ }
+ }
+#endif
+#if BYTE_ORDER == 0
+ else /* dynamic big-endian */
+#endif
+#if BYTE_ORDER >= 0 /* big-endian */
+ {
+ /*
+ * On big-endian machines, we must arrange the bytes in the
+ * right order.
+ */
+ const md5_byte_t *xp = data;
+ int i;
+
+# if BYTE_ORDER == 0
+ X = xbuf; /* (dynamic only) */
+# else
+# define xbuf X /* (static only) */
+# endif
+ for (i = 0; i < 16; ++i, xp += 4)
+ xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+ }
+#endif
+ }
+
+#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+ /* Round 1. */
+ /* Let [abcd k s i] denote the operation
+ a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+ t = a + F(b,c,d) + X[k] + Ti;\
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 0, 7, T1);
+ SET(d, a, b, c, 1, 12, T2);
+ SET(c, d, a, b, 2, 17, T3);
+ SET(b, c, d, a, 3, 22, T4);
+ SET(a, b, c, d, 4, 7, T5);
+ SET(d, a, b, c, 5, 12, T6);
+ SET(c, d, a, b, 6, 17, T7);
+ SET(b, c, d, a, 7, 22, T8);
+ SET(a, b, c, d, 8, 7, T9);
+ SET(d, a, b, c, 9, 12, T10);
+ SET(c, d, a, b, 10, 17, T11);
+ SET(b, c, d, a, 11, 22, T12);
+ SET(a, b, c, d, 12, 7, T13);
+ SET(d, a, b, c, 13, 12, T14);
+ SET(c, d, a, b, 14, 17, T15);
+ SET(b, c, d, a, 15, 22, T16);
+#undef SET
+
+ /* Round 2. */
+ /* Let [abcd k s i] denote the operation
+ a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+ t = a + G(b,c,d) + X[k] + Ti;\
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 1, 5, T17);
+ SET(d, a, b, c, 6, 9, T18);
+ SET(c, d, a, b, 11, 14, T19);
+ SET(b, c, d, a, 0, 20, T20);
+ SET(a, b, c, d, 5, 5, T21);
+ SET(d, a, b, c, 10, 9, T22);
+ SET(c, d, a, b, 15, 14, T23);
+ SET(b, c, d, a, 4, 20, T24);
+ SET(a, b, c, d, 9, 5, T25);
+ SET(d, a, b, c, 14, 9, T26);
+ SET(c, d, a, b, 3, 14, T27);
+ SET(b, c, d, a, 8, 20, T28);
+ SET(a, b, c, d, 13, 5, T29);
+ SET(d, a, b, c, 2, 9, T30);
+ SET(c, d, a, b, 7, 14, T31);
+ SET(b, c, d, a, 12, 20, T32);
+#undef SET
+
+ /* Round 3. */
+ /* Let [abcd k s t] denote the operation
+ a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+ t = a + H(b,c,d) + X[k] + Ti;\
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 5, 4, T33);
+ SET(d, a, b, c, 8, 11, T34);
+ SET(c, d, a, b, 11, 16, T35);
+ SET(b, c, d, a, 14, 23, T36);
+ SET(a, b, c, d, 1, 4, T37);
+ SET(d, a, b, c, 4, 11, T38);
+ SET(c, d, a, b, 7, 16, T39);
+ SET(b, c, d, a, 10, 23, T40);
+ SET(a, b, c, d, 13, 4, T41);
+ SET(d, a, b, c, 0, 11, T42);
+ SET(c, d, a, b, 3, 16, T43);
+ SET(b, c, d, a, 6, 23, T44);
+ SET(a, b, c, d, 9, 4, T45);
+ SET(d, a, b, c, 12, 11, T46);
+ SET(c, d, a, b, 15, 16, T47);
+ SET(b, c, d, a, 2, 23, T48);
+#undef SET
+
+ /* Round 4. */
+ /* Let [abcd k s t] denote the operation
+ a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+ t = a + I(b,c,d) + X[k] + Ti;\
+ a = ROTATE_LEFT(t, s) + b
+ /* Do the following 16 operations. */
+ SET(a, b, c, d, 0, 6, T49);
+ SET(d, a, b, c, 7, 10, T50);
+ SET(c, d, a, b, 14, 15, T51);
+ SET(b, c, d, a, 5, 21, T52);
+ SET(a, b, c, d, 12, 6, T53);
+ SET(d, a, b, c, 3, 10, T54);
+ SET(c, d, a, b, 10, 15, T55);
+ SET(b, c, d, a, 1, 21, T56);
+ SET(a, b, c, d, 8, 6, T57);
+ SET(d, a, b, c, 15, 10, T58);
+ SET(c, d, a, b, 6, 15, T59);
+ SET(b, c, d, a, 13, 21, T60);
+ SET(a, b, c, d, 4, 6, T61);
+ SET(d, a, b, c, 11, 10, T62);
+ SET(c, d, a, b, 2, 15, T63);
+ SET(b, c, d, a, 9, 21, T64);
+#undef SET
+
+ /* Then perform the following additions. (That is increment each
+ of the four registers by the value it had before this block
+ was started.) */
+ pms->abcd[0] += a;
+ pms->abcd[1] += b;
+ pms->abcd[2] += c;
+ pms->abcd[3] += d;
+}
+
+void
+md5_init(md5_state_t *pms)
+{
+ pms->count[0] = pms->count[1] = 0;
+ pms->abcd[0] = 0x67452301;
+ pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
+ pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
+ pms->abcd[3] = 0x10325476;
+}
+
+void
+md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
+{
+ const md5_byte_t *p = data;
+ int left = nbytes;
+ int offset = (pms->count[0] >> 3) & 63;
+ md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+ if (nbytes <= 0)
+ return;
+
+ /* Update the message length. */
+ pms->count[1] += nbytes >> 29;
+ pms->count[0] += nbits;
+ if (pms->count[0] < nbits)
+ pms->count[1]++;
+
+ /* Process an initial partial block. */
+ if (offset) {
+ int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
+
+ memcpy(pms->buf + offset, p, copy);
+ if (offset + copy < 64)
+ return;
+ p += copy;
+ left -= copy;
+ md5_process(pms, pms->buf);
+ }
+
+ /* Process full blocks. */
+ for (; left >= 64; p += 64, left -= 64)
+ md5_process(pms, p);
+
+ /* Process a final partial block. */
+ if (left)
+ memcpy(pms->buf, p, left);
+}
+
+void
+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
+{
+ static const md5_byte_t pad[64] = {
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ };
+ md5_byte_t data[8];
+ int i;
+
+ /* Save the length before padding. */
+ for (i = 0; i < 8; ++i)
+ data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+ /* Pad to 56 bytes mod 64. */
+ md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+ /* Append the length. */
+ md5_append(pms, data, 8);
+ for (i = 0; i < 16; ++i)
+ digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
diff --git a/md5.h b/md5.h
new file mode 100644
index 0000000..698c995
--- /dev/null
+++ b/md5.h
@@ -0,0 +1,91 @@
+/*
+ Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ L. Peter Deutsch
+ gh...@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+ Independent implementation of MD5 (RFC 1321).
+
+ This code implements the MD5 Algorithm defined in RFC 1321, whose
+ text is available at
+ http://www.ietf.org/rfc/rfc1321.txt
+ The code is derived from the text of the RFC, including the test suite
+ (section A.5) but excluding the rest of Appendix A. It does not include
+ any code or documentation that is identified in the RFC as being
+ copyrighted.
+
+ The original and principal author of md5.h is L. Peter Deutsch
+ <gh...@aladdin.com>. Other authors are noted in the change history
+ that follows (in reverse chronological order):
+
+ 2002-04-13 lpd Removed support for non-ANSI compilers; removed
+ references to Ghostscript; clarified derivation from RFC 1321;
+ now handles byte order either statically or dynamically.
+ 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+ 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+ added conditionalization for C++ compilation from Martin
+ Purschke <pursc...@bnl.gov>.
+ 1999-05-03 lpd Original version.
+ */
+
+#ifndef md5_INCLUDED
+# define md5_INCLUDED
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order. If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+ md5_word_t count[2]; /* message length in bits, lsw first */
+ md5_word_t abcd[4]; /* digest buffer */
+ md5_byte_t buf[64]; /* accumulate block */
+} md5_state_t;
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* Initialize the algorithm. */
+void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
+
+/* Finish the message and return the digest. */
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#ifdef __cplusplus
+} /* end extern "C" */
+#endif
+
+#endif /* md5_INCLUDED */
diff --git a/message.cpp b/message.cpp
index 721a514..e5c5cb7 100644
--- a/message.cpp
+++ b/message.cpp
@@ -330,11 +330,6 @@ SendingMessage::SendingMessage(scenario *msg_scenario, char *src, bool skip_sani
ERROR("The %s keyword requires PCAPPLAY.\n", keyword);
}
#endif
-#ifndef _USE_OPENSSL
- else if(!strcmp(keyword, "authentication")) {
- ERROR("The %s keyword requires OpenSSL.\n", keyword);
- }
-#endif
else {
// scan for the generic parameters - must be last test
@@ -529,7 +524,7 @@ void SendingMessage::parseAuthenticationKeyword(scenario *msg_scenario, struct M
getKeywordParam(keyword, "password=", my_auth_pass);
if(*my_auth_user == '\0') {
- strcpy(my_auth_user, service);
+ strcpy(my_auth_user, auth_username ? auth_username : service);
}
if(*my_auth_pass == '\0') {
strcpy(my_auth_pass, auth_password);
diff --git a/scenario.cpp b/scenario.cpp
index d65cbf9..65a8834 100644
--- a/scenario.cpp
+++ b/scenario.cpp
@@ -46,9 +46,7 @@ message::message(int index, const char *desc)
pause_desc = NULL;
sessions = 0;
bShouldRecordRoutes = 0;
-#ifdef _USE_OPENSSL
bShouldAuthenticate = 0;
-#endif
send_scheme = NULL;
retrans_delay = 0;
@@ -900,13 +898,7 @@ scenario::scenario(char * filename, int deflt)
/* record the authentication credentials */
if((ptr = xp_get_value((char *)"auth"))) {
bool temp = get_bool(ptr, "message authentication");
-#ifdef _USE_OPENSSL
curmsg -> bShouldAuthenticate = temp;
-#else
- if (temp) {
- ERROR("Authentication requires OpenSSL support!");
- }
-#endif
}
} else if(!strcmp(elem, "pause") || !strcmp(elem, "timewait")) {
checkOptionalRecv(elem, scenario_file_cursor);
@@ -1524,14 +1516,10 @@ void scenario::parseAction(CActions *actions) {
}
free(ptr);
} else if(!strcmp(actionElem, "verifyauth")) {
-#ifdef _USE_OPENSSL
tmpAction->setVarId(xp_get_var("assign_to", "verifyauth"));
tmpAction->setMessage(xp_get_string("username", "verifyauth"), 0);
tmpAction->setMessage(xp_get_string("password", "verifyauth"), 1);
tmpAction->setActionType(CAction::E_AT_VERIFY_AUTH);
-#else
- ERROR("The verifyauth action requires OpenSSL support.");
-#endif
} else if(!strcmp(actionElem, "lookup")) {
tmpAction->setVarId(xp_get_var("assign_to", "lookup"));
tmpAction->setMessage(xp_get_string("file", "lookup"), 0);
diff --git a/scenario.hpp b/scenario.hpp
index 64861ef..b767314 100644
--- a/scenario.hpp
+++ b/scenario.hpp
@@ -74,10 +74,8 @@ public:
/* should collect route set? */
bool bShouldRecordRoutes;
-#ifdef _USE_OPENSSL
/* should collect authentication info? */
bool bShouldAuthenticate;
-#endif
/* If this is a send */
SendingMessage *send_scheme;
diff --git a/sipp.cpp b/sipp.cpp
index 98b90e2..adb703d 100644
--- a/sipp.cpp
+++ b/sipp.cpp
@@ -139,13 +139,10 @@ struct sipp_option options_table[] = {
{"help", NULL, SIPP_OPTION_HELP, NULL, 0},
{"aa", "Enable automatic 200 OK answer for INFO, UPDATE and NOTIFY messages.", SIPP_OPTION_SETFLAG, &auto_answer, 1},
-#ifdef _USE_OPENSSL
{"auth_uri", "Force the value of the URI for authentication.\n"
"By default, the URI is composed of remote_ip:remote_port.", SIPP_OPTION_STRING, &auth_uri, 1},
-#else
- {"auth_uri", NULL, SIPP_OPTION_NEED_SSL, NULL, 1},
-#endif
-
+ {"au", "Set authorization username for authentication challenges. Default is taken from -s argument", SIPP_OPTION_STRING, &auth_username, 1},
+ {"ap", "Set the password for authentication challenges. Default is 'password'", SIPP_OPTION_STRING, &auth_password, 1},
{"base_cseq", "Start value of [cseq] for each call.", SIPP_OPTION_CSEQ, NULL, 1},
{"bg", "Launch SIPp in background mode.", SIPP_OPTION_SETFLAG, &backgroundMode, 1},
{"bind_local", "Bind socket to local IP address, i.e. the local IP address is used as the source IP address. If SIPp runs in server mode it will only listen on the local IP address instead of all IP addresses.", SIPP_OPTION_SETFLAG, &bind_local, 1},
@@ -327,12 +324,10 @@ struct sipp_option options_table[] = {
{"watchdog_minor_maxtriggers", "How many times the minor watchdog timer can be tripped before the test is terminated. Default is 120.", SIPP_OPTION_INT, &watchdog_minor_maxtriggers, 1},
#ifdef _USE_OPENSSL
- {"ap", "Set the password for authentication challenges. Default is 'password", SIPP_OPTION_STRING, &auth_password, 1},
{"tls_cert", "Set the name for TLS Certificate file. Default is 'cacert.pem", SIPP_OPTION_STRING, &tls_cert_name, 1},
{"tls_key", "Set the name for TLS Private Key file. Default is 'cakey.pem'", SIPP_OPTION_STRING, &tls_key_name, 1},
{"tls_crl", "Set the name for Certificate Revocation List file. If not specified, X509 CRL is not activated.", SIPP_OPTION_STRING, &tls_crl_name, 1},
#else
- {"ap", NULL, SIPP_OPTION_NEED_SSL, NULL, 1},
{"tls_cert", NULL, SIPP_OPTION_NEED_SSL, NULL, 1},
{"tls_key", NULL, SIPP_OPTION_NEED_SSL, NULL, 1},
{"tls_crl", NULL, SIPP_OPTION_NEED_SSL, NULL, 1},
diff --git a/sipp.hpp b/sipp.hpp
index c27b261..00eff56 100644
--- a/sipp.hpp
+++ b/sipp.hpp
@@ -210,6 +210,7 @@ extern bool bind_local _DEFVAL(false);
extern void * monosocket_comp_state _DEFVAL(0);
extern char * service _DEFVAL(DEFAULT_SERVICE);
extern char * auth_password _DEFVAL(DEFAULT_AUTH_PASSWORD);
+extern char * auth_username _DEFVAL(0);
extern unsigned long report_freq _DEFVAL(DEFAULT_REPORT_FREQ);
extern unsigned long report_freq_dumpLog _DEFVAL
(DEFAULT_REPORT_FREQ_DUMP_LOG);
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Sipp-users mailing list
Sipp-users@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sipp-users
