From 64c9d893c3748e962d01a935625c58610826f23c Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Tue, 1 Mar 2016 14:22:32 -0600 Subject: move BIO_new_mem_buf to macros to handle 1.0.2g signature change --- src/_cffi_src/openssl/bio.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py index ac866831..6439e63a 100644 --- a/src/_cffi_src/openssl/bio.py +++ b/src/_cffi_src/openssl/bio.py @@ -99,7 +99,6 @@ BIO *BIO_pop(BIO *); BIO *BIO_next(BIO *); BIO *BIO_find_type(BIO *, int); BIO_METHOD *BIO_s_mem(void); -BIO *BIO_new_mem_buf(void *, int); BIO_METHOD *BIO_s_file(void); BIO *BIO_new_file(const char *, const char *); BIO *BIO_new_fp(FILE *, int); @@ -127,6 +126,8 @@ BIO_METHOD *BIO_f_buffer(void); """ MACROS = """ +/* BIO_new_mem_buf became const void * in 1.0.2g */ +BIO *BIO_new_mem_buf(void *, int); long BIO_set_fd(BIO *, long, int); long BIO_get_fd(BIO *, char *); long BIO_set_mem_eof_return(BIO *, int); -- cgit v1.2.3 From 287ab1b55002542ea4a2880b9aa775c431868c72 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 1 Mar 2016 22:15:55 -0500 Subject: Bring the changelog as well --- CHANGELOG.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 472d0621..6765f826 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,11 @@ Changelog * Added support for the :class:`~cryptography.x509.PolicyConstraints` X.509 extension. +1.2.3 - 2016-03-01 +~~~~~~~~~~~~~~~~~~ + +* Updated Windows and OS X wheels to be compiled against OpenSSL 1.0.2g. + 1.2.2 - 2016-01-29 ~~~~~~~~~~~~~~~~~~ -- cgit v1.2.3 -- cgit v1.2.3