[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  74a62e9629b2d07360a62571ff3028c83b69b0d9 (commit)
      from  7795475f535e5368c20333903c1d2836f536115f (commit)


- Log -----------------------------------------------------------------
commit 74a62e9629b2d07360a62571ff3028c83b69b0d9
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Sat Dec 19 14:59:40 2015 +0000

    delete unused context
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

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

diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 0b279e7..014f211 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -2125,7 +2125,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 #endif
 #ifndef OPENSSL_NO_EC
     EVP_PKEY *ckey = NULL;
-    EVP_PKEY_CTX *pctx = NULL;
 #endif
     PACKET enc_premaster;
     unsigned char *data, *rsa_decrypt = NULL;
@@ -2656,7 +2655,6 @@ MSG_PROCESS_RETURN tls_process_client_key_exchange(SSL *s, PACKET *pkt)
 #endif
 #ifndef OPENSSL_NO_EC
     EVP_PKEY_free(ckey);
-    EVP_PKEY_CTX_free(pctx);
     OPENSSL_free(rsa_decrypt);
 #endif
 #ifndef OPENSSL_NO_PSK