Changeset 1479 for pjproject/trunk/pjnath/src/pjnath/stun_auth.c

Timestamp:

Oct 5, 2007 3:53:56 PM (17 years ago)

Author:

bennylp

Message:

Ticket #392: Added configuration to enable old, rfc3489bis-06 and older, style of MESSAGE-INTEGRITY and FINGERPRINT calculation

File:

• pjproject/trunk/pjnath/src/pjnath/stun_auth.c (modified) (4 diffs)

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

@@ -343 +343 @@
     pj_hmac_sha1_init(&ctx, (pj_uint8_t*)key.ptr, key.slen);
 
+#if PJ_STUN_OLD_STYLE_MI_FINGERPRINT
+    /* Pre rfc3489bis-06 style of calculation */
+    pj_hmac_sha1_update(&ctx, pkt, 20);
+#else
     /* First calculate HMAC for the header.
      * The calculation is different depending on whether FINGERPRINT attribute
@@ -355 +359 @@
         pj_hmac_sha1_update(&ctx, pkt, 20);
     }
+#endif  /* PJ_STUN_OLD_STYLE_MI_FINGERPRINT */
 
     /* Now update with the message body */
     pj_hmac_sha1_update(&ctx, pkt+20, amsgi_pos);
+#if PJ_STUN_OLD_STYLE_MI_FINGERPRINT
     // This is no longer necessary as per rfc3489bis-08
-    //if (amsgi_pos & 0x3F) {
-    //  pj_uint8_t zeroes[64];
-    //  pj_bzero(zeroes, sizeof(zeroes));
-    //  pj_hmac_sha1_update(&ctx, zeroes, 64-(amsgi_pos & 0x3F));
-    //}
+    if ((amsgi_pos+20) & 0x3F) {
+        pj_uint8_t zeroes[64];
+        pj_bzero(zeroes, sizeof(zeroes));
+        pj_hmac_sha1_update(&ctx, zeroes, 64-((amsgi_pos+20) & 0x3F));
+    }
+#endif
     pj_hmac_sha1_final(&ctx, digest);
 
@@ -475 +482 @@
     pj_hmac_sha1_init(&ctx, (pj_uint8_t*)key->ptr, key->slen);
 
+#if PJ_STUN_OLD_STYLE_MI_FINGERPRINT
+    /* Pre rfc3489bis-06 style of calculation */
+    pj_hmac_sha1_update(&ctx, pkt, 20);
+#else
     /* First calculate HMAC for the header.
      * The calculation is different depending on whether FINGERPRINT attribute
@@ -487 +498 @@
         pj_hmac_sha1_update(&ctx, pkt, 20);
     }
+#endif  /* PJ_STUN_OLD_STYLE_MI_FINGERPRINT */
 
     /* Now update with the message body */
     pj_hmac_sha1_update(&ctx, pkt+20, amsgi_pos);
+#if PJ_STUN_OLD_STYLE_MI_FINGERPRINT
     // This is no longer necessary as per rfc3489bis-08
-    //if (amsgi_pos & 0x3F) {
-    //  pj_uint8_t zeroes[64];
-    //  pj_bzero(zeroes, sizeof(zeroes));
-    //  pj_hmac_sha1_update(&ctx, zeroes, 64-(amsgi_pos & 0x3F));
-    //}
+    if ((amsgi_pos+20) & 0x3F) {
+        pj_uint8_t zeroes[64];
+        pj_bzero(zeroes, sizeof(zeroes));
+        pj_hmac_sha1_update(&ctx, zeroes, 64-((amsgi_pos+20) & 0x3F));
+    }
+#endif
     pj_hmac_sha1_final(&ctx, digest);