Reimplement ssl_ctx_param_t array comparison using a hash.

Author: notroj

modules/ssl/ssl_engine_kernel.c

@@ -127,41 +127,40 @@ static int ap_array_same_str_set(apr_array_header_t *s1, apr_array_header_t *s2)
 }
 
 #ifdef HAVE_SSL_CONF_CMD
-static int array_contains_ssl_param(apr_array_header_t *a,
-                                    const char *name, const char *value)
+/* Writes a hash of the ssl_ctx_param array to digest. */
+static void hash_ssl_params(apr_array_header_t *a,
+                            unsigned char digest[APR_MD5_DIGESTSIZE])
 {
+    apr_md5_ctx_t ctx;
     int n;
 
+    apr_md5_init(&ctx);
     for (n = 0; n < a->nelts; n++) {
         ssl_ctx_param_t *p = &APR_ARRAY_IDX(a, n, ssl_ctx_param_t);
 
-        if (strcmp(p->name, name) == 0 && strcmp(p->value, value) == 0)
-            return 1;
+        apr_md5_update(&ctx, p->name, strlen(p->name));
+        apr_md5_update(&ctx, "##", 2);
+        apr_md5_update(&ctx, p->value, strlen(p->value));
     }
-
-    return 0;
+    apr_md5_final(digest, &ctx);
 }
 
 /* Return non-zero if the two ssl_ctx_param arrays match exactly, else
  * zero. */
 static int array_cmp_ssl_ctx_params(apr_array_header_t *a1,
                                     apr_array_header_t *a2)
 {
-    int n;
+    unsigned char dig1[APR_MD5_DIGESTSIZE], dig2[APR_MD5_DIGESTSIZE];
 
     if (a1 == a2)
         return 1;
     if (a1->nelts != a2->nelts)
         return 0;
 
-    for (n = 0; n < a1->nelts; n++) {
-        ssl_ctx_param_t *p = &APR_ARRAY_IDX(a1, n, ssl_ctx_param_t);
+    hash_ssl_params(a1, dig1);
+    hash_ssl_params(a2, dig2);
 
-        if (!array_contains_ssl_param(a2, p->name, p->value))
-            return 0;
-    }
-
-    return 1;
+    return strcmp((char *)dig1, (char *)dig2) == 0;
 }
 #endif