diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-04-30 19:10:08 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-30 20:10:08 -0400 |
| commit | 8bb82fd94073885aa2b2a92fe61bc5cb58348f8b (patch) | |
| tree | 1b4539e941a279004efb2d2e025a137de1c51fa2 /src/_cffi_src/openssl | |
| parent | 02fdea4b17c15c49063733b0e243ffc2e130435e (diff) | |
| download | cryptography-8bb82fd94073885aa2b2a92fe61bc5cb58348f8b.tar.gz cryptography-8bb82fd94073885aa2b2a92fe61bc5cb58348f8b.tar.bz2 cryptography-8bb82fd94073885aa2b2a92fe61bc5cb58348f8b.zip | |
CRYPTO_cleanup_all_ex_data is a macro and CRYPTO_add no longer exists (#2882)
We don't use CRYPTO_add and neither does pyOpenSSL
Diffstat (limited to 'src/_cffi_src/openssl')
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index 0ecfbd1e..11c44c9b 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -38,11 +38,12 @@ void CRYPTO_free(void *); int CRYPTO_mem_ctrl(int); int CRYPTO_is_mem_check_on(void); void CRYPTO_mem_leaks(struct bio_st *); -void CRYPTO_cleanup_all_ex_data(void); - """ MACROS = """ +/* CRYPTO_cleanup_all_ex_data became a macro in 1.1.0 */ +void CRYPTO_cleanup_all_ex_data(void); + /* as of 1.1.0 OpenSSL does its own locking *angelic chorus*. These functions have become macros that are no ops */ int CRYPTO_num_locks(void); @@ -56,8 +57,6 @@ const char *SSLeay_version(int); unsigned long OpenSSL_version_num(void); const char *OpenSSL_version(int); -void CRYPTO_add(int *, int, int); - /* this is a macro in 1.1.0 */ void OPENSSL_free(void *); |