summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--crypto/bio/bio_lib.c8
-rw-r--r--doc/man3/BIO_read.pod7
2 files changed, 12 insertions, 3 deletions
diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index cdce122796..af7ad05bca 100644
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -393,7 +393,13 @@ int BIO_write(BIO *b, const void *data, int dlen)
int BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written)
{
- return bio_write_intern(b, data, dlen, written) >= 0;
+ if (dlen == 0) {
+ /* no error */
+ if (written != NULL)
+ *written = 0;
+ return 1;
+ }
+ return bio_write_intern(b, data, dlen, written) > 0;
}
int BIO_puts(BIO *b, const char *buf)
diff --git a/doc/man3/BIO_read.pod b/doc/man3/BIO_read.pod
index 08104b1b92..a2d8ab3af0 100644
--- a/doc/man3/BIO_read.pod
+++ b/doc/man3/BIO_read.pod
@@ -27,7 +27,7 @@ stored in I<*readbytes>.
BIO_write_ex() attempts to write I<dlen> bytes from I<data> to BIO I<b>.
If successful then the number of bytes written is stored in I<*written>
-unless I<written> is NULL. No data is written if I<b> is NULL.
+unless I<written> is NULL.
BIO_read() attempts to read I<len> bytes from BIO I<b> and places
the data in I<buf>.
@@ -59,7 +59,7 @@ BIO_puts() attempts to write a NUL-terminated string I<buf> to BIO I<b>.
BIO_read_ex() returns 1 if data was successfully read, and 0 otherwise.
BIO_write_ex() returns 1 if no error was encountered writing data, 0 otherwise.
-Write to NULL B<BIO> is not considered as an error.
+Requesting to write 0 bytes is not considered an error.
BIO_write() returns -2 if the "write" operation is not implemented by the BIO
or -1 on other errors.
@@ -114,6 +114,9 @@ keep the '\n' at the end of the line in the buffer.
BIO_get_line() was added in OpenSSL 3.0.
+BIO_write_ex() returns 1 if the size of the data to write is 0 and the
+I<written> parameter of the function can be NULL since OpenSSL 3.0.
+
=head1 COPYRIGHT
Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.