From: Matt Caswell <matt@openssl.org>
Date: Mon, 16 Jul 2018 16:31:37 +0000 (+0100)
Subject: Fix no-psk
X-Git-Tag: OpenSSL_1_1_1-pre9~134
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d162340d367d7a74916106d8706c6b22adb727c2;ds=sidebyside

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 0d8fe5d912..6262a068c2 100644
--- 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++) {