Add missing entries in ssl_mac_pkey_id
authorMatt Caswell <matt@openssl.org>
Mon, 14 Jan 2019 16:36:33 +0000 (16:36 +0000)
committerMatt Caswell <matt@openssl.org>
Tue, 15 Jan 2019 11:50:35 +0000 (11:50 +0000)
Fixes #8005

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/8020)

(cherry picked from commit 7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4)

ssl/ssl_ciph.c

index 14066d0ea4519868ba64e283298a83a461696da6..044dd3af92c6671ca1a28a34574bb18a5f266310 100644 (file)
@@ -171,6 +171,8 @@ static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = {
     EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, NID_undef,
     /* GOST2012_512 */
     EVP_PKEY_HMAC,
     EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, NID_undef,
     /* GOST2012_512 */
     EVP_PKEY_HMAC,
+    /* MD5/SHA1, SHA224, SHA512 */
+    NID_undef, NID_undef, NID_undef
 };
 
 static size_t ssl_mac_secret_size[SSL_MD_NUM_IDX];
 };
 
 static size_t ssl_mac_secret_size[SSL_MD_NUM_IDX];