From e55b381c10eaa17e843d7d2e3aa12cdc34e96799 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 17 Mar 2016 14:31:53 -0400 Subject: slowly re-add everything that was removed, but now conditional --- src/_cffi_src/openssl/crypto.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/_cffi_src/openssl') diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 27948bd5..0ecfbd1e 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -60,6 +60,9 @@ void CRYPTO_add(int *, int, int); /* this is a macro in 1.1.0 */ void OPENSSL_free(void *); + +/* This was removed in 1.1.0 */ +void CRYPTO_lock(int, int, const char *, int); """ CUSTOMIZATIONS = """ @@ -92,6 +95,7 @@ static const long CRYPTO_LOCK = 0; static const long CRYPTO_UNLOCK = 0; static const long CRYPTO_READ = 0; static const long CRYPTO_LOCK_SSL = 0; +void (*CRYPTO_lock)(int, int, const char *, int) = NULL; #else static const long Cryptography_HAS_LOCKING_CALLBACKS = 1; #endif -- cgit v1.2.3