Remove OPENSSL_MAX_TLS1_2_CIPHER_LENGTH. It's not built. The problem is worked around by the padding extension now. Change-Id: If577efdae57d1bca4e0a626486fc0502c3567ebb Reviewed-on: https://boringssl-review.googlesource.com/1374 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index d7026f9..d80cc98 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c
@@ -389,15 +389,6 @@ OPENSSL_PUT_ERROR(SSL, ssl23_client_hello, SSL_R_NO_CIPHERS_AVAILABLE); return -1; } -#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH - /* Some servers hang if client hello > 256 bytes - * as hack workaround chop number of supported ciphers - * to keep it well below this if we use TLS v1.2 - */ - if (TLS1_get_version(s) >= TLS1_2_VERSION - && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH) - i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1; -#endif s2n(i,p); p+=i;
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index b61568a..c2b7cad 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c
@@ -794,15 +794,6 @@ OPENSSL_PUT_ERROR(SSL, ssl3_client_hello, SSL_R_NO_CIPHERS_AVAILABLE); goto err; } -#ifdef OPENSSL_MAX_TLS1_2_CIPHER_LENGTH - /* Some servers hang if client hello > 256 bytes - * as hack workaround chop number of supported ciphers - * to keep it well below this if we use TLS v1.2 - */ - if (TLS1_get_version(s) >= TLS1_2_VERSION - && i > OPENSSL_MAX_TLS1_2_CIPHER_LENGTH) - i = OPENSSL_MAX_TLS1_2_CIPHER_LENGTH & ~1; -#endif s2n(i,p); p+=i;