From 8bb82fd94073885aa2b2a92fe61bc5cb58348f8b Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 30 Apr 2016 19:10:08 -0500 Subject: CRYPTO_cleanup_all_ex_data is a macro and CRYPTO_add no longer exists (#2882) We don't use CRYPTO_add and neither does pyOpenSSL --- src/_cffi_src/openssl/crypto.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 0ecfbd1e..11c44c9b 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -38,11 +38,12 @@ void CRYPTO_free(void *); int CRYPTO_mem_ctrl(int); int CRYPTO_is_mem_check_on(void); void CRYPTO_mem_leaks(struct bio_st *); -void CRYPTO_cleanup_all_ex_data(void); - """ MACROS = """ +/* CRYPTO_cleanup_all_ex_data became a macro in 1.1.0 */ +void CRYPTO_cleanup_all_ex_data(void); + /* as of 1.1.0 OpenSSL does its own locking *angelic chorus*. These functions have become macros that are no ops */ int CRYPTO_num_locks(void); @@ -56,8 +57,6 @@ const char *SSLeay_version(int); unsigned long OpenSSL_version_num(void); const char *OpenSSL_version(int); -void CRYPTO_add(int *, int, int); - /* this is a macro in 1.1.0 */ void OPENSSL_free(void *); -- cgit v1.2.3