summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2018-09-19 10:09:39 +0100
committerMatt Caswell <matt@openssl.org>2018-09-21 17:56:57 +0100
commit11e1807b212e818458c2ff9ba6dfc520aee94354 (patch)
treef47d0a11c947d6703ed80c0d73ccefa0d1b8b5ff /ssl
parentaff58ee3828fec3bba8ffaeeba39bc77984fded4 (diff)
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@oracle.com> (Merged from https://github.com/openssl/openssl/pull/7267) (cherry picked from commit f39a02c68abc8936db24499cb3cfcba206a2e7eb)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl_locl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 8afb117372..440a5d6c19 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