diff options
| author | Matt Caswell <matt@openssl.org> | 2017-11-06 16:52:06 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-11-07 11:07:17 +0000 |
| commit | 1c47d35a0380783b62004a7cb8058d34e082f8d5 (patch) | |
| tree | 0d25c0717df9710e4c4663f6e5546d37eeef40c9 /ssl/record | |
| parent | 018632ae986af33b2dddb2c1496bf91446d35abe (diff) | |
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4685)
Diffstat (limited to 'ssl/record')
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 980e5a4b8b..d10b91b24f 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1305,8 +1305,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) + 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 0; + } totalbytes = 0; do { |