diff options
| author | Matt Caswell <matt@openssl.org> | 2020-01-24 16:07:51 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-20 17:02:31 +0000 |
| commit | 22623e0cc26a11908253206a721873d4101cd466 (patch) | |
| tree | 2bf29095d05ad94c39567cd0358ea467d9af6488 /crypto | |
| parent | db943f43a60d1b5b1277e4b5317e8f288e7a0a3a (diff) | |
Teach more BIOs how to handle BIO_CTRL_EOF
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/10882)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_acpt.c | 7 | ||||
| -rw-r--r-- | crypto/bio/bss_conn.c | 5 | ||||
| -rw-r--r-- | crypto/bio/bss_fd.c | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index c6a2c38891..c9acf62dea 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -527,7 +527,12 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr) break; case BIO_CTRL_DUP: break; - + case BIO_CTRL_EOF: + if (b->next_bio == NULL) + ret = 0; + else + ret = BIO_ctrl(b->next_bio, cmd, num, ptr); + break; default: ret = 0; break; diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index ad299ac716..bb5049fb59 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -316,6 +316,8 @@ static int conn_read(BIO *b, char *out, int outl) if (ret <= 0) { if (BIO_sock_should_retry(ret)) BIO_set_retry_read(b); + else if (ret == 0) + b->flags |= BIO_FLAGS_IN_EOF; } } return ret; @@ -495,6 +497,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) *fptr = data->info_callback; } break; + case BIO_CTRL_EOF: + ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0; + break; default: ret = 0; break; diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 894b3ff9e7..76ca0bd887 100644 --- a/crypto/bio/bss_fd.c +++ b/crypto/bio/bss_fd.c @@ -123,6 +123,8 @@ static int fd_read(BIO *b, char *out, int outl) if (ret <= 0) { if (BIO_fd_should_retry(ret)) BIO_set_retry_read(b); + else if (ret == 0) + b->flags |= BIO_FLAGS_IN_EOF; } } return ret; @@ -186,6 +188,9 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr) case BIO_CTRL_FLUSH: ret = 1; break; + case BIO_CTRL_EOF: + ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0; + break; default: ret = 0; break; |