commit c2b290c3d0ff878c33b3540df530f64af23163bf
author Matt Caswell <matt@openssl.org> Mon Mar 19 12:58:05 2018 +0000
committer Matt Caswell <matt@openssl.org> Mon Mar 19 14:47:12 2018 +0000
tree c9632bd9750f843ad40ee52587373b358ee203ff
parent 69e2b8d67d980b4dea8c5f2cb17cd86455989bb7

Fix no-psk

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5667)

ssl/statem/extensions_srvr.c

diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index ee4cad1..90142eb 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -1047,6 +1047,7 @@
             return 0;
         }
 
+#ifndef OPENSSL_NO_PSK
         if(sess == NULL
                 && s->psk_server_callback != NULL
                 && idlen <= PSK_MAX_IDENTITY_LEN) {
@@ -1097,6 +1098,7 @@
                 OPENSSL_cleanse(pskdata, pskdatalen);
             }
         }
+#endif /* OPENSSL_NO_PSK */
 
         if (sess != NULL) {
             /* We found a PSK */