[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f6373823c04794d55dd0b30f5691666b1df5705c (commit)
      from  32bbf777d0de7b0be90170b69fe9290096065fc9 (commit)


- Log -----------------------------------------------------------------
commit f6373823c04794d55dd0b30f5691666b1df5705c
Author: Alexey Komnin <interfere.work at gmail.com>
Date:   Thu Jun 22 09:45:17 2017 +0300

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

-----------------------------------------------------------------------

Summary of changes:
 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 26ec877..ce7f14d 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