diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-02-25 08:21:17 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-02-25 21:21:17 +0800 |
| commit | d01b44edf5ca0240e433028ddf9995005ba1c9c0 (patch) | |
| tree | 0b4069102516f27b2ce4e0bcc01510ef315515c7 /src | |
| parent | cc31c4f99e9ff1c2fa5acd0eabbf19a671b06b1d (diff) | |
| download | cryptography-d01b44edf5ca0240e433028ddf9995005ba1c9c0.tar.gz cryptography-d01b44edf5ca0240e433028ddf9995005ba1c9c0.tar.bz2 cryptography-d01b44edf5ca0240e433028ddf9995005ba1c9c0.zip | |
Polish off removal of unused engine bindings (#4769)
Diffstat (limited to 'src')
| -rw-r--r-- | src/_cffi_src/openssl/engine.py | 12 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index 048f4ad5..fa503a26 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -11,12 +11,10 @@ INCLUDES = """ TYPES = """ typedef ... ENGINE; -static const int ENGINE_R_CONFLICTING_ENGINE_ID; static const long Cryptography_HAS_ENGINE; """ FUNCTIONS = """ -int ENGINE_add(ENGINE *); ENGINE *ENGINE_by_id(const char *); int ENGINE_init(ENGINE *); int ENGINE_finish(ENGINE *); @@ -27,35 +25,25 @@ int ENGINE_ctrl_cmd(ENGINE *, const char *, long, void *, void (*)(void), int); int ENGINE_free(ENGINE *); const char *ENGINE_get_name(const ENGINE *); -/* these became macros in 1.1.0 */ -void ENGINE_load_dynamic(void); """ CUSTOMIZATIONS = """ #ifdef OPENSSL_NO_ENGINE static const long Cryptography_HAS_ENGINE = 0; -static const int ENGINE_R_CONFLICTING_ENGINE_ID = 0; - -int (*ENGINE_add)(ENGINE *) = NULL; ENGINE *(*ENGINE_by_id)(const char *) = NULL; int (*ENGINE_init)(ENGINE *) = NULL; int (*ENGINE_finish)(ENGINE *) = NULL; ENGINE *(*ENGINE_get_default_RAND)(void) = NULL; int (*ENGINE_set_default_RAND)(ENGINE *) = NULL; void (*ENGINE_unregister_RAND)(ENGINE *) = NULL; -int (*ENGINE_ctrl)(ENGINE *, int, long, void *, void (*)(void)) = NULL; int (*ENGINE_ctrl_cmd)(ENGINE *, const char *, long, void *, void (*)(void), int) = NULL; -int (*ENGINE_ctrl_cmd_string)(ENGINE *, const char *, const char *, - int) = NULL; int (*ENGINE_free)(ENGINE *) = NULL; const char *(*ENGINE_get_id)(const ENGINE *) = NULL; const char *(*ENGINE_get_name)(const ENGINE *) = NULL; -/* these became macros in 1.1.0 */ -void (*ENGINE_load_dynamic)(void) = NULL; #else static const long Cryptography_HAS_ENGINE = 1; #endif diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 044a6a46..7187b69f 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -343,7 +343,6 @@ def cryptography_has_evp_r_memory_limit_exceeded(): def cryptography_has_engine(): return [ - "ENGINE_add", "ENGINE_by_id", "ENGINE_init", "ENGINE_finish", @@ -353,8 +352,6 @@ def cryptography_has_engine(): "ENGINE_ctrl_cmd", "ENGINE_free", "ENGINE_get_name", - "ENGINE_load_dynamic", - "ENGINE_R_CONFLICTING_ENGINE_ID", "Cryptography_add_osrandom_engine", ] |