aboutsummaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-01-14 16:36:33 +0000
committerMatt Caswell <matt@openssl.org>2019-01-15 11:40:39 +0000
commit7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4 (patch)
tree60d6880ea22c67d01f55fb465bc1fcbef48c9cac /ssl
parentd63bde7827b0be1172f823baf25309b54aa87e0f (diff)
downloadopenssl-7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4.zip
openssl-7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4.tar.gz
openssl-7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4.tar.bz2
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)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_ciph.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index bd97c0f..461a9de 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];