summaryrefslogtreecommitdiff
path: root/crypto/bio/bss_fd.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-01-24 16:07:51 +0000
committerMatt Caswell <matt@openssl.org>2020-02-04 14:39:29 +0000
commit6d53ad6b5cf726d92860e973d7bc8c1930762086 (patch)
treecced1a142b3235654d6759de1234f8461593dcde /crypto/bio/bss_fd.c
parentd924dbf4ae127c68463bcbece04b6e06abc58928 (diff)
downloadopenssl-new-6d53ad6b5cf726d92860e973d7bc8c1930762086.tar.gz
Teach more BIOs how to handle BIO_CTRL_EOF
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/10907)
Diffstat (limited to 'crypto/bio/bss_fd.c')
-rw-r--r--crypto/bio/bss_fd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index 9db3317e9a..599790d654 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;