[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  2df7971728ddd388a77de56acc01e4bab37796bb (commit)
      from  77543471c709089d3845f6bdcf13fa4557ec57dc (commit)


- Log -----------------------------------------------------------------
commit 2df7971728ddd388a77de56acc01e4bab37796bb
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Nov 6 16:52:06 2017 +0000

    Mark a zero length record as read
    
    If SSL_read() is called with a zero length buffer, and we read a zero length
    record then we should mark that record as read.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4686)

-----------------------------------------------------------------------

Summary of changes:
 ssl/record/rec_layer_s3.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index 5945d18..95026c6 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1133,8 +1133,16 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         if (recvd_type != NULL)
             *recvd_type = SSL3_RECORD_get_type(rr);
 
-        if (len <= 0)
-            return (len);
+        if (len <= 0) {
+            /*
+             * Mark a zero length record as read. This ensures multiple calls to
+             * SSL_read() with a zero length buffer will eventually cause
+             * SSL_pending() to report data as being available.
+             */
+            if (SSL3_RECORD_get_length(rr) == 0)
+                SSL3_RECORD_set_read(rr);
+            return len;
+        }
 
         read_bytes = 0;
         do {