kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lift an impossible check to an assert.

Browse Source 
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>
This commit is contained in:
David Benjamin 2016-05-12 09:34:55 -04:00
parent e90d004e00
commit 4bea8509da
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ssl/s3_pkt.c
View File

@ -314,6 +314,8 @@ static int do_ssl3_write(SSL *ssl, int type, const uint8_t *buf, unsigned len) {
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 @@ start:
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 @@ start:
f_err:
ssl3_send_alert(ssl, SSL3_AL_FATAL, al);
err:
return -1;
}