Fix no-psk

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

diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 0d8fe5d9127a8f1add9f324a9fabd676a7478f94..6262a068c20ebab7c22e7fc39f735e9057388ed1 100644 (file)
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1493,7 +1493,12 @@ static int is_tls13_capable(const SSL *s)
 {
     int i;
 
-    if (s->psk_server_callback != NULL || s->psk_find_session_cb != NULL)
+#ifndef OPENSSL_NO_PSK
+    if (s->psk_server_callback != NULL)
+        return 1;
+#endif
+
+    if (s->psk_find_session_cb != NULL)
         return 1;
 
     for (i = 0; i < SSL_PKEY_NUM; i++) {