Changeset 275:5ac8383e5fec in mediastreamer2

Timestamp:

Feb 27, 2009 2:05:14 PM (4 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

extand STUN API for integrity check

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

Location:

linphone/oRTP

Files:

• include/ortp/stun.h (modified) (1 diff)
• src/stun.c (modified) (6 diffs)

linphone/oRTP/include/ortp/stun.h

@@ -428 +428 @@
 } StunServerInfo;
 
+void
+stunCalculateIntegrity_longterm(char* hmac, const char* input, int length,
+                     const char *username, const char *realm, const char *password);
+void
+stunCalculateIntegrity_shortterm(char* hmac, const char* input, int length, const char* key);
+
 bool_t
 stunParseMessage( char* buf, 

linphone/oRTP/src/stun.c

@@ -124 +124 @@
 }
 
-static void
-computeHmac_longterm(char* hmac, const char* input, int length,
-                     const char *username, const char *realm, const char *password);
-static void
-computeHmac_shortterm(char* hmac, const char* input, int length, const char* key);
-
 static bool_t 
 stunParseAtrAddress( char* body, unsigned int hdrLen,  StunAtrAddress4 *result )
@@ -1045 +1039 @@
 
       encode16(lengthp, (UInt16)(ptr - buf - sizeof(StunMsgHdr)+24));
-      computeHmac_longterm(integrity.hash, buf, (int)(ptr-buf) ,
+      stunCalculateIntegrity_longterm(integrity.hash, buf, (int)(ptr-buf) ,
         msg->username.value, msg->realmName.value, password->value);
       ptr = encodeAtrIntegrity(ptr, &integrity);
@@ -1057 +1051 @@
 
       encode16(lengthp, (UInt16)(ptr - buf - sizeof(StunMsgHdr)+24));
-      computeHmac_shortterm(integrity.hash, buf, (int)(ptr-buf) ,
+      stunCalculateIntegrity_shortterm(integrity.hash, buf, (int)(ptr-buf) ,
         password->value);
       ptr = encodeAtrIntegrity(ptr, &integrity);
@@ -1178 +1172 @@
 
 #ifdef NOSSL
-static void
-computeHmac_longterm(char* hmac, const char* input, int length,
+void
+stunCalculateIntegrity_longterm(char* hmac, const char* input, int length,
                      const char *username, const char *realm, const char *password)
 {
    strncpy(hmac,"hmac-not-implemented",20);
 }
-static void
-computeHmac_shortterm(char* hmac, const char* input, int length, const char* key)
+void
+stunCalculateIntegrity_shortterm(char* hmac, const char* input, int length, const char* key)
 {
    strncpy(hmac,"hmac-not-implemented",20);
@@ -1193 +1187 @@
 #include <openssl/md5.h>
 
-static void
-computeHmac_longterm(char* hmac, const char* input, int length,
+void
+stunCalculateIntegrity_longterm(char* hmac, const char* input, int length,
                      const char *username, const char *realm, const char *password)
 {
@@ -1210 +1204 @@
 }
 
-static void
-computeHmac_shortterm(char* hmac, const char* input, int length, const char* key)
+void
+stunCalculateIntegrity_shortterm(char* hmac, const char* input, int length, const char* key)
 {
    unsigned int resultSize=0;