[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  f2c147685a88790527aa1706ef5d35a04ca5e226 (commit)
      from  8382fd3a93cb076af5ad954613557152c878172f (commit)


- Log -----------------------------------------------------------------
commit f2c147685a88790527aa1706ef5d35a04ca5e226
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Jan 1 00:47:06 2016 +0000

    remove invalid free
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 ssl/statem/statem_clnt.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index c0eeeed..d168b19 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -2378,8 +2378,6 @@ psk_err:
         if (s->version > SSL3_VERSION)
             p += 2;
         pctx = EVP_PKEY_CTX_new(pkey, NULL);
-        EVP_PKEY_free(pkey);
-        pkey = NULL;
         if (pctx == NULL || EVP_PKEY_encrypt_init(pctx) <= 0
             || EVP_PKEY_encrypt(pctx, NULL, &enclen, pms, pmslen) <= 0) {
             SSLerr(SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE,