From: Ben Laurie <ben@links.org>
Date: Sun, 31 Jul 2016 14:48:24 +0000 (+0100)
Subject: peer_tmp doesn't exist if no-ec no-dh.
X-Git-Tag: OpenSSL_1_1_0-pre6~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3260adf1901ff3a842676ec7fa8c53dbfc66c4bd;p=oweals%2Fopenssl.git

peer_tmp doesn't exist if no-ec no-dh.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 5fb00803bf..9d4af3ab00 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1583,8 +1583,10 @@ MSG_PROCESS_RETURN tls_process_key_exchange(SSL *s, PACKET *pkt)
 
     save_param_start = *pkt;
 
+#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
     EVP_PKEY_free(s->s3->peer_tmp);
     s->s3->peer_tmp = NULL;
+#endif
 
     if (alg_k & SSL_PSK) {
         if (!tls_process_ske_psk_preamble(s, pkt, &al))