diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-23 16:59:35 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:24 +0000 |
| commit | 1a3392c878e8421c2e5730fde5accd4ab77c2875 (patch) | |
| tree | 81ec1a08db9c3eb55d508be10a75cb0829acaf65 /include | |
| parent | 342543426d19ad948e3e7a37209baa78d0032d86 (diff) | |
Fix <= TLS1.2 break
Changing the value of SSL_MAX_MASTER_KEY_LENGTH had some unexpected
side effects in the <=TLS1.2 code which apparently relies on this being
48 for interoperability. Therefore create a new define for the TLSv1.3
resumption master secret which can be up to 64 bytes.
Found through the boring test suite.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index e8f351dfc5..9d9e193a8c 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -76,7 +76,8 @@ extern "C" { # define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES (512/8) # define SSL_MAX_KEY_ARG_LENGTH 8 -# define SSL_MAX_MASTER_KEY_LENGTH 64 +# define SSL_MAX_MASTER_KEY_LENGTH 48 +# define TLS13_MAX_RESUMPTION_MASTER_LENGTH 64 /* The maximum number of encrypt/decrypt pipelines we can support */ # define SSL_MAX_PIPELINES 32 |