Changeset 225:88d38b23b492 in mediastreamer2

Timestamp:

Jan 11, 2009 9:57:48 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

update STUN/fix unix compilation

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@228 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/oRTP

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/stun.c (modified) (3 diffs)
• src/tests/Makefile.am (modified) (1 diff)

linphone/oRTP/configure.ac

@@ -234 +234 @@
 fi
 
-ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS $SRTP_LIBS"
+AC_CHECK_LIB(ssl,SSL_CTX_new,[SSL_LIBS="-lssl"])
+AC_CHECK_LIB(crypto,MD5,[SSL_LIBS="$SSL_LIBS -lcrypto"])
+
+AC_SUBST(SSL_LIBS)
+
+ORTPDEPS_LIBS="$ORTPDEPS_LIBS $PTHREAD_LIBS $PTHREAD_LDFLAGS $SRTP_LIBS $SSL_LIBS"
 ORTPDEPS_CFLAGS="$ORTPDEPS_CFLAGS $PTHREAD_CFLAGS $ORTP_DEFS $SRTP_CFLAGS"
 CFLAGS="$CFLAGS $ORTP_DEFS"

linphone/oRTP/src/Makefile.am

@@ -34 +34 @@
 
 
-libortp_la_LIBADD= $(PTHREAD_LIBS) -lm $(SRTP_LIBS)
+libortp_la_LIBADD= $(PTHREAD_LIBS) -lm $(SRTP_LIBS) $(SSL_LIBS)
 
 libortp_la_LDFLAGS= -version-info $(LIBORTP_SO_VERSION)

linphone/oRTP/src/stun.c

@@ -1199 +1199 @@
    unsigned int resultSize=0;
    unsigned char HA1[16];
-   unsigned char HA1_text[1024];
+   char HA1_text[1024];
 
    snprintf(HA1_text, sizeof(HA1_text), "%s:%s:%s", username, realm, password);
-   MD5(HA1_text, strlen(HA1_text), HA1);
+   MD5((unsigned char *)HA1_text, strlen(HA1_text), HA1);
 
    HMAC(EVP_sha1(), 
@@ -1220 +1220 @@
 }
 #endif
-
-
-static void
-toHex(const char* buffer, int bufferSize, char* output) 
-{
-   int i;
-   static char hexmap[] = "0123456789abcdef";
-        
-   const char* p = buffer;
-   char* r = output;
-   for (i=0; i < bufferSize; i++)
-   {
-      unsigned char temp = *p++;
-                
-      int hi = (temp & 0xf0)>>4;
-      int low = (temp & 0xf);
-                
-      *r++ = hexmap[hi];
-      *r++ = hexmap[low];
-   }
-   *r = 0;
-}
 
 UInt64
@@ -2567 +2545 @@
               StunMessage *resp)
 { 
-  bool_t discard=FALSE;
-
   StunMessage req;
   char buf[STUN_MAX_MESSAGE_SIZE];

linphone/oRTP/src/tests/Makefile.am

@@ -25 +25 @@
 AM_CFLAGS=  -D_ORTP_SOURCE $(PTHREAD_CFLAGS) 
 AM_LDFLAGS= $(PTHREAD_LDFLAGS)
-LDADD=$(top_builddir)/src/libortp.la  $(SRTP_LIBS)
+LDADD=$(top_builddir)/src/libortp.la  $(SRTP_LIBS) $(SSL_LIBS)
 INCLUDES=-I$(top_srcdir)/include/