commit f8ba2855354cf8a6b5a4664a1c93be889b8e2890
author David Benjamin <davidben@chromium.org> Fri Apr 03 02:39:21 2015 -0400
committer Adam Langley <agl@google.com> Mon Apr 06 20:49:00 2015 +0000
tree 93e7c4c904b04fb841ef27d477e2a6b35e45c6f8
parent cfd248b7f6be0a3a8a21d96b21a61203ce24d1c8

Remove redundant SSL_READING lines after ssl_read_bytes.

These are redundant with the lower level ones in s3_pkt.c just before BIO_read.
Only the operation which actually failed an operation on the BIO should set
the wait state.

Not all failure paths in ssl3_read_bytes and dtls1_read_bytes set SSL_READING,
but those that don't leave the BIO in a retry state, so SSL_READING doesn't
matter.

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

ssl/d1_both.c

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index bcf8640..4004499 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -489,7 +489,6 @@
   int ret = s->method->ssl_read_bytes(s, SSL3_RT_HANDSHAKE, header,
                                       DTLS1_HM_HEADER_LENGTH, 0);
   if (ret <= 0) {
-    s->rwstate = SSL_READING;
     return ret;
   }
   if (ret != DTLS1_HM_HEADER_LENGTH) {

ssl/s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index c3ba775..1126c11 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -353,7 +353,6 @@
         int bytes_read = s->method->ssl_read_bytes(
             s, SSL3_RT_HANDSHAKE, &p[s->init_num], 4 - s->init_num, 0);
         if (bytes_read <= 0) {
-          s->rwstate = SSL_READING;
           *ok = 0;
           return bytes_read;
         }