[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  797a5b7af9d9bbfbcbff4607c10ad5c5595ac785 (commit)
      from  3a5777501a97cc3fbf2884f6f3f966661a3f2e41 (commit)


- Log -----------------------------------------------------------------
commit 797a5b7af9d9bbfbcbff4607c10ad5c5595ac785
Author: Johannes <johannesp at securelogicgroup.com>
Date:   Tue Aug 20 16:13:47 2019 +1000

    Correct documented return value for BIO_get_mem_data()
    
    CLA: trivial
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/9643)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/BIO_s_mem.pod | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/man3/BIO_s_mem.pod b/doc/man3/BIO_s_mem.pod
index b7c6fdf860..69746dc9b0 100644
--- a/doc/man3/BIO_s_mem.pod
+++ b/doc/man3/BIO_s_mem.pod
@@ -122,9 +122,12 @@ There should be an option to set the maximum size of a memory BIO.
 
 BIO_s_mem() and BIO_s_secmem() return a valid memory B<BIO_METHOD> structure.
 
-BIO_set_mem_eof_return(), BIO_get_mem_data(), BIO_set_mem_buf() and BIO_get_mem_ptr()
+BIO_set_mem_eof_return(), BIO_set_mem_buf() and BIO_get_mem_ptr()
 return 1 on success or a value which is less than or equal to 0 if an error occurred.
 
+BIO_get_mem_data() returns the total number of bytes available on success,
+0 if b is NULL, or a negative value in case of other errors.
+
 BIO_new_mem_buf() returns a valid B<BIO> structure on success or NULL on error.
 
 =head1 EXAMPLES