From: Alexey Komnin <interfere.work@gmail.com>
Date: Thu, 22 Jun 2017 06:45:17 +0000 (+0300)
Subject: Fix tls1_generate_master_secret
X-Git-Tag: OpenSSL_1_1_1-pre1~1218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6373823c04794d55dd0b30f5691666b1df5705c;p=thirdparty%2Fopenssl.git

Fix tls1_generate_master_secret

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3751)
---

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 26ec8775c7b..ce7f14d8b6a 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