From 6612d87b897f1f71237e6a7f5a075d46e74d8ac5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Thu, 15 Dec 2016 00:28:47 +0000 Subject: [PATCH] Use the correct size for TLSv1.3 finished keys We need to use the length of the handshake hash for the length of the finished key. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2157) --- ssl/tls13_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index 5896a5f239..cbe989c6a2 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -330,7 +330,7 @@ int tls13_change_cipher_state(SSL *s, int which) if (which & SSL3_CC_HANDSHAKE) { insecret = s->handshake_secret; finsecret = s->client_finished_secret; - finsecretlen = sizeof(s->client_finished_secret); + finsecretlen = EVP_MD_size(ssl_handshake_md(s)); label = client_handshake_traffic; labellen = sizeof(client_handshake_traffic) - 1; } else { @@ -342,7 +342,7 @@ int tls13_change_cipher_state(SSL *s, int which) if (which & SSL3_CC_HANDSHAKE) { insecret = s->handshake_secret; finsecret = s->server_finished_secret; - finsecretlen = sizeof(s->server_finished_secret); + finsecretlen = EVP_MD_size(ssl_handshake_md(s)); label = server_handshake_traffic; labellen = sizeof(server_handshake_traffic) - 1; } else { -- 2.25.1