diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2017-09-14 10:23:20 -0500 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2017-09-14 10:23:20 -0500 |
| commit | f5d270cab5021047cd88b71b92243141912f3906 (patch) | |
| tree | 482deb16ebff82cc64634b06bee8887523ce4673 /ssl | |
| parent | a8f730d5d240abe56b1d14c18223db3fd20f09e2 (diff) | |
| download | openssl-f5d270cab5021047cd88b71b92243141912f3906.tar.gz | |
Fix no-ec no-dh build
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4369)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/statem_clnt.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |