mirror of
https://github.com/openwrt/packages.git
synced 2025-12-19 09:01:22 +00:00
python-cryptography: Update to 2.4.1
Replaced DTLS patch with upstreamed one. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,16 +1,26 @@
|
||||
From e7a6229b332969d621aaf25f3fc5cdd99e3c9072 Mon Sep 17 00:00:00 2001
|
||||
From: Rosen Penev <rosenp@gmail.com>
|
||||
Date: Sun, 18 Nov 2018 18:04:01 -0800
|
||||
Subject: [PATCH] Adjust DTLS check (#4593)
|
||||
|
||||
OpenSSL defines these even with OPENSSL_NO_DTLS.
|
||||
---
|
||||
src/_cffi_src/openssl/ssl.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
|
||||
index c921dbee..f0b8939c 100644
|
||||
--- a/src/_cffi_src/openssl/ssl.py
|
||||
+++ b/src/_cffi_src/openssl/ssl.py
|
||||
@@ -646,13 +646,6 @@ static const long TLS_ST_OK = 0;
|
||||
|
||||
#if defined(OPENSSL_NO_DTLS) || CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
|
||||
static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
|
||||
-const SSL_METHOD *(*DTLS_method)(void) = NULL;
|
||||
-const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
|
||||
-const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
|
||||
-static const long SSL_OP_NO_DTLSv1 = NULL;
|
||||
-static const long SSL_OP_NO_DTLSv1_2 = NULL;
|
||||
-long *(*DTLS_set_link_mtu)(SSL *, long) = NULL;
|
||||
-long *(*DTLS_get_link_min_mtu)(SSL *) = NULL;
|
||||
#else
|
||||
static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
|
||||
@@ -714,7 +714,7 @@ static const long TLS_ST_BEFORE = 0;
|
||||
static const long TLS_ST_OK = 0;
|
||||
#endif
|
||||
|
||||
-#if defined(OPENSSL_NO_DTLS) || CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
|
||||
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
|
||||
static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
|
||||
const SSL_METHOD *(*DTLS_method)(void) = NULL;
|
||||
const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user