diff options
| author | Alexey Komnin <interfere.work@gmail.com> | 2017-06-22 09:45:17 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-22 11:54:19 -0400 |
| commit | f6373823c04794d55dd0b30f5691666b1df5705c (patch) | |
| tree | 3fc134936df87dde0b333184c7c1121fa5e3f57c /ssl/t1_enc.c | |
| parent | 32bbf777d0de7b0be90170b69fe9290096065fc9 (diff) | |
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)
Diffstat (limited to 'ssl/t1_enc.c')
| -rw-r--r-- | ssl/t1_enc.c | 4 |
1 files 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 |