diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-06-03 15:03:02 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-06-03 15:03:02 -0700 |
| commit | 3c224b8ad7520ce8a521ef0094b86469363b8e87 (patch) | |
| tree | 67fbe49f1596d0a0c8a59d1d0eaf830456113716 /src/_cffi_src/openssl | |
| parent | 13e9c4ce99578fe5959b3c8093d8fbf194eeba5d (diff) | |
| download | cryptography-3c224b8ad7520ce8a521ef0094b86469363b8e87.tar.gz cryptography-3c224b8ad7520ce8a521ef0094b86469363b8e87.tar.bz2 cryptography-3c224b8ad7520ce8a521ef0094b86469363b8e87.zip | |
A few more 1.1.0 compatibility changes (#2960)
* remove some bindings we don't use
* thread state is not required
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 3 | ||||
| -rw-r--r-- | src/_cffi_src/openssl/err.py | 13 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 11c44c9b..bf5366b2 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -11,8 +11,6 @@ INCLUDES = """ TYPES = """ static const long Cryptography_HAS_LOCKING_CALLBACKS; -typedef ... CRYPTO_THREADID; - static const int SSLEAY_VERSION; static const int SSLEAY_CFLAGS; static const int SSLEAY_PLATFORM; @@ -34,7 +32,6 @@ static const int CRYPTO_LOCK_SSL; """ FUNCTIONS = """ -void CRYPTO_free(void *); int CRYPTO_mem_ctrl(int); int CRYPTO_is_mem_check_on(void); void CRYPTO_mem_leaks(struct bio_st *); diff --git a/src/_cffi_src/openssl/err.py b/src/_cffi_src/openssl/err.py index 585ba77b..f30756c9 100644 --- a/src/_cffi_src/openssl/err.py +++ b/src/_cffi_src/openssl/err.py @@ -9,7 +9,6 @@ INCLUDES = """ """ TYPES = """ -static const int Cryptography_HAS_REMOVE_THREAD_STATE; static const int Cryptography_HAS_098H_ERROR_CODES; static const int Cryptography_HAS_098C_CAMELLIA_CODES; static const int Cryptography_HAS_EC_CODES; @@ -230,10 +229,6 @@ unsigned long ERR_PACK(int, int, int); int ERR_GET_LIB(unsigned long); int ERR_GET_FUNC(unsigned long); int ERR_GET_REASON(unsigned long); -/* introduced in 1.0.0 so we have to handle this specially to continue - * supporting 0.9.8 - */ -void ERR_remove_thread_state(const CRYPTO_THREADID *); /* These were added in OpenSSL 0.9.8h. When we drop support for RHEL/CentOS 5 we should be able to move these back to TYPES. */ @@ -250,14 +245,6 @@ static const int EVP_R_CAMELLIA_KEY_SETUP_FAILED; """ CUSTOMIZATIONS = """ -#if OPENSSL_VERSION_NUMBER >= 0x10000000L -static const long Cryptography_HAS_REMOVE_THREAD_STATE = 1; -#else -static const long Cryptography_HAS_REMOVE_THREAD_STATE = 0; -typedef uint32_t CRYPTO_THREADID; -void (*ERR_remove_thread_state)(const CRYPTO_THREADID *) = NULL; -#endif - /* OpenSSL 0.9.8h+ */ #if OPENSSL_VERSION_NUMBER >= 0x0090808fL static const long Cryptography_HAS_098H_ERROR_CODES = 1; |