diff options
| author | Matt Caswell <matt@openssl.org> | 2018-09-24 12:00:10 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-09-25 16:01:22 +0100 |
| commit | 734af93a278a7a06710167219e1f05e525c9dd49 (patch) | |
| tree | cdb2ee8700671b71b339392c941b9a8292919438 /ssl/ssl_locl.h | |
| parent | ec0c5f5693e39c5a013f81e6dd9dfd09ec65162d (diff) | |
Fix no-psk
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7306)
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 440a5d6c19..c22c1f9ee8 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -471,7 +471,11 @@ struct ssl_method_st { long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void)); }; -# define TLS13_MAX_RESUMPTION_PSK_LENGTH PSK_MAX_PSK_LEN +/* + * 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 /*- * Lets make this into an ASN.1 type structure as follows |