mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

BIO_write_ex: No error only on 0 bytes to write

Browse Source 
Fixes #15682

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15672)
This commit is contained in:
Tomas Mraz 2021-06-09 13:48:21 +02:00
parent 451c2a95bd
commit 20778ea7da
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/bio/bio_lib.c
View File

@ -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)

7
doc/man3/BIO_read.pod
View File

@ -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.