mirror of
https://github.com/openssl/openssl.git
synced 2025-01-30 14:01:55 +08:00
Make sure we free and cleanse the pms value in all code paths
Otherwise we get a memory leak. Reviewed-by: Kurt Roeckx <kurt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2326)
This commit is contained in:
parent
787ebcafcd
commit
c8ab3a4653
@ -4118,10 +4118,8 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey, int gensecret)
|
|||||||
|
|
||||||
rv = rv && tls13_generate_handshake_secret(s, pms, pmslen);
|
rv = rv && tls13_generate_handshake_secret(s, pms, pmslen);
|
||||||
} else {
|
} else {
|
||||||
/* Generate master secret and discard premaster */
|
rv = ssl_generate_master_secret(s, pms, pmslen, 0);
|
||||||
rv = ssl_generate_master_secret(s, pms, pmslen, 1);
|
|
||||||
}
|
}
|
||||||
pms = NULL;
|
|
||||||
} else {
|
} else {
|
||||||
/* Save premaster secret */
|
/* Save premaster secret */
|
||||||
s->s3->tmp.pms = pms;
|
s->s3->tmp.pms = pms;
|
||||||
|
Loading…
Reference in New Issue
Block a user