diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-16 21:02:59 -0400 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-03-17 14:39:55 -0400 |
| commit | 854e2789f9e1fbb672656a8b9a9f4fd857b1d920 (patch) | |
| tree | 9b0d28b2a6035230f8f2a127ec1e4dfc3ea7bb76 | |
| parent | 09b768ab8aa49a3e1c826b615477500390b879bb (diff) | |
| download | cryptography-854e2789f9e1fbb672656a8b9a9f4fd857b1d920.tar.gz cryptography-854e2789f9e1fbb672656a8b9a9f4fd857b1d920.tar.bz2 cryptography-854e2789f9e1fbb672656a8b9a9f4fd857b1d920.zip | |
in 1.1.0 OpenSSL does its own locking now! locking funcs are now macros
the macros are no ops. Also remove some constants that we never used and
were related to locking
| -rw-r--r-- | src/_cffi_src/openssl/crypto.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/_cffi_src/openssl/crypto.py b/src/_cffi_src/openssl/crypto.py index b9ecd5ab..d610957a 100644 --- a/src/_cffi_src/openssl/crypto.py +++ b/src/_cffi_src/openssl/crypto.py @@ -25,11 +25,6 @@ static const int CRYPTO_MEM_CHECK_ON; static const int CRYPTO_MEM_CHECK_OFF; static const int CRYPTO_MEM_CHECK_ENABLE; static const int CRYPTO_MEM_CHECK_DISABLE; -static const int CRYPTO_LOCK; -static const int CRYPTO_UNLOCK; -static const int CRYPTO_READ; -static const int CRYPTO_WRITE; -static const int CRYPTO_LOCK_SSL; """ FUNCTIONS = """ @@ -38,14 +33,16 @@ 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); -int CRYPTO_num_locks(void); -void CRYPTO_set_locking_callback(void(*)(int, int, const char *, int)); -void (*CRYPTO_get_locking_callback(void))(int, int, const char *, int); -void CRYPTO_lock(int, int, const char *, int); """ MACROS = """ +/* 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); +void CRYPTO_set_locking_callback(void(*)(int, int, const char *, int)); +void (*CRYPTO_get_locking_callback(void))(int, int, const char *, int); + /* SSLeay was removed in 1.1.0 */ unsigned long SSLeay(void); const char *SSLeay_version(int); |