Changeset 2690 for pjproject

Timestamp:

May 12, 2009 8:01:56 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #836: SHA1 encryption may corrupt STUN packets with MESSAGE-INTEGRITY. Also added unit test to verify this behavior

Location:

pjproject/trunk/pjlib-util/src

Files:

• pjlib-util-test/encryption.c (modified) (3 diffs)
• pjlib-util/sha1.c (modified) (3 diffs)

pjproject/trunk/pjlib-util/src/pjlib-util-test/encryption.c

@@ -65 +65 @@
 static int sha1_test1(void)
 {
+    enum { MILLION = 1000000 };
     int k;
     pj_sha1_context context;
     pj_uint8_t digest[20];
     char output[80];
+    pj_pool_t *pool;
+    pj_uint8_t *block;
 
     PJ_LOG(3, (THIS_FILE, "  SHA1 test vector 1 from sha1.c.."));
@@ -87 +90 @@
     /* million 'a' vector we feed separately */
     pj_sha1_init(&context);
-    for (k = 0; k < 1000000; k++)
+    for (k = 0; k < MILLION; k++)
         pj_sha1_update(&context, (pj_uint8_t*)"a", 1);
     pj_sha1_final(&context, digest);
@@ -95 +98 @@
         return -20;
     }
+
+    /* million 'a' test, using block */
+    pool = pj_pool_create(mem, "sha1test", 256, 512, NULL);
+    block = (pj_uint8_t*)pj_pool_alloc(pool, MILLION);
+    pj_memset(block, 'a', MILLION);
+
+    pj_sha1_init(&context);
+    pj_sha1_update(&context, block, MILLION);
+    pj_sha1_final(&context, digest);
+    digest_to_hex(digest, output);
+    if (strcmp(output, sha1_test_results[2])) {
+        pj_pool_release(pool);
+        PJ_LOG(3, (THIS_FILE, "    incorrect hash result for block update!"));
+        return -21;
+    }
+
+    /* verify that original buffer was not modified */
+    for (k=0; k<MILLION; ++k) {
+        if (block[k] != 'a') {
+            pj_pool_release(pool);
+            PJ_LOG(3, (THIS_FILE, "    block was modified!"));
+            return -22;
+        }
+    }
+
+    pj_pool_release(pool);
 
     /* success */

pjproject/trunk/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;