[openssl-commits] [openssl] master update

Matt Caswell matt at openssl.org
Tue Nov 8 14:00:31 UTC 2016


The branch master has been updated
       via  513d76f495a256daf5c70f3c96f8fddc84c84c6a (commit)
      from  b77b6127e8de38726f37697bbbc736ced7b49771 (commit)


- Log -----------------------------------------------------------------
commit 513d76f495a256daf5c70f3c96f8fddc84c84c6a
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 8 13:52:30 2016 +0000

    Fix zlib BIO_METHOD for latest BIO_METHOD structure changes
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/comp/c_zlib.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 2f38c2e..f0197b8 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -297,7 +297,11 @@ static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp);
 static const BIO_METHOD bio_meth_zlib = {
     BIO_TYPE_COMP,
     "zlib",
+    /* TODO: Convert to new style write function */
+    bwrite_conv,
     bio_zlib_write,
+    /* TODO: Convert to new style read function */
+    bread_conv,
     bio_zlib_read,
     NULL,
     NULL,


More information about the openssl-commits mailing list