[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  f39a02c68abc8936db24499cb3cfcba206a2e7eb (commit)
      from  cd6fe29f5bad1a350a039673e06f83ec7a7ef619 (commit)


- Log -----------------------------------------------------------------
commit f39a02c68abc8936db24499cb3cfcba206a2e7eb
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 19 10:09:39 2018 +0100

    Fix the max psk len for TLSv1.3
    
    If using an old style TLSv1.2 PSK callback then the maximum possible PSK
    len is PSK_MAX_PSK_LEN (256) - not 64.
    
    Fixes #7261
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7267)

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

Summary of changes:
 ssl/ssl_locl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 8afb117..440a5d6 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -471,7 +471,7 @@ struct ssl_method_st {
     long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void));
 };
 
-# define TLS13_MAX_RESUMPTION_PSK_LENGTH      64
+# define TLS13_MAX_RESUMPTION_PSK_LENGTH      PSK_MAX_PSK_LEN
 
 /*-
  * Lets make this into an ASN.1 type structure as follows