summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Laurie <ben@links.org>2016-07-31 15:48:24 +0100
committerBen Laurie <ben@links.org>2016-08-01 11:30:33 +0100
commit3260adf1901ff3a842676ec7fa8c53dbfc66c4bd (patch)
treea1b9ceb4119c90be41ec7b07ed8843c1169e7999
parent620c6ad3125d7631f08c37033d1cb4302aef819a (diff)
peer_tmp doesn't exist if no-ec no-dh.
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/statem/statem_clnt.c2
1 files changed, 2 insertions, 0 deletions
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))