Changeset 1265 for pjproject/trunk/pjnath/src/pjnath/stun_msg.c

Timestamp:

May 11, 2007 10:37:14 AM (17 years ago)

Author:

bennylp

Message:

Fixed missing padding when calculating MESSAGE-INTEGRITY in STUN

File:

• pjproject/trunk/pjnath/src/pjnath/stun_msg.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_msg.c

@@ -2140 +2140 @@
 
         pj_uint8_t md5_key_buf[16];
+        pj_hmac_sha1_context ctx;
         pj_str_t key;
 
@@ -2182 +2183 @@
         }
 
-        /* Calculate HMAC-SHA1 digest */
-        pj_hmac_sha1((pj_uint8_t*)start, buf-start, 
-                     (pj_uint8_t*)key.ptr, key.slen,
-                     amsgint->hmac);
+        /* Calculate HMAC-SHA1 digest, add zero padding to input
+         * if necessary to make the input 64 bytes aligned.
+         */
+        pj_hmac_sha1_init(&ctx, (pj_uint8_t*)key.ptr, key.slen);
+        pj_hmac_sha1_update(&ctx, (pj_uint8_t*)start, buf-start);
+        if ((buf-start) & 0x3F) {
+            pj_uint8_t zeroes[64];
+            pj_bzero(zeroes, sizeof(zeroes));
+            pj_hmac_sha1_update(&ctx, zeroes, 64-((buf-start) & 0x3F));
+        }
+        pj_hmac_sha1_final(&ctx, amsgint->hmac);
 
         /* Put this attribute in the message */