Changeset 1265 for pjproject/trunk/pjlib-util/src/pjlib-util/hmac_sha1.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/pjlib-util/src/pjlib-util/hmac_sha1.c (modified) (2 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util/hmac_sha1.c

@@ -18 +18 @@
  */
 #include <pjlib-util/hmac_sha1.h>
-#include <pjlib-util/sha1.h>
 #include <pj/string.h>
 
 
-PJ_DEF(void) pj_hmac_sha1(const pj_uint8_t *input, unsigned input_len, 
-                          const pj_uint8_t *key, unsigned key_len, 
-                          pj_uint8_t digest[20] )
+PJ_DEF(void) pj_hmac_sha1_init(pj_hmac_sha1_context *hctx, 
+                               const pj_uint8_t *key, unsigned key_len)
 {
-    pj_sha1_context context;
-    pj_uint8_t k_ipad[65];
-    pj_uint8_t k_opad[65];
+    pj_uint8_t k_ipad[64];
     pj_uint8_t tk[20];
-    int i;
+    unsigned i;
 
     /* if key is longer than 64 bytes reset it to key=SHA1(key) */
@@ -44 +40 @@
     }
 
+    /*
+     * HMAC = H(K XOR opad, H(K XOR ipad, text))
+     */
+
     /* start out by storing key in pads */
     pj_bzero( k_ipad, sizeof(k_ipad));
-    pj_bzero( k_opad, sizeof(k_opad));
+    pj_bzero( hctx->k_opad, sizeof(hctx->k_opad));
     pj_memcpy( k_ipad, key, key_len);
-    pj_memcpy( k_opad, key, key_len);
+    pj_memcpy( hctx->k_opad, key, key_len);
 
     /* XOR key with ipad and opad values */
     for (i=0; i<64; i++) {
         k_ipad[i] ^= 0x36;
-        k_opad[i] ^= 0x5c;
+        hctx->k_opad[i] ^= 0x5c;
     }
     /*
      * perform inner SHA1
      */
-    pj_sha1_init(&context);
-    pj_sha1_update(&context, k_ipad, 64);
-    pj_sha1_update(&context, input, input_len);
-    pj_sha1_final(&context, digest);
+    pj_sha1_init(&hctx->context);
+    pj_sha1_update(&hctx->context, k_ipad, 64);
+}
+
+PJ_DEF(void) pj_hmac_sha1_update(pj_hmac_sha1_context *hctx,
+                                 const pj_uint8_t *input, unsigned input_len)
+{
+    pj_sha1_update(&hctx->context, input, input_len);
+}
+
+PJ_DEF(void) pj_hmac_sha1_final(pj_hmac_sha1_context *hctx,
+                                pj_uint8_t digest[20])
+{
+    pj_sha1_final(&hctx->context, digest);
 
     /*
      * perform outer SHA1
      */
-    pj_sha1_init(&context);
-    pj_sha1_update(&context, k_opad, 64);
-    pj_sha1_update(&context, digest, 20);
-    pj_sha1_final(&context, digest);
+    pj_sha1_init(&hctx->context);
+    pj_sha1_update(&hctx->context, hctx->k_opad, 64);
+    pj_sha1_update(&hctx->context, digest, 20);
+    pj_sha1_final(&hctx->context, digest);
 }
 
+PJ_DEF(void) pj_hmac_sha1(const pj_uint8_t *input, unsigned input_len, 
+                          const pj_uint8_t *key, unsigned key_len, 
+                          pj_uint8_t digest[20] )
+{
+    pj_hmac_sha1_context ctx;
 
+    pj_hmac_sha1_init(&ctx, key, key_len);
+    pj_hmac_sha1_update(&ctx, input, input_len);
+    pj_hmac_sha1_final(&ctx, digest);
+}
+