commit | 199dc0d3e857fa4242d90d89a0df52e87b975c67 | [log] [tgz] |
---|---|---|
author | Matt Caswell <matt@openssl.org> | Mon May 14 14:28:06 2018 +0100 |
committer | Matt Caswell <matt@openssl.org> | Mon May 14 17:43:19 2018 +0100 |
tree | fa76925f959b61dc82850d0fe610f10b86db6180 | |
parent | 986caf9e34fd60366a5b3711bb12e239e43a2431 [diff] |
Fix no-psk Fixes #6239 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6253)
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c5f2235..354769b 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c
@@ -4192,6 +4192,7 @@ } if (SSL_IS_TLS13(s)) { +#ifndef OPENSSL_NO_PSK int j; /* @@ -4208,6 +4209,7 @@ prefer_sha256 = 1; } } +#endif } else { tls1_set_cert_validity(s); ssl_set_masks(s);