Changeset 2809 for pjproject/branches/1.0/pjlib-util/src/pjlib-util/sha1.c

Timestamp:

Jun 25, 2009 12:46:00 PM (15 years ago)

Author:

bennylp

Message:

Ticket #837: SHA1 encryption may corrupt STUN packets with MESSAGE-INTEGRITY

• backported changes from #836

File:

• pjproject/branches/1.0/pjlib-util/src/pjlib-util/sha1.c (modified) (3 diffs)

pjproject/branches/1.0/pjlib-util/src/pjlib-util/sha1.c

@@ -106 +106 @@
 
 
-static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64]);
+static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64]);
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
@@ -132 +132 @@
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
-static void SHA1_Transform(pj_uint32_t state[5], const pj_uint8_t buffer[64])
+static void SHA1_Transform(pj_uint32_t state[5], pj_uint8_t buffer[64])
 {
     pj_uint32_t a, b, c, d, e;
@@ -216 +216 @@
         SHA1_Transform(context->state, context->buffer);
         for ( ; i + 63 < len; i += 64) {
-            SHA1_Transform(context->state, data + i);
+            pj_uint8_t tmp[64];
+            pj_memcpy(tmp, data + i, 64);
+            SHA1_Transform(context->state, tmp);
         }
         j = 0;