From: Benjamin Kaduk <bkaduk@akamai.com>
Date: Thu, 14 Sep 2017 15:23:20 +0000 (-0500)
Subject: Fix no-ec no-dh build
X-Git-Tag: OpenSSL_1_1_1-pre1~657
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5d270cab5021047cd88b71b92243141912f3906;p=oweals%2Fopenssl.git

Fix no-ec no-dh build

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4369)
---

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index ff907aa8d2..5f17864f98 100644
--- 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