Remove compatibility s->version checks.

They were added to avoid accidentally enabling renego for a consumer which set
them to zero to break the handshake on renego. Now that renego is off by
default, we can get rid of them again.

Change-Id: I2cc3bf567c55c6562352446a36f2b5af37f519ba
Reviewed-on: https://boringssl-review.googlesource.com/4827
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-05-15 23:43:17 -04:00 committed by Adam Langley
parent 8ec88108d4
commit be05c63bf8
2 changed files with 0 additions and 18 deletions

View File

@ -198,15 +198,6 @@ int ssl3_connect(SSL *s) {
cb(s, SSL_CB_HANDSHAKE_START, 1); cb(s, SSL_CB_HANDSHAKE_START, 1);
} }
if ((s->version >> 8) != 3) {
/* TODO(davidben): Some consumers clear |s->version| to break the
* handshake in a callback. Remove this when they're using proper
* APIs. */
OPENSSL_PUT_ERROR(SSL, ssl3_connect, ERR_R_INTERNAL_ERROR);
ret = -1;
goto end;
}
if (s->init_buf == NULL) { if (s->init_buf == NULL) {
buf = BUF_MEM_new(); buf = BUF_MEM_new();
if (buf == NULL || if (buf == NULL ||

View File

@ -212,15 +212,6 @@ int ssl3_accept(SSL *s) {
cb(s, SSL_CB_HANDSHAKE_START, 1); cb(s, SSL_CB_HANDSHAKE_START, 1);
} }
if ((s->version >> 8) != 3) {
/* TODO(davidben): Some consumers clear |s->version| to break the
* handshake in a callback. Remove this when they're using proper
* APIs. */
OPENSSL_PUT_ERROR(SSL, ssl3_accept, ERR_R_INTERNAL_ERROR);
ret = -1;
goto end;
}
if (s->init_buf == NULL) { if (s->init_buf == NULL) {
buf = BUF_MEM_new(); buf = BUF_MEM_new();
if (!buf || !BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) { if (!buf || !BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {