From: Matt Caswell <matt@openssl.org>
Date: Mon, 14 Jan 2019 16:36:33 +0000 (+0000)
Subject: Add missing entries in ssl_mac_pkey_id
X-Git-Tag: openssl-3.0.0-alpha1~2644
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4;p=oweals%2Fopenssl.git

Add missing entries in ssl_mac_pkey_id

Fixes #8005

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

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index bd97c0fdab..461a9debab 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -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,
+    /* MD5/SHA1, SHA224, SHA512 */
+    NID_undef, NID_undef, NID_undef
 };
 
 static size_t ssl_mac_secret_size[SSL_MD_NUM_IDX];