From f5d270cab5021047cd88b71b92243141912f3906 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Thu, 14 Sep 2017 10:23:20 -0500 Subject: [PATCH] Fix no-ec no-dh build Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4369) --- ssl/statem/statem_clnt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.25.1