projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
620c6ad
)
peer_tmp doesn't exist if no-ec no-dh.
author
Ben Laurie
<ben@links.org>
Sun, 31 Jul 2016 14:48:24 +0000
(15:48 +0100)
committer
Ben Laurie
<ben@links.org>
Mon, 1 Aug 2016 10:30:33 +0000
(11:30 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
ssl/statem/statem_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_clnt.c
b/ssl/statem/statem_clnt.c
index 5fb00803bf19097eb5d189a56cc062e7f68c0e05..9d4af3ab00c460cb6fd7bfe29bb7400ff82392ef 100644
(file)
--- 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))