diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-17 14:31:53 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-17 14:40:20 -0400 |
| commit | e55b381c10eaa17e843d7d2e3aa12cdc34e96799 (patch) | |
| tree | 0e8522b1076b7dbb2533da881d386ff838541f1e | |
| parent | 7aa2a329792d89a22451f1d14a888f1d94547dc5 (diff) | |
| download | cryptography-e55b381c10eaa17e843d7d2e3aa12cdc34e96799.tar.gz cryptography-e55b381c10eaa17e843d7d2e3aa12cdc34e96799.tar.bz2 cryptography-e55b381c10eaa17e843d7d2e3aa12cdc34e96799.zip | |
slowly re-add everything that was removed, but now conditional
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 4 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 1 |
2 files changed, 5 insertions, 0 deletions
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 diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 7265d228..b8d7e7da 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -417,5 +417,6 @@ CONDITIONAL_NAMES = { "CRYPTO_UNLOCK", "CRYPTO_READ", "CRYPTO_LOCK_SSL", + "CRYPTO_lock", ] } |