diff options
| author | Matt Caswell <matt@openssl.org> | 2019-01-14 16:37:14 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-01-15 11:40:39 +0000 |
| commit | ea09abc80892920ee5db4de82bed7a193b5896f0 (patch) | |
| tree | 196ff6c0acc8d910ec658b5231592b8479023501 /ssl | |
| parent | 7fe0ed75e3e7760226a0a3a5a86cf3887004f6e4 (diff) | |
| download | openssl-ea09abc80892920ee5db4de82bed7a193b5896f0.zip openssl-ea09abc80892920ee5db4de82bed7a193b5896f0.tar.gz openssl-ea09abc80892920ee5db4de82bed7a193b5896f0.tar.bz2 | |
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 <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/8020)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/tls13_enc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 6022950..e6cd705 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; |