From f6373823c04794d55dd0b30f5691666b1df5705c Mon Sep 17 00:00:00 2001 From: Alexey Komnin Date: Thu, 22 Jun 2017 09:45:17 +0300 Subject: [PATCH] Fix tls1_generate_master_secret Reviewed-by: Kurt Roeckx Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3751) --- ssl/t1_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 26ec8775c7..ce7f14d8b6 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -460,7 +460,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, hash, hashlen, NULL, 0, NULL, 0, - NULL, 0, p, len, s->session->master_key, + NULL, 0, p, len, out, SSL3_MASTER_SECRET_SIZE); OPENSSL_cleanse(hash, hashlen); } else { @@ -470,7 +470,7 @@ int tls1_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, s->s3->client_random, SSL3_RANDOM_SIZE, NULL, 0, s->s3->server_random, SSL3_RANDOM_SIZE, - NULL, 0, p, len, s->session->master_key, + NULL, 0, p, len, out, SSL3_MASTER_SECRET_SIZE); } #ifdef SSL_DEBUG -- 2.25.1