- From e96af1cee523c5551c7fc5f36eba8e271fa51b20 Mon Sep 17 00:00:00 2001
- From: Rosen Penev <rosenp@gmail.com>
- Date: Thu, 5 Dec 2019 12:52:13 -0800
- Subject: [PATCH 7/7] Add defines for totally deprecated functions
-
- ---
- src/_cffi_src/openssl/conf.py | 4 ++++
- src/_cffi_src/openssl/crypto.py | 4 ++++
- src/_cffi_src/openssl/ecdh.py | 3 +++
- src/_cffi_src/openssl/ssl.py | 5 +++++
- 4 files changed, 16 insertions(+)
-
- --- a/src/_cffi_src/openssl/conf.py
- +++ b/src/_cffi_src/openssl/conf.py
- @@ -18,4 +18,8 @@ void OPENSSL_no_config(void);
- """
-
- CUSTOMIZATIONS = """
- +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define OPENSSL_config(x) 0
- +#define OPENSSL_no_config() 0
- +#endif
- """
- --- a/src/_cffi_src/openssl/crypto.py
- +++ b/src/_cffi_src/openssl/crypto.py
- @@ -114,4 +114,8 @@ void *Cryptography_realloc_wrapper(void
- void Cryptography_free_wrapper(void *ptr, const char *path, int line) {
- free(ptr);
- }
- +
- +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define CRYPTO_get_locking_callback() 0
- +#endif
- """
- --- a/src/_cffi_src/openssl/ecdh.py
- +++ b/src/_cffi_src/openssl/ecdh.py
- @@ -18,4 +18,7 @@ long SSL_CTX_set_ecdh_auto(SSL_CTX *, in
- """
-
- CUSTOMIZATIONS = """
- +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define SSL_CTX_set_ecdh_auto(a, b) ((b) != 0)
- +#endif
- """
- --- a/src/_cffi_src/openssl/ssl.py
- +++ b/src/_cffi_src/openssl/ssl.py
- @@ -739,4 +739,9 @@ long (*SSL_get_max_proto_version)(SSL *)
- #else
- static const long Cryptography_HAS_GET_PROTO_VERSION = 1;
- #endif
- +
- +#if (OPENSSL_API_COMPAT >= 0x10100000L) && !CRYPTOGRAPHY_IS_LIBRESSL
- +#define SSL_library_init() 1
- +#define SSL_load_error_strings() 0
- +#endif
- """
|
