Commit f6373823 authored by Alexey Komnin's avatar Alexey Komnin Committed by Rich Salz
Browse files

Fix tls1_generate_master_secret 



Reviewed-by: default avatarKurt Roeckx <kurt@roeckx.be>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3751)
parent 32bbf777

ssl/t1_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -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