[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  e57bbf9e1a95a93551dc711664d69ca086f7e0b1 (commit)
      from  627ddf7b5b7b1f0f69a57495c25f7cbd39c33961 (commit)


- Log -----------------------------------------------------------------
commit e57bbf9e1a95a93551dc711664d69ca086f7e0b1
Author: Rutger Hendriks <rutgerhendriks at gmail.com>
Date:   Mon Aug 31 13:59:51 2020 +0200

    Increase PSK_MAX_PSK_LEN to 512
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/12777)

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

Summary of changes:
 include/openssl/ssl.h.in | 2 +-
 ssl/ssl_local.h          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index 264b7eddb7..ac7c521e95 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -850,7 +850,7 @@ void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
  * resulting identity/psk
  */
 #  define PSK_MAX_IDENTITY_LEN 128
-#  define PSK_MAX_PSK_LEN 256
+#  define PSK_MAX_PSK_LEN 512
 typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
                                                const char *hint,
                                                char *identity,
diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 49d24e6a96..fd4eacdc38 100644
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -524,7 +524,7 @@ struct ssl_method_st {
  * 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
+# define TLS13_MAX_RESUMPTION_PSK_LENGTH      512
 
 /*-
  * Lets make this into an ASN.1 type structure as follows