commit be05c63bf8be3970cedfce8132383e3a16dc7996
author David Benjamin <davidben@chromium.org> Fri May 15 23:43:17 2015 -0400
committer Adam Langley <agl@google.com> Thu May 21 20:51:39 2015 +0000
tree 8b23e3dc5c362a9a36b3941bcc2dee597dab5523
parent 8ec88108d4be27ff5134f311d883ea1f59401133

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>

ssl/s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index abfd36c..662077b 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -198,15 +198,6 @@
           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) {
           buf = BUF_MEM_new();
           if (buf == NULL ||

ssl/s3_srvr.c

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index d0adce6..9ce889a 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -212,15 +212,6 @@
           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) {
           buf = BUF_MEM_new();
           if (!buf || !BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {