RT3095: allow NULL key for single-shot HMAC

In HMAC_Init_ex, NULL key signals reuse, but in single-shot HMAC,
we can allow it to signal an empty key for convenience.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 0a3b09fadb6ba87f10d8308a15424318efb6c0b4..f372955c60d21a549a9ff3de65db0b6992736658 100644 (file)
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -248,11 +248,18 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
 {
     HMAC_CTX *c = NULL;
     static unsigned char m[EVP_MAX_MD_SIZE];
 {
     HMAC_CTX *c = NULL;
     static unsigned char m[EVP_MAX_MD_SIZE];

+    static const unsigned char dummy_key[1] = {'\0'};

 
     if (md == NULL)
         md = m;
     if ((c = HMAC_CTX_new()) == NULL)
         goto err;
 
     if (md == NULL)
         md = m;
     if ((c = HMAC_CTX_new()) == NULL)
         goto err;

+
+    /* For HMAC_Init_ex, NULL key signals reuse. */
+    if (key == NULL && key_len == 0) {
+        key = dummy_key;
+    }
+

     if (!HMAC_Init_ex(c, key, key_len, evp_md, NULL))
         goto err;
     if (!HMAC_Update(c, d, n))
     if (!HMAC_Init_ex(c, key, key_len, evp_md, NULL))
         goto err;
     if (!HMAC_Update(c, d, n))

diff --git a/test/hmactest.c b/test/hmactest.c
index 47799093bf9f1366ad83a02b0a21ee9cef723466..2ceec5fa6d9bfaaf6bd4e1ef662901be3bbb291f 100644 (file)
--- a/test/hmactest.c
+++ b/test/hmactest.c
@@ -62,6 +62,7 @@
 #include "../e_os.h"
 
 # include <openssl/hmac.h>
 #include "../e_os.h"
 
 # include <openssl/hmac.h>

+# include <openssl/sha.h>

 # ifndef OPENSSL_NO_MD5
 #  include <openssl/md5.h>
 # endif
 # ifndef OPENSSL_NO_MD5
 #  include <openssl/md5.h>
 # endif


@@ -192,6 +193,15 @@ int main(int argc, char *argv[])
     }
     printf("test 4 ok\n");
 test5:
     }
     printf("test 4 ok\n");
 test5:

+    /* Test 5 has empty key; test that single-shot accepts a NULL key. */
+    p = pt(HMAC(EVP_sha1(), NULL, 0, test[4].data, test[4].data_len,
+                NULL, NULL), SHA_DIGEST_LENGTH);
+    if (strcmp(p, (char *)test[4].digest) != 0) {
+        printf("Error calculating HMAC on %d entry'\n", i);
+        printf("got %s instead of %s\n", p, test[4].digest);
+        err++;
+    }
+

     HMAC_CTX_reset(ctx);
     if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {
         printf("Should fail to initialise HMAC with empty MD (test 5)\n");
     HMAC_CTX_reset(ctx);
     if (HMAC_Init_ex(ctx, test[4].key, test[4].key_len, NULL, NULL)) {
         printf("Should fail to initialise HMAC with empty MD (test 5)\n");


@@ -235,7 +245,7 @@ test5:
         err++;
         goto test6;
     }
         err++;
         goto test6;
     }

-    if (!HMAC_Init_ex(ctx, test[4].key, test[4].key_len, EVP_sha256(), NULL)) {
+    if (!HMAC_Init_ex(ctx, test[5].key, test[5].key_len, EVP_sha256(), NULL)) {

         printf("Failed to reinitialise HMAC (test 5)\n");
         err++;
         goto test6;
         printf("Failed to reinitialise HMAC (test 5)\n");
         err++;
         goto test6;