[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  5b326dc529e19194feaef9a65fa37efbe11eaa7e (commit)
      from  63994098d52b31ff8c143fc2662f2fe9e3c016f1 (commit)


- Log -----------------------------------------------------------------
commit 5b326dc529e19194feaef9a65fa37efbe11eaa7e
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Feb 13 02:27:33 2016 +0000

    Free and zero DH/ECDH temporary key after use.
    
    PR#4303
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 ssl/statem/statem_srvr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 4d40d0f..e4c018a 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2360,6 +2360,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 
         EVP_PKEY_free(ckey);
         ckey = NULL;
+        EVP_PKEY_free(s->s3->tmp.pkey);
+        s->s3->tmp.pkey = NULL;
 
     } else
 #endif
@@ -2412,6 +2414,8 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 
         EVP_PKEY_free(ckey);
         ckey = NULL;
+        EVP_PKEY_free(s->s3->tmp.pkey);
+        s->s3->tmp.pkey = NULL;
 
         return MSG_PROCESS_CONTINUE_PROCESSING;
     } else