Merge r1460244:

    speed-up md5 by avoiding some memcopies
    
PR: 49011
Submitted by: Stefan Fritsch, Stefan Fuhrmann <stefanfuhrmann alice-dsl de>


git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.5.x@1460281 13f79535-47bb-0310-9956-ffa450edef68

Author: Stefan Fritsch

CHANGES

@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.2
 
+  *) Speedup md5 calculation by avoiding some copying on little endian
+     architectures. PR 49011. [Stefan Fritsch, Stefan Fuhrmann
+     <stefanfuhrmann alice-dsl de>]
+
   *) Use heap memory for crypt in apr_password_validate(), to reduce stack
      usage. PR 54572. [Stefan Fritsch]
 

crypto/apr_md5.c

@@ -338,9 +338,18 @@ APU_DECLARE(apr_status_t) apr_md5(unsigned char digest[APR_MD5_DIGESTSIZE],
 static void MD5Transform(apr_uint32_t state[4], const unsigned char block[64])
 {
     apr_uint32_t a = state[0], b = state[1], c = state[2], d = state[3],
-                 x[APR_MD5_DIGESTSIZE];
+                 tmpbuf[APR_MD5_DIGESTSIZE];
+    const apr_uint32_t *x;
 
-    Decode(x, block, 64);
+#if !APR_IS_BIGENDIAN
+    if ((apr_uintptr_t)block % sizeof(apr_uint32_t) == 0) {
+        x = (apr_uint32_t *)block;
+    } else
+#endif
+    {
+        Decode(tmpbuf, block, 64);
+	x = tmpbuf;
+    }
 
     /* Round 1 */
     FF(a, b, c, d, x[0],  S11, 0xd76aa478); /* 1 */
@@ -419,8 +428,13 @@ static void MD5Transform(apr_uint32_t state[4], const unsigned char block[64])
     state[2] += c;
     state[3] += d;
 
-    /* Zeroize sensitive information. */
-    memset(x, 0, sizeof(x));
+#if !APR_IS_BIGENDIAN
+    if (x == tmpbuf)
+#endif
+    {
+        /* Zeroize sensitive information. */
+        memset(tmpbuf, 0, sizeof(tmpbuf));
+    }
 }
 
 /* Encodes input (apr_uint32_t) into output (unsigned char). Assumes len is

test/testmd5.c

@@ -66,13 +66,38 @@ static void test_md5sum(abts_case *tc, void *data)
                     (memcmp(digest, sum, APR_MD5_DIGESTSIZE) == 0));
 }
 
+static void test_md5sum_unaligned(abts_case *tc, void *data)
+{
+        apr_md5_ctx_t context;
+        const char *string = "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234"
+                             "abcdefghijklmnopqrstuvwxyz01234_";
+        const char *sum =
+            "\x93\x17\x22\x78\xee\x30\x82\xb3\xeb\x95\x33\xec\xea\x78\xb7\x89";
+        unsigned char digest[APR_MD5_DIGESTSIZE];
+        unsigned int i;
+
+        ABTS_ASSERT(tc, "apr_md5_init", (apr_md5_init(&context) == 0));
+        for (i = 0; i < 10; i++) {
+                ABTS_ASSERT(tc, "apr_md5_update",
+                    (apr_md5_update(&context, string, strlen(string)) == 0));
+                string++;
+        }
+        ABTS_ASSERT(tc, "apr_md5_final", (apr_md5_final(digest, &context)
+                                          == 0));
+        ABTS_ASSERT(tc, "check for correct md5 digest of unaligned data",
+                    (memcmp(digest, sum, APR_MD5_DIGESTSIZE) == 0));
+}
+
 abts_suite *testmd5(abts_suite *suite)
 {
         suite = ADD_SUITE(suite);
 
         for (count=0; count < num_sums; count++) {
             abts_run_test(suite, test_md5sum, NULL);
         }
+        abts_run_test(suite, test_md5sum_unaligned, NULL);
 
         return suite;
 }