diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-05-29 17:54:59 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-05-29 17:54:59 +0000 |
| commit | 616252feca8a85d226a38e86042508233d46e502 (patch) | |
| tree | a3c0f1f2f44e364347d469ff3503cab1ca3518f3 | |
| parent | 11e4fda5b9572dee12d32fd987071c078b1e1e80 (diff) | |
Handle the case where we receive a valid 0 byte application data record.
In this situation we cannot return zero bytes, as that signals EOF. Rather
we need to return TLS13_IO_WANT_POLLIN so tell the caller to call us again,
at which point we'll pull up the next record.
ok tb@
| -rw-r--r-- | lib/libssl/tls13_record_layer.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/libssl/tls13_record_layer.c b/lib/libssl/tls13_record_layer.c index 70c440fee09..5e6f8e1e5bc 100644 --- a/lib/libssl/tls13_record_layer.c +++ b/lib/libssl/tls13_record_layer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls13_record_layer.c,v 1.46 2020/05/26 16:54:50 jsing Exp $ */ +/* $OpenBSD: tls13_record_layer.c,v 1.47 2020/05/29 17:54:58 jsing Exp $ */ /* * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> * @@ -888,6 +888,15 @@ tls13_record_layer_read_internal(struct tls13_record_layer *rl, if (CBS_len(&rl->rbuf_cbs) == 0) { if ((ret = tls13_record_layer_read_record(rl)) <= 0) return ret; + + /* + * We may have read a valid 0-byte application data record, + * in which case we need to read the next record. + */ + if (CBS_len(&rl->rbuf_cbs) == 0) { + tls13_record_layer_rbuf_free(rl); + return TLS13_IO_WANT_POLLIN; + } } /* |