From ea09abc80892920ee5db4de82bed7a193b5896f0 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 14 Jan 2019 16:37:14 +0000 Subject: [PATCH] Don't get the mac type in TLSv1.3 We don't use this information so we shouldn't fetch it. As noted in the comments in #8005. Reviewed-by: Ben Kaduk (Merged from https://github.com/openssl/openssl/pull/8020) --- ssl/tls13_enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 6022950cf8..e6cd7057f7 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -323,11 +323,9 @@ int tls13_setup_key_block(SSL *s) { const EVP_CIPHER *c; const EVP_MD *hash; - int mac_type = NID_undef; s->session->cipher = s->s3->tmp.new_cipher; - if (!ssl_cipher_get_evp - (s->session, &c, &hash, &mac_type, NULL, NULL, 0)) { + if (!ssl_cipher_get_evp(s->session, &c, &hash, NULL, NULL, NULL, 0)) { SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_TLS13_SETUP_KEY_BLOCK, SSL_R_CIPHER_OR_HASH_UNAVAILABLE); return 0; -- 2.34.1