Remove dead checks. Those checks contradict an assert up in read_app_data. This is part of shrinking read_bytes further into get_record and its callers until it goes away. Here, this kind of policy should be controlled by the callers. Change-Id: If8f9a45b8b95093beab1b3d4abcd31da55c65322 Reviewed-on: https://boringssl-review.googlesource.com/7954 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index ed64676..34eeddb 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c
@@ -286,17 +286,6 @@ /* we now have a packet which can be read and processed */ if (type == rr->type) { - /* Make sure that we are not getting application data when we - * are doing a handshake for the first time. */ - if (SSL_in_init(ssl) && (type == SSL3_RT_APPLICATION_DATA) && - (ssl->s3->aead_read_ctx == NULL)) { - /* TODO(davidben): Is this check redundant with the handshake_func - * check? */ - al = SSL_AD_UNEXPECTED_MESSAGE; - OPENSSL_PUT_ERROR(SSL, SSL_R_APP_DATA_IN_HANDSHAKE); - goto f_err; - } - /* Discard empty records. */ if (rr->length == 0) { goto start;
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index 0bb7b91..f1eb6db 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c
@@ -406,17 +406,6 @@ if (type != 0 && type == rr->type) { ssl->s3->warning_alert_count = 0; - /* Make sure that we are not getting application data when we are doing a - * handshake for the first time. */ - if (SSL_in_init(ssl) && type == SSL3_RT_APPLICATION_DATA && - ssl->s3->aead_read_ctx == NULL) { - /* TODO(davidben): Is this check redundant with the handshake_func - * check? */ - al = SSL_AD_UNEXPECTED_MESSAGE; - OPENSSL_PUT_ERROR(SSL, SSL_R_APP_DATA_IN_HANDSHAKE); - goto f_err; - } - /* Discard empty records. */ if (rr->length == 0) { goto start;