aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2016-05-31 07:08:26 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-31 19:01:26 +0200
commit56c8bef0593cf3245aa3045693726eeef8a51443 (patch)
tree1839148a7f8157f2d0d0e3ba989c9465f795351e /recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch
parent0ded81cbba947ebcb3d815add32c5a4bd4770357 (diff)
downloadmeta-python2-56c8bef0593cf3245aa3045693726eeef8a51443.tar.gz
python-cryptography: fix compile issue with openssl 1.0.2hjethro-nextjethro
this fixes: error: 'SSLv2_method' redeclared as different kind of symbol | SSL_METHOD* (*SSLv2_method)(void) = NULL; (From meta-openembedded commit: 8ab04afbffb4bc5184cfe0655049de6f44269990) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Tim Orling <ticotimo@gmail.com>
Diffstat (limited to 'recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch')
-rw-r--r--recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch b/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch
new file mode 100644
index 0000000..c8dbee2
--- /dev/null
+++ b/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch
@@ -0,0 +1,25 @@
+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-0.8.1/src/cryptography/hazmat/bindings/openssl/ssl.py
+===================================================================
+--- cryptography-0.8.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py
++++ cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/ssl.py
+@@ -372,6 +372,11 @@ const long SSL_OP_LEGACY_SERVER_CONNECT
+ #else
+ 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