[openssl-commits] [openssl] OpenSSL_1_0_0-stable update

[Matt Caswell]

The branch OpenSSL_1_0_0-stable has been updated
       via  bb82db1c776ec85b9a63f79fa04b001fb7d46fc7 (commit)
       via  470446db9a0861b01cba33dd42062ecc5734df53 (commit)
      from  91e64e142770bc13145346a5e89e9d95bc3e22dd (commit)


- Log -----------------------------------------------------------------
commit bb82db1c776ec85b9a63f79fa04b001fb7d46fc7
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 4 11:18:55 2015 +0100

    Remove misleading comment
    
    Remove a comment that suggested further clean up was required.
    DH_free() performs the necessary cleanup.
    
    With thanks to the Open Crypto Audit Project for reporting this issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit f3d889523ee84f1e87e4da0d59e2702a4bee7907)

commit 470446db9a0861b01cba33dd42062ecc5734df53
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 4 11:16:16 2015 +0100

    Clean premaster_secret for GOST
    
    Ensure OPENSSL_cleanse() is called on the premaster secret value calculated for GOST.
    
    With thanks to the Open Crypto Audit Project for reporting this issue.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (cherry picked from commit b7ee4815f2452c854cc859e8dda88f2673cdddea)
    
    Conflicts:
    	ssl/s3_srvr.c

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

Summary of changes:
 ssl/s3_clnt.c | 2 --
 ssl/s3_srvr.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index f906389..980c74c 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2307,8 +2307,6 @@ int ssl3_send_client_key_exchange(SSL *s)
             n += 2;
 
             DH_free(dh_clnt);
-
-            /* perhaps clean things up a bit EAY EAY EAY EAY */
         }
 #endif
 
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 8d3244f..7ebcca6 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -2664,6 +2664,7 @@ int ssl3_get_client_key_exchange(SSL *s)
                                                         s->
                                                         session->master_key,
                                                         premaster_secret, 32);
+        OPENSSL_cleanse(premaster_secret, sizeof(premaster_secret));
         /* Check if pubkey from client certificate was used */
         if (EVP_PKEY_CTX_ctrl
             (pkey_ctx, -1, -1, EVP_PKEY_CTRL_PEER_KEY, 2, NULL) > 0)