[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  9c13b49a9f22d91c7f0576377975157f4f67984c (commit)
      from  639bb581ce5bfed0f3a6286ff4b2ccb773d3353d (commit)


- Log -----------------------------------------------------------------
commit 9c13b49a9f22d91c7f0576377975157f4f67984c
Author: Eric Curtin <ericcurtin17 at gmail.com>
Date:   Wed Sep 2 10:49:47 2020 +0100

    Increase PSK_MAX_IDENTITY_LEN from 128 to 256
    
    We are considering using the format "host-nqn controller-nqn" for
    psk-id in the NVMe-oF/TCP over TLS spec, it's in the current version,
    but openssl's limit was 128 upto now, we need a little longer than that.
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12771)

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

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

diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index ac7c521e95..1d7996ed61 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -849,7 +849,7 @@ void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
  * the maximum length of the buffer given to callbacks containing the
  * resulting identity/psk
  */
-#  define PSK_MAX_IDENTITY_LEN 128
+#  define PSK_MAX_IDENTITY_LEN 256
 #  define PSK_MAX_PSK_LEN 512
 typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
                                                const char *hint,