diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-04-30 17:58:52 -0500 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2016-04-30 18:58:52 -0400 |
commit | 02fdea4b17c15c49063733b0e243ffc2e130435e (patch) | |
tree | 12aa653e6e9a4d7449aeca4a0537524acefbfcbe /src | |
parent | c16de483685b0d5afa77bd88bd4a561b09e899b1 (diff) | |
download | cryptography-02fdea4b17c15c49063733b0e243ffc2e130435e.tar.gz cryptography-02fdea4b17c15c49063733b0e243ffc2e130435e.tar.bz2 cryptography-02fdea4b17c15c49063733b0e243ffc2e130435e.zip |
a few more func->macro transitions for 1.1.0 compatibility (#2885)
Diffstat (limited to 'src')
-rw-r--r-- | src/_cffi_src/openssl/engine.py | 2 | ||||
-rw-r--r-- | src/_cffi_src/openssl/err.py | 4 | ||||
-rw-r--r-- | src/_cffi_src/openssl/objects.py | 3 | ||||
-rw-r--r-- | src/_cffi_src/openssl/rand.py | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index afdd54e4..8547768f 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -51,7 +51,6 @@ ENGINE *ENGINE_by_id(const char *); int ENGINE_init(ENGINE *); int ENGINE_finish(ENGINE *); void ENGINE_load_builtin_engines(void); -void ENGINE_cleanup(void); ENGINE *ENGINE_get_default_RSA(void); ENGINE *ENGINE_get_default_DSA(void); ENGINE *ENGINE_get_default_DH(void); @@ -132,6 +131,7 @@ MACROS = """ /* these became macros in 1.1.0 */ void ENGINE_load_openssl(void); void ENGINE_load_dynamic(void); +void ENGINE_cleanup(void); void ENGINE_load_cryptodev(void); """ diff --git a/src/_cffi_src/openssl/err.py b/src/_cffi_src/openssl/err.py index 4c7870aa..f52378b6 100644 --- a/src/_cffi_src/openssl/err.py +++ b/src/_cffi_src/openssl/err.py @@ -239,7 +239,6 @@ static const int SSL_AD_HANDSHAKE_FAILURE; """ FUNCTIONS = """ -void ERR_free_strings(void); char *ERR_error_string(unsigned long, char *); void ERR_error_string_n(unsigned long, char *, size_t); const char *ERR_lib_error_string(unsigned long); @@ -266,6 +265,9 @@ int ERR_get_next_error_library(void); """ MACROS = """ +/* ERR_free_strings became a macro in 1.1.0 */ +void ERR_free_strings(void); + unsigned long ERR_PACK(int, int, int); int ERR_GET_LIB(unsigned long); int ERR_GET_FUNC(unsigned long); diff --git a/src/_cffi_src/openssl/objects.py b/src/_cffi_src/openssl/objects.py index f2c1d5f3..6551d757 100644 --- a/src/_cffi_src/openssl/objects.py +++ b/src/_cffi_src/openssl/objects.py @@ -24,10 +24,11 @@ int OBJ_obj2txt(char *, int, const ASN1_OBJECT *, int); int OBJ_cmp(const ASN1_OBJECT *, const ASN1_OBJECT *); ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *); int OBJ_create(const char *, const char *, const char *); -void OBJ_cleanup(void); """ MACROS = """ +/* OBJ_cleanup became a macro in 1.1.0 */ +void OBJ_cleanup(void); """ CUSTOMIZATIONS = """ diff --git a/src/_cffi_src/openssl/rand.py b/src/_cffi_src/openssl/rand.py index 0a94d705..73226ee0 100644 --- a/src/_cffi_src/openssl/rand.py +++ b/src/_cffi_src/openssl/rand.py @@ -20,11 +20,13 @@ int RAND_status(void); const char *RAND_file_name(char *, size_t); int RAND_load_file(const char *, long); int RAND_write_file(const char *); -void RAND_cleanup(void); int RAND_bytes(unsigned char *, int); """ MACROS = """ +/* RAND_cleanup became a macro in 1.1.0 */ +void RAND_cleanup(void); + int RAND_egd(const char *); int RAND_egd_bytes(const char *, int); int RAND_query_egd_bytes(const char *, unsigned char *, int); |