diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2017-07-08 20:29:52 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2017-07-08 21:29:52 -0400 |
| commit | b4d6370cf704aa21c4ef962beb0dfc95dfb5bc80 (patch) | |
| tree | d6ce7fbf5a08a623e83a36a3a65a0f0a2b8c272d | |
| parent | 601ed631adf5d1df8a1138c5f037d93e7d943685 (diff) | |
| download | cryptography-b4d6370cf704aa21c4ef962beb0dfc95dfb5bc80.tar.gz cryptography-b4d6370cf704aa21c4ef962beb0dfc95dfb5bc80.tar.bz2 cryptography-b4d6370cf704aa21c4ef962beb0dfc95dfb5bc80.zip | |
remove cryptodev (#3770)
* remove cryptodev
* oops
| -rw-r--r-- | src/_cffi_src/openssl/engine.py | 10 | ||||
| -rw-r--r-- | src/cryptography/hazmat/bindings/openssl/_conditional.py | 7 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/_cffi_src/openssl/engine.py b/src/_cffi_src/openssl/engine.py index bed39d06..45ce9526 100644 --- a/src/_cffi_src/openssl/engine.py +++ b/src/_cffi_src/openssl/engine.py @@ -9,8 +9,6 @@ INCLUDES = """ """ TYPES = """ -static const long Cryptography_HAS_ENGINE_CRYPTODEV; - typedef ... ENGINE; typedef ... RSA_METHOD; typedef ... DSA_METHOD; @@ -129,15 +127,7 @@ void ENGINE_add_conf_module(void); void ENGINE_load_openssl(void); void ENGINE_load_dynamic(void); void ENGINE_cleanup(void); - -void ENGINE_load_cryptodev(void); """ CUSTOMIZATIONS = """ -#if CRYPTOGRAPHY_IS_LIBRESSL -static const long Cryptography_HAS_ENGINE_CRYPTODEV = 0; -void (*ENGINE_load_cryptodev)(void) = NULL; -#else -static const long Cryptography_HAS_ENGINE_CRYPTODEV = 1; -#endif """ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index b4926d25..5c5d2f1f 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -63,12 +63,6 @@ def cryptography_has_set_ecdh_auto(): ] -def cryptography_has_engine_cryptodev(): - return [ - "ENGINE_load_cryptodev" - ] - - def cryptography_has_rsa_r_pkcs_decoding_error(): return [ "RSA_R_PKCS_DECODING_ERROR" @@ -261,7 +255,6 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_EC2M": cryptography_has_ec2m, "Cryptography_HAS_EC_1_0_2": cryptography_has_ec_1_0_2, "Cryptography_HAS_SET_ECDH_AUTO": cryptography_has_set_ecdh_auto, - "Cryptography_HAS_ENGINE_CRYPTODEV": cryptography_has_engine_cryptodev, "Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR": ( cryptography_has_rsa_r_pkcs_decoding_error ), |