The branch master has been updated via f5d270cab5021047cd88b71b92243141912f3906 (commit) from a8f730d5d240abe56b1d14c18223db3fd20f09e2 (commit)
- Log ----------------------------------------------------------------- commit f5d270cab5021047cd88b71b92243141912f3906 Author: Benjamin Kaduk <bka...@akamai.com> Date: Thu Sep 14 10:23:20 2017 -0500 Fix no-ec no-dh build Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4369) ----------------------------------------------------------------------- Summary of changes: 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 ff907aa..5f17864 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 _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits