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:
a8f730d
)
Fix no-ec no-dh build
author
Benjamin Kaduk
<bkaduk@akamai.com>
Thu, 14 Sep 2017 15:23:20 +0000
(10:23 -0500)
committer
Benjamin Kaduk
<bkaduk@akamai.com>
Thu, 14 Sep 2017 15:23:20 +0000
(10:23 -0500)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4369)
ssl/statem/statem_clnt.c
patch
|
blob
|
history
diff --git
a/ssl/statem/statem_clnt.c
b/ssl/statem/statem_clnt.c
index ff907aa8d25d78b3354d597b834e601bdb31d0d2..5f17864f9845f1b167453ac125ad0180801e8b0d 100644
(file)
--- a/
ssl/statem/statem_clnt.c
+++ b/
ssl/statem/statem_clnt.c
@@
-1615,7
+1615,11
@@
static MSG_PROCESS_RETURN tls_process_hello_retry_request(SSL *s, PACKET *pkt)
OPENSSL_free(extensions);
extensions = NULL;
- if (s->ext.tls13_cookie_len == 0 && s->s3->tmp.pkey != NULL) {
+ if (s->ext.tls13_cookie_len == 0
+#if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH)
+ && s->s3->tmp.pkey != NULL
+#endif
+ ) {
/*
* We didn't receive a cookie or a new key_share so the next
* ClientHello will not change