commit 4bea8509dacd4d637c5c77964d315172bf35d825
author David Benjamin <davidben@google.com> Thu May 12 09:34:55 2016 -0400
committer David Benjamin <davidben@google.com> Mon Jun 06 20:47:07 2016 +0000
tree bbaf5932a8fca49cde192f425c0064c0db44c64e
parent e90d004e007272df4dcc65a35138fe639635e5ab

Lift an impossible check to an assert.

This cannot happen.

Change-Id: Ib1b473aa91d6479eeff43f7eaf94906d0b2c2a8f
Reviewed-on: https://boringssl-review.googlesource.com/8123
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>

ssl/s3_pkt.c

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index c54c10b..5d8435e 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -314,6 +314,8 @@
 
 int ssl3_read_app_data(SSL *ssl, uint8_t *buf, int len, int peek) {
   assert(!SSL_in_init(ssl));
+  assert(ssl->s3->initial_handshake_complete);
+
   return ssl3_read_bytes(ssl, SSL3_RT_APPLICATION_DATA, buf, len, peek);
 }
 
@@ -469,14 +471,6 @@
                       sizeof(kHelloRequest), ssl, ssl->msg_callback_arg);
     }
 
-    if (!SSL_is_init_finished(ssl) || !ssl->s3->initial_handshake_complete) {
-      /* This cannot happen. If a handshake is in progress, |type| must be
-       * |SSL3_RT_HANDSHAKE|. */
-      assert(0);
-      OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
-      goto err;
-    }
-
     if (ssl->renegotiate_mode == ssl_renegotiate_ignore) {
       goto start;
     }
@@ -579,7 +573,6 @@
 
 f_err:
   ssl3_send_alert(ssl, SSL3_AL_FATAL, al);
-err:
   return -1;
 }