From 199dc0d3e857fa4242d90d89a0df52e87b975c67 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Mon, 14 May 2018 14:28:06 +0100
Subject: [PATCH] Fix no-psk

Fixes #6239

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6253)
---
 ssl/s3_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index c5f22359d5..354769b0c1 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -4192,6 +4192,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
     }
 
     if (SSL_IS_TLS13(s)) {
+#ifndef OPENSSL_NO_PSK
         int j;
 
         /*
@@ -4208,6 +4209,7 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
                 prefer_sha256 = 1;
             }
         }
+#endif
     } else {
         tls1_set_cert_validity(s);
         ssl_set_masks(s);
-- 
2.25.1