View | Details | Raw Unified | Return to bug 237487 | Differences between
and this patch

Collapse All | Expand All

(-)b/security/py-cryptography/files/patch-src___cffi__src_openssl_cryptography.py (+15 lines)
Added Link Here
1
--- src/_cffi_src/openssl/cryptography.py.orig 2019-02-27 23:27:53 UTC
2
+++ src/_cffi_src/openssl/cryptography.py
3
@@ -38,9 +38,12 @@ INCLUDES = """
4
     (LIBRESSL_VERSION_NUMBER >= 0x2070000f)
5
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \
6
     (LIBRESSL_VERSION_NUMBER >= 0x2080000f)
7
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \
8
+    (LIBRESSL_VERSION_NUMBER >= 0x2090100f)
9
 #else
10
 #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0)
11
 #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0)
12
+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0)
13
 #endif
14
 
15
 #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
(-)b/security/py-cryptography/files/patch-src___cffi__src_openssl_ssl.py (+26 lines)
Added Link Here
1
--- src/_cffi_src/openssl/ssl.py.orig  2019-02-27 23:27:53 UTC
2
+++ src/_cffi_src/openssl/ssl.py
3
@@ -719,17 +719,20 @@ static const long TLS_ST_BEFORE = 0;
4
 static const long TLS_ST_OK = 0;
5
 #endif
6
 
7
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
8
+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */
9
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER
10
 static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0;
11
 const SSL_METHOD *(*DTLS_method)(void) = NULL;
12
 const SSL_METHOD *(*DTLS_server_method)(void) = NULL;
13
 const SSL_METHOD *(*DTLS_client_method)(void) = NULL;
14
+#else
15
+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
16
+#endif
17
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
18
 static const long SSL_OP_NO_DTLSv1 = 0;
19
 static const long SSL_OP_NO_DTLSv1_2 = 0;
20
 long (*DTLS_set_link_mtu)(SSL *, long) = NULL;
21
 long (*DTLS_get_link_min_mtu)(SSL *) = NULL;
22
-#else
23
-static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1;
24
 #endif
25
 
26
 static const long Cryptography_HAS_DTLS = 1;

Return to bug 237487