[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  734af93a278a7a06710167219e1f05e525c9dd49 (commit)
      from  ec0c5f5693e39c5a013f81e6dd9dfd09ec65162d (commit)


- Log -----------------------------------------------------------------
commit 734af93a278a7a06710167219e1f05e525c9dd49
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Sep 24 12:00:10 2018 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_locl.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 440a5d6..c22c1f9 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