diff options
author | Todd Short <tshort@akamai.com> | 2015-12-22 11:49:36 -0500 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2015-12-23 13:33:28 +0000 |
commit | c849c6d9d3bf806fecfe0c16eaa55d361979ff7f (patch) | |
tree | 9157d5266263f99242e5d73247a0d45228931d9e /ssl/statem | |
parent | 87a595e554f9e753c3e653c8caae62739c7958b0 (diff) |
Memory leak in state machine in error path
When EC is disabled, and an error occurs in ssl_generate_master_secret()
or RAND_bytes(), the error path does not free rsa_decrypt.
RT#4197
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/statem')
-rw-r--r-- | ssl/statem/statem_srvr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 0e6f0d03dd..79254b5248 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -2620,8 +2620,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt) #endif #ifndef OPENSSL_NO_EC EVP_PKEY_free(ckey); - OPENSSL_free(rsa_decrypt); #endif + OPENSSL_free(rsa_decrypt); #ifndef OPENSSL_NO_PSK OPENSSL_clear_free(s->s3->tmp.psk, s->s3->tmp.psklen); s->s3->tmp.psk = NULL; |