From ae487bb5c70516505653a7884b5be5de26c5d96e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 8 Jul 2017 20:47:34 -0500 Subject: remove egd (#3771) * remove egd * oops * keep Cryptography_HAS_EGD for compat just in case This shouldn't really be necessary but maybe we can fully remove it in 2018 or 2019... --- src/_cffi_src/openssl/rand.py | 11 ----------- src/cryptography/hazmat/bindings/openssl/_conditional.py | 9 --------- 2 files changed, 20 deletions(-) (limited to 'src') diff --git a/src/_cffi_src/openssl/rand.py b/src/_cffi_src/openssl/rand.py index ed4c6c3c..089da8b3 100644 --- a/src/_cffi_src/openssl/rand.py +++ b/src/_cffi_src/openssl/rand.py @@ -28,19 +28,8 @@ void ERR_load_RAND_strings(void); /* 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); """ CUSTOMIZATIONS = """ -#if CRYPTOGRAPHY_IS_LIBRESSL || CRYPTOGRAPHY_OPENSSL_110_OR_GREATER static const long Cryptography_HAS_EGD = 0; -int (*RAND_egd)(const char *) = NULL; -int (*RAND_egd_bytes)(const char *, int) = NULL; -int (*RAND_query_egd_bytes)(const char *, unsigned char *, int) = NULL; -#else -static const long Cryptography_HAS_EGD = 1; -#endif """ diff --git a/src/cryptography/hazmat/bindings/openssl/_conditional.py b/src/cryptography/hazmat/bindings/openssl/_conditional.py index 5c5d2f1f..7f61ed42 100644 --- a/src/cryptography/hazmat/bindings/openssl/_conditional.py +++ b/src/cryptography/hazmat/bindings/openssl/_conditional.py @@ -69,14 +69,6 @@ def cryptography_has_rsa_r_pkcs_decoding_error(): ] -def cryptography_has_egd(): - return [ - "RAND_egd", - "RAND_egd_bytes", - "RAND_query_egd_bytes", - ] - - def cryptography_has_rsa_oaep_md(): return [ "EVP_PKEY_CTX_set_rsa_oaep_md", @@ -258,7 +250,6 @@ CONDITIONAL_NAMES = { "Cryptography_HAS_RSA_R_PKCS_DECODING_ERROR": ( cryptography_has_rsa_r_pkcs_decoding_error ), - "Cryptography_HAS_EGD": cryptography_has_egd, "Cryptography_HAS_RSA_OAEP_MD": cryptography_has_rsa_oaep_md, "Cryptography_HAS_SSL3_METHOD": cryptography_has_ssl3_method, "Cryptography_HAS_ALPN": cryptography_has_alpn, -- cgit v1.2.3