diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 21:12:37 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-03-09 21:12:37 -0500 |
| commit | c17c79d8937227d680d8725c2d29b3b6aa3ae198 (patch) | |
| tree | 0608a3af64bb3cf4cbbe8739f2d2b6d6de4290aa | |
| parent | a251fe162ef3675e696fef77b7bd3fa20f20433b (diff) | |
| parent | 4639019b99d605ada6cd9e689d0a2c17afc1221d (diff) | |
| download | cryptography-c17c79d8937227d680d8725c2d29b3b6aa3ae198.tar.gz cryptography-c17c79d8937227d680d8725c2d29b3b6aa3ae198.tar.bz2 cryptography-c17c79d8937227d680d8725c2d29b3b6aa3ae198.zip | |
Merge pull request #2791 from reaperhulk/110-patch-13
remove long deprecated locking callback and CRYPTO_malloc_init
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index b40dae8d..9357815b 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -40,8 +40,6 @@ void CRYPTO_mem_leaks(struct bio_st *); void CRYPTO_cleanup_all_ex_data(void); int CRYPTO_num_locks(void); void CRYPTO_set_locking_callback(void(*)(int, int, const char *, int)); -void CRYPTO_set_id_callback(unsigned long (*)(void)); -unsigned long (*CRYPTO_get_id_callback(void))(void); void (*CRYPTO_get_locking_callback(void))(int, int, const char *, int); void CRYPTO_lock(int, int, const char *, int); @@ -57,7 +55,6 @@ unsigned long OpenSSL_version_num(void); const char *OpenSSL_version(int); void CRYPTO_add(int *, int, int); -void CRYPTO_malloc_init(void); """ CUSTOMIZATIONS = """ |