Clean premaster_secret for GOST
authorMatt Caswell <matt@openssl.org>
Thu, 4 Jun 2015 10:16:16 +0000 (11:16 +0100)
committerMatt Caswell <matt@openssl.org>
Thu, 4 Jun 2015 11:58:00 +0000 (12:58 +0100)
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@openssl.org>
(cherry picked from commit b7ee4815f2452c854cc859e8dda88f2673cdddea)

Conflicts:
ssl/s3_srvr.c

ssl/s3_srvr.c

index 8d3244f9e4add7b07e9cba9870b1fa88503695be..7ebcca6d677bd0280725a832dba8127383108ff3 100644 (file)
@@ -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)