commit 9736716017aac1d9da14b858903b20bb65b426e6
author Paul Kehrer <paul.l.kehrer@gmail.com> Fri Aug 26 20:02:03 2016 +0800
committer Alex Gaynor <alex.gaynor@gmail.com> Fri Aug 26 08:02:03 2016 -0400
tree 0d76be26503a6a41867d9cbb93217e82f851b3ad
parent fea3b129b5013d251f31de18b2642c22317b6ba3

be a bit more robust about detecting locking callback declarations (#3107)

src/_cffi_src/openssl/crypto.py

diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py
index f5d5396..39a571e 100644
--- a/src/_cffi_src/openssl/crypto.py
+++ b/src/_cffi_src/openssl/crypto.py
@@ -83,14 +83,22 @@
 # define OPENSSL_PLATFORM        SSLEAY_PLATFORM
 # define OPENSSL_DIR             SSLEAY_DIR
 #endif
-#if !defined(CRYPTO_LOCK)
-static const long Cryptography_HAS_LOCKING_CALLBACKS = 0;
-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
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 || defined(LIBRESSL_VERSION_NUMBER)
 static const long Cryptography_HAS_LOCKING_CALLBACKS = 1;
+#else
+static const long Cryptography_HAS_LOCKING_CALLBACKS = 0;
+#if !defined(CRYPTO_LOCK)
+static const long CRYPTO_LOCK = 0;
+#endif
+#if !defined(CRYPTO_UNLOCK)
+static const long CRYPTO_UNLOCK = 0;
+#endif
+#if !defined(CRYPTO_READ)
+static const long CRYPTO_READ = 0;
+#endif
+#if !defined(CRYPTO_LOCK_SSL)
+static const long CRYPTO_LOCK_SSL = 0;
+#endif
+void (*CRYPTO_lock)(int, int, const char *, int) = NULL;
 #endif
 """