Changeset 1265 for pjproject/trunk/pjnath/src/pjnath/stun_auth.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_auth.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_auth.c

@@ -120 +120 @@
     const pj_stun_realm_attr *arealm;
     const pj_stun_realm_attr *anonce;
+    pj_hmac_sha1_context ctx;
     pj_uint8_t digest[PJ_SHA1_DIGEST_SIZE];
     pj_uint8_t md5_digest[16];
@@ -328 +329 @@
     }
 
-    /* Now calculate HMAC of the message */
-    pj_hmac_sha1(pkt, amsgi_pos, (pj_uint8_t*)key.ptr, key.slen, digest);
+    /* Now calculate HMAC of the message, adding zero padding 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, pkt, amsgi_pos);
+    if (amsgi_pos & 0x3F) {
+        pj_uint8_t zeroes[64];
+        pj_bzero(zeroes, sizeof(zeroes));
+        pj_hmac_sha1_update(&ctx, zeroes, 64-(amsgi_pos & 0x3F));
+    }
+    pj_hmac_sha1_final(&ctx, digest);
 
     /* Compare HMACs */