commit 1cb405d96b11db5767446766d76516534067bbd1
author Adam Langley <alangley@gmail.com> Wed May 25 16:05:11 2016 -0700
committer Adam Langley <agl@google.com> Wed May 25 23:23:12 2016 +0000
tree 058f7122c139654e7dac3592be1775813990caf5
parent 494650cfcff2330652922ebd078066c2eff202cb

Revert "Forbid calling SSL_read, SSL_peek, and SSL_do_handshake post-shutdown."

This reverts commit c7eae5a3267dfc9557314a24cc8da77d287ae885. pyOpenSSL
expects to be able to call |SSL_read| after a shutdown and get EOF.

Change-Id: Icc5faa09d644ec29aac99b181dac0db197f283e3
Reviewed-on: https://boringssl-review.googlesource.com/8060
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_pkt.c

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index f1eb6db..c54c10b 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -494,8 +494,7 @@
     /* Begin a new handshake. */
     ssl->s3->total_renegotiations++;
     ssl->state = SSL_ST_CONNECT;
-    /* TODO(davidben): Lift this call up to SSL_read. */
-    i = SSL_do_handshake(ssl);
+    i = ssl->handshake_func(ssl);
     if (i < 0) {
       return i;
     }

ssl/ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 51a8a06..a27d430 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -565,11 +565,6 @@
     return -1;
   }
 
-  if (ssl->s3->send_shutdown != ssl_shutdown_none) {
-    OPENSSL_PUT_ERROR(SSL, SSL_R_PROTOCOL_IS_SHUTDOWN);
-    return -1;
-  }
-
   if (!SSL_in_init(ssl)) {
     return 1;
   }
@@ -610,11 +605,6 @@
     return -1;
   }
 
-  if (ssl->s3->send_shutdown != ssl_shutdown_none) {
-    OPENSSL_PUT_ERROR(SSL, SSL_R_PROTOCOL_IS_SHUTDOWN);
-    return -1;
-  }
-
   /* This may require multiple iterations. False Start will cause
    * |ssl->handshake_func| to signal success one step early, but the handshake
    * must be completely finished before other modes are accepted. */