diff options
Diffstat (limited to 'meta-python/recipes-devtools/python/python-cryptography')
3 files changed, 0 insertions, 127 deletions
diff --git a/meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch b/meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch deleted file mode 100644 index b28e7efff1..0000000000 --- a/meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch +++ /dev/null @@ -1,24 +0,0 @@ -From f326e4a97cce6b9479560ce0c65ad18d54393f96 Mon Sep 17 00:00:00 2001 -From: Cory Benfield <lukasaoz@gmail.com> -Date: Mon, 14 Dec 2015 15:37:46 +0000 -Subject: [PATCH] Comment lingering SSLv2 symbol. - ---- - src/_cffi_src/openssl/ssl.py | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: cryptography-1.1/src/_cffi_src/openssl/ssl.py -=================================================================== ---- cryptography-1.1.orig/src/_cffi_src/openssl/ssl.py -+++ cryptography-1.1/src/_cffi_src/openssl/ssl.py -@@ -421,6 +421,10 @@ const long SSL_OP_LEGACY_SERVER_CONNECT - static const long Cryptography_HAS_SECURE_RENEGOTIATION = 1; - #endif - -+/* Cryptography now compiles out all SSLv2 bindings. This exists to allow -+ * clients that use it to check for SSLv2 support to keep functioning as -+ * expected. -+ */ - static const long Cryptography_HAS_SSL2 = 0; - - #ifdef OPENSSL_NO_SSL3_METHOD diff --git a/meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch b/meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch deleted file mode 100644 index 8522325467..0000000000 --- a/meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 90c6a53a885dd5c66992309e0af98ac554f1bb97 Mon Sep 17 00:00:00 2001 -From: Cory Benfield <lukasaoz@gmail.com> -Date: Mon, 14 Dec 2015 08:35:20 +0000 -Subject: [PATCH] Remove SSLv2 bindings. - -This commit removes bindings that allow users to set SSLv2 handshake -methods. These are regarded as unnecessary and out-of-date: see #2527. -This commit does leave in a few options that refer to SSLv2 in order to -avoid breaking deployments that rely on them, and in order to allow -users to continue to request that SSLv2 not be enabled at all in their -OpenSSL. - -Upstream-Status: Backport - -This fixes the compile issue after updating to openssl 1.0.2h -Signed-off-by: Armin Kuster <akuster@mvista.com> - ---- - src/_cffi_src/openssl/ssl.py | 17 +---------------- - .../hazmat/bindings/openssl/_conditional.py | 6 ------ - 2 files changed, 1 insertion(+), 22 deletions(-) - -Index: cryptography-1.1/src/_cffi_src/openssl/ssl.py -=================================================================== ---- cryptography-1.1.orig/src/_cffi_src/openssl/ssl.py -+++ cryptography-1.1/src/_cffi_src/openssl/ssl.py -@@ -292,15 +292,6 @@ unsigned long SSL_CTX_add_extra_chain_ce - - /* methods */ - --/* SSLv2 support is compiled out of some versions of OpenSSL. These will -- * get special support when we generate the bindings so that if they are -- * available they will be wrapped, but if they are not they won't cause -- * problems (like link errors). -- */ --const SSL_METHOD *SSLv2_method(void); --const SSL_METHOD *SSLv2_server_method(void); --const SSL_METHOD *SSLv2_client_method(void); -- - /* - * TLSv1_1 and TLSv1_2 are recent additions. Only sufficiently new versions of - * OpenSSL support them. -@@ -429,14 +420,8 @@ const long SSL_OP_LEGACY_SERVER_CONNECT - #else - static const long Cryptography_HAS_SECURE_RENEGOTIATION = 1; - #endif --#ifdef OPENSSL_NO_SSL2 -+ - static const long Cryptography_HAS_SSL2 = 0; --SSL_METHOD* (*SSLv2_method)(void) = NULL; --SSL_METHOD* (*SSLv2_client_method)(void) = NULL; --SSL_METHOD* (*SSLv2_server_method)(void) = NULL; --#else --static const long Cryptography_HAS_SSL2 = 1; --#endif - - #ifdef OPENSSL_NO_SSL3_METHOD - static const long Cryptography_HAS_SSL3_METHOD = 0; -Index: cryptography-1.1/src/cryptography/hazmat/bindings/openssl/_conditional.py -=================================================================== ---- cryptography-1.1.orig/src/cryptography/hazmat/bindings/openssl/_conditional.py -+++ cryptography-1.1/src/cryptography/hazmat/bindings/openssl/_conditional.py -@@ -274,12 +274,6 @@ CONDITIONAL_NAMES = { - "TLSv1_2_client_method", - ], - -- "Cryptography_HAS_SSL2": [ -- "SSLv2_method", -- "SSLv2_client_method", -- "SSLv2_server_method", -- ], -- - "Cryptography_HAS_SSL3_METHOD": [ - "SSLv3_method", - "SSLv3_client_method", diff --git a/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch b/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch deleted file mode 100644 index d08994fe8d..0000000000 --- a/meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch +++ /dev/null @@ -1,28 +0,0 @@ -build issue do to openssl 1.0.1g upgrade - -BIO *BIO_new_mem_buf(void *, int); - ^ -In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0, -from build/temp.linux-x86_64-2.7/_openssl.c:413: - - -Upstream-Status: Pending - -seems to be a known issue -https://github.com/pyca/cryptography/issues/2750 - -Signed-off-by: Armin Kuster <akuster@mvista.com> - -Index: src/_cffi_src/openssl/bio.py -=================================================================== ---- a/src/_cffi_src/openssl/bio.py -+++ b/src/_cffi_src/openssl/bio.py -@@ -99,7 +99,7 @@ BIO *BIO_pop(BIO *); - BIO *BIO_next(BIO *); - BIO *BIO_find_type(BIO *, int); - BIO_METHOD *BIO_s_mem(void); --BIO *BIO_new_mem_buf(void *, int); -+BIO *BIO_new_mem_buf(const void *, int); - BIO_METHOD *BIO_s_file(void); - BIO *BIO_new_file(const char *, const char *); - BIO *BIO_new_fp(FILE *, int); |