diff options
| -rw-r--r-- | src/_cffi_src/openssl/callbacks.py | 5 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 1 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/binding.py | 3 | ||||
| -rw-r--r-- | tests/hazmat/bindings/test_openssl.py | 9 |
4 files changed, 13 insertions, 5 deletions
diff --git a/src/_cffi_src/openssl/callbacks.py b/src/_cffi_src/openssl/callbacks.py index 13c4e10c..75c62016 100644 --- a/src/_cffi_src/openssl/callbacks.py +++ b/src/_cffi_src/openssl/callbacks.py @@ -47,6 +47,7 @@ CUSTOMIZATIONS = """ using CPython APIs by Armin Rigo of the PyPy project. */ +#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 #ifdef _WIN32 typedef CRITICAL_SECTION Cryptography_mutex; static __inline void cryptography_mutex_init(Cryptography_mutex *mutex) { @@ -80,7 +81,6 @@ static inline void cryptography_mutex_unlock(Cryptography_mutex *mutex) { #endif - static unsigned int _ssl_locks_count = 0; static Cryptography_mutex *_ssl_locks = NULL; @@ -135,6 +135,9 @@ int Cryptography_setup_ssl_threads(void) { } return 1; } +#else +int (*Cryptography_setup_ssl_threads)(void) = NULL; +#endif typedef struct { char *password; diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 6cfd29fc..f477f6ab 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -143,6 +143,7 @@ def cryptography_has_locking_callbacks(): "CRYPTO_READ", "CRYPTO_LOCK_SSL", "CRYPTO_lock", + "Cryptography_setup_ssl_threads", ] diff --git a/src/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py index 81cf547a..ec74d4cf 100644 --- a/src/cryptography/hazmat/bindings/openssl/binding.py +++ b/src/cryptography/hazmat/bindings/openssl/binding.py @@ -140,7 +140,8 @@ class Binding(object): # the setup for this. __import__("_ssl") - if cls.lib.CRYPTO_get_locking_callback() != cls.ffi.NULL: + if (not cls.lib.Cryptography_HAS_LOCKING_CALLBACKS or + cls.lib.CRYPTO_get_locking_callback() != cls.ffi.NULL): return # If nothing else has setup a locking callback already, we set up diff --git a/tests/hazmat/bindings/test_openssl.py b/tests/hazmat/bindings/test_openssl.py index f317f07f..fb1e62fa 100644 --- a/tests/hazmat/bindings/test_openssl.py +++ b/tests/hazmat/bindings/test_openssl.py @@ -21,12 +21,15 @@ class TestOpenSSL(object): def test_crypto_lock_init(self): b = Binding() - if b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER: - pytest.skip("Requires an older OpenSSL. Must be < 1.1.0") b.init_static_locks() lock_cb = b.lib.CRYPTO_get_locking_callback() - assert lock_cb != b.ffi.NULL + if b.lib.CRYPTOGRAPHY_OPENSSL_110_OR_GREATER: + assert lock_cb == b.ffi.NULL + assert b.lib.Cryptography_HAS_LOCKING_CALLBACKS == 0 + else: + assert lock_cb != b.ffi.NULL + assert b.lib.Cryptography_HAS_LOCKING_CALLBACKS == 1 def test_add_engine_more_than_once(self): b = Binding() |