projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7fe0ed7
)
Don't get the mac type in TLSv1.3
author
Matt Caswell
<matt@openssl.org>
Mon, 14 Jan 2019 16:37:14 +0000
(16:37 +0000)
committer
Matt Caswell
<matt@openssl.org>
Tue, 15 Jan 2019 11:40:39 +0000
(11:40 +0000)
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)
ssl/tls13_enc.c
patch
|
blob
|
history
diff --git
a/ssl/tls13_enc.c
b/ssl/tls13_enc.c
index 6022950cf805e7b97bdd47dafde0daf733f546a5..e6cd7057f78cdb7e27f949db76abe7f5d3837dae 100644
(file)
--- 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;