01d1b4581e
Dropped patches: 0004-Replace-EVP_CIPHER_CTX_cleanup-with-EVP_CIPHER_CTX_r.patch 0005-Switch-get_-Update-APIs-to-get0.patch Reworked patches: 0001-Add-new-ASN1_STRING_get0_data-API.patch 0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch These 2 require that we keep only the CUSTOMIZATIONS stuff for now. Maybe later we can drop this. Ran 'make package/python-cryptography/refresh'. Added patch: 0004-disable-rust.patch upstream did a sloppy job with the CRYPTOGRAPHY_DONT_BUILD_RUST logic; we need to patch it, to make sure the setuptools-rust isn't installed. We may need to carry this patch in our tree for a bit longer than upstream, because in newer versions, CRYPTOGRAPHY_DONT_BUILD_RUST logic gets removed. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
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
|
|
@@ -17,4 +17,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
|
|
@@ -113,4 +113,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
|
|
@@ -17,4 +17,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
|
|
@@ -745,4 +745,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
|
|
"""
|