From: Matt Caswell <matt@openssl.org>
Date: Mon, 24 Sep 2018 11:00:10 +0000 (+0100)
Subject: Fix no-psk
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734af93a278a7a06710167219e1f05e525c9dd49;p=openssl

Fix no-psk

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

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 440a5d6c19..c22c1f9ee8 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -471,7 +471,11 @@ struct ssl_method_st {
     long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void));
 };
 
-# define TLS13_MAX_RESUMPTION_PSK_LENGTH      PSK_MAX_PSK_LEN
+/*
+ * Matches the length of PSK_MAX_PSK_LEN. We keep it the same value for
+ * consistency, even in the event of OPENSSL_NO_PSK being defined.
+ */
+# define TLS13_MAX_RESUMPTION_PSK_LENGTH      256
 
 /*-
  * Lets make this into an ASN.1 type structure as follows