Commit 2df79717 authored by Matt Caswell's avatar Matt Caswell
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4686)
parent 77543471

ssl/record/rec_layer_s3.c

+10 −2
Original line number Diff line number Diff line
@@ -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 {