From 3185dee8a28637f70d45acb171788635876b5cbc Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 9 Dec 2015 01:18:11 +0000 Subject: [PATCH] Copied `OPENSSL_NO_SSL3` patch to 2.7 series (#495) --- .../Python-2.7.1/004_openssl_no_ssl3.patch} | 0 .../2.7.2/Python-2.7.2/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.3/Python-2.7.3/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.4/Python-2.7.4/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.5/Python-2.7.5/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.6/Python-2.7.6/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.7/Python-2.7.7/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7.8/Python-2.7.8/004_openssl_no_ssl3.patch | 13 +++++++++++++ .../2.7/Python-2.7/004_openssl_no_ssl3.patch | 13 +++++++++++++ 9 files changed, 104 insertions(+) rename plugins/python-build/share/python-build/patches/{2.7.3/Python-2.7.3/004_ssl.patch => 2.7.1/Python-2.7.1/004_openssl_no_ssl3.patch} (100%) create mode 100644 plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/004_openssl_no_ssl3.patch create mode 100644 plugins/python-build/share/python-build/patches/2.7/Python-2.7/004_openssl_no_ssl3.patch diff --git a/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_ssl.patch b/plugins/python-build/share/python-build/patches/2.7.1/Python-2.7.1/004_openssl_no_ssl3.patch similarity index 100% rename from plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_ssl.patch rename to plugins/python-build/share/python-build/patches/2.7.1/Python-2.7.1/004_openssl_no_ssl3.patch diff --git a/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.2/Python-2.7.2/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.3/Python-2.7.3/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.4/Python-2.7.4/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.5/Python-2.7.5/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.6/Python-2.7.6/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.7/Python-2.7.7/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7.8/Python-2.7.8/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */ diff --git a/plugins/python-build/share/python-build/patches/2.7/Python-2.7/004_openssl_no_ssl3.patch b/plugins/python-build/share/python-build/patches/2.7/Python-2.7/004_openssl_no_ssl3.patch new file mode 100644 index 00000000..3212d281 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/2.7/Python-2.7/004_openssl_no_ssl3.patch @@ -0,0 +1,13 @@ +--- Modules/_ssl.c.orig 2015-12-06 09:38:40.581734108 -0500 ++++ Modules/_ssl.c 2015-12-06 09:40:29.953991951 -0500 +@@ -302,8 +302,10 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */ ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */ ++#endif + #ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */