diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2015-09-25 17:53:58 +0200 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-05-14 07:51:28 -0400 |
commit | 8a18bc25883bd6e6ac1268e42190250c564ba024 (patch) | |
tree | 19c5f9ee5ab70cefc53a6c6d45237f287c9742fe | |
parent | c32b9dcac2d70f3868b4b22fd7be0e5ccd854c52 (diff) |
Increment size limit for ClientHello messages
The current limit of 2^14 bytes is too low (e.g. RFC 5246 specifies the
maximum size of just the extensions field to be 2^16-1), and may cause
bogus failures.
RT#4063
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/413)
-rw-r--r-- | ssl/statem/statem_srvr.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 4507357abf..90b9d2dfac 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -747,6 +747,23 @@ int ossl_statem_server_construct_message(SSL *s) return 0; } +/* + * Maximum size (excluding the Handshake header) of a ClientHello message, + * calculated as follows: + * + * 2 + # client_version + * 32 + # only valid length for random + * 1 + # length of session_id + * 32 + # maximum size for session_id + * 2 + # length of cipher suites + * 2^16-2 + # maximum length of cipher suites array + * 1 + # length of compression_methods + * 2^8-1 + # maximum length of compression methods + * 2 + # length of extensions + * 2^16-1 # maximum length of extensions + */ +#define CLIENT_HELLO_MAX_LENGTH 131396 + #define CLIENT_KEY_EXCH_MAX_LENGTH 2048 #define NEXT_PROTO_MAX_LENGTH 514 @@ -760,7 +777,7 @@ unsigned long ossl_statem_server_max_message_size(SSL *s) switch(st->hand_state) { case TLS_ST_SR_CLNT_HELLO: - return SSL3_RT_MAX_PLAIN_LENGTH; + return CLIENT_HELLO_MAX_LENGTH; case TLS_ST_SR_CERT: return s->max_cert_list; |