summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_packet.c')
-rw-r--r--src/lib/libssl/ssl_packet.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/libssl/ssl_packet.c b/src/lib/libssl/ssl_packet.c
index a8462ffd84..9ffc27e9a7 100644
--- a/src/lib/libssl/ssl_packet.c
+++ b/src/lib/libssl/ssl_packet.c
@@ -106,8 +106,7 @@ ssl_convert_sslv2_client_hello(SSL *s)
106 return -1; 106 return -1;
107 107
108 if (record_length < 9) { 108 if (record_length < 9) {
109 SSLerror( 109 SSLerror(SSL_R_RECORD_LENGTH_MISMATCH);
110 SSL_R_RECORD_LENGTH_MISMATCH);
111 return -1; 110 return -1;
112 } 111 }
113 if (record_length > 4096) { 112 if (record_length > 4096) {
@@ -150,8 +149,7 @@ ssl_convert_sslv2_client_hello(SSL *s)
150 if (!CBS_get_bytes(&cbs, &challenge, challenge_length)) 149 if (!CBS_get_bytes(&cbs, &challenge, challenge_length))
151 return -1; 150 return -1;
152 if (CBS_len(&cbs) != 0) { 151 if (CBS_len(&cbs) != 0) {
153 SSLerror( 152 SSLerror(SSL_R_RECORD_LENGTH_MISMATCH);
154 SSL_R_RECORD_LENGTH_MISMATCH);
155 return -1; 153 return -1;
156 } 154 }
157 155
@@ -236,16 +234,14 @@ ssl_server_legacy_first_packet(SSL *s)
236 if (ssl_is_sslv2_client_hello(&header) == 1) { 234 if (ssl_is_sslv2_client_hello(&header) == 1) {
237 /* Only permit SSLv2 client hellos if TLSv1.0 is enabled. */ 235 /* Only permit SSLv2 client hellos if TLSv1.0 is enabled. */
238 if (ssl_enabled_version_range(s, &min_version, NULL) != 1) { 236 if (ssl_enabled_version_range(s, &min_version, NULL) != 1) {
239 SSLerror( 237 SSLerror(SSL_R_NO_PROTOCOLS_AVAILABLE);
240 SSL_R_NO_PROTOCOLS_AVAILABLE);
241 return -1; 238 return -1;
242 } 239 }
243 if (min_version > TLS1_VERSION) 240 if (min_version > TLS1_VERSION)
244 return 1; 241 return 1;
245 242
246 if (ssl_convert_sslv2_client_hello(s) != 1) { 243 if (ssl_convert_sslv2_client_hello(s) != 1) {
247 SSLerror( 244 SSLerror(SSL_R_BAD_PACKET_LENGTH);
248 SSL_R_BAD_PACKET_LENGTH);
249 return -1; 245 return -1;
250 } 246 }
251 247