From 763a30bb1d9329939f117979561ddffe0f3ffe83 Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Sun, 20 Dec 2015 07:15:28 +0000 Subject: [PATCH] Add `OPENSSL_NO_SSL3` patch for 3.2 --- .../3.2/Python-3.2/001_openssl_no_ssl2.patch | 75 ------------- .../Python-3.2/010_ssl_no_ssl2_no_ssl3.patch | 100 ++++++++++++++++++ 2 files changed, 100 insertions(+), 75 deletions(-) delete mode 100644 plugins/python-build/share/python-build/patches/3.2/Python-3.2/001_openssl_no_ssl2.patch create mode 100644 plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch diff --git a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/001_openssl_no_ssl2.patch b/plugins/python-build/share/python-build/patches/3.2/Python-3.2/001_openssl_no_ssl2.patch deleted file mode 100644 index a4c55eb3..00000000 --- a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/001_openssl_no_ssl2.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -r -u ./Lib/ssl.py ../Python-3.2/Lib/ssl.py ---- ./Lib/ssl.py 2010-10-23 03:19:07.000000000 +0900 -+++ ../Python-3.2/Lib/ssl.py 2013-05-23 11:56:30.000000000 +0900 -@@ -62,8 +62,20 @@ - from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION - from _ssl import _SSLContext, SSLError - from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED --from _ssl import (PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, -+from _ssl import (PROTOCOL_SSLv3, PROTOCOL_SSLv23, - PROTOCOL_TLSv1) -+_PROTOCOL_NAMES = { -+ PROTOCOL_TLSv1: "TLSv1", -+ PROTOCOL_SSLv23: "SSLv23", -+ PROTOCOL_SSLv3: "SSLv3", -+} -+try: -+ from _ssl import PROTOCOL_SSLv2 -+ _SSLv2_IF_EXISTS = PROTOCOL_SSLv2 -+except ImportError: -+ _SSLv2_IF_EXISTS = None -+else: -+ _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2" - from _ssl import OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1 - from _ssl import RAND_status, RAND_egd, RAND_add - from _ssl import ( -@@ -537,13 +549,4 @@ - return DER_cert_to_PEM_cert(dercert) - - def get_protocol_name(protocol_code): -- if protocol_code == PROTOCOL_TLSv1: -- return "TLSv1" -- elif protocol_code == PROTOCOL_SSLv23: -- return "SSLv23" -- elif protocol_code == PROTOCOL_SSLv2: -- return "SSLv2" -- elif protocol_code == PROTOCOL_SSLv3: -- return "SSLv3" -- else: -- return "" -+ return _PROTOCOL_NAMES.get(protocol_code, '') -diff -r -u ./Modules/_ssl.c ../Python-3.2/Modules/_ssl.c ---- ./Modules/_ssl.c 2011-01-29 20:31:20.000000000 +0900 -+++ ../Python-3.2/Modules/_ssl.c 2013-05-23 11:57:44.000000000 +0900 -@@ -63,7 +63,9 @@ - }; - - enum py_ssl_version { -+#ifndef OPENSSL_NO_SSL2 - PY_SSL_VERSION_SSL2, -+#endif - PY_SSL_VERSION_SSL3, - PY_SSL_VERSION_SSL23, - PY_SSL_VERSION_TLS1 -@@ -1450,8 +1452,10 @@ - ctx = SSL_CTX_new(TLSv1_method()); - else if (proto_version == PY_SSL_VERSION_SSL3) - ctx = SSL_CTX_new(SSLv3_method()); -+#ifndef OPENSSL_NO_SSL2 - else if (proto_version == PY_SSL_VERSION_SSL2) - ctx = SSL_CTX_new(SSLv2_method()); -+#endif - else if (proto_version == PY_SSL_VERSION_SSL23) - ctx = SSL_CTX_new(SSLv23_method()); - else -@@ -2110,8 +2114,10 @@ - PY_SSL_CERT_REQUIRED); - - /* protocol versions */ -+#ifndef OPENSSL_NO_SSL2 - PyModule_AddIntConstant(m, "PROTOCOL_SSLv2", - PY_SSL_VERSION_SSL2); -+#endif - PyModule_AddIntConstant(m, "PROTOCOL_SSLv3", - PY_SSL_VERSION_SSL3); - PyModule_AddIntConstant(m, "PROTOCOL_SSLv23", diff --git a/plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch b/plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch new file mode 100644 index 00000000..1a3bb9a1 --- /dev/null +++ b/plugins/python-build/share/python-build/patches/3.2/Python-3.2/010_ssl_no_ssl2_no_ssl3.patch @@ -0,0 +1,100 @@ +diff -r -u ../Python-3.2.orig/Lib/ssl.py ./Lib/ssl.py +--- ../Python-3.2.orig/Lib/ssl.py 2010-10-22 18:19:07.000000000 +0000 ++++ ./Lib/ssl.py 2015-12-20 07:12:00.759323661 +0000 +@@ -62,23 +62,26 @@ + from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION + from _ssl import _SSLContext, SSLError + from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED +-from _ssl import (PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, +- PROTOCOL_TLSv1) +-from _ssl import OP_ALL, OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_TLSv1 +-from _ssl import RAND_status, RAND_egd, RAND_add +-from _ssl import ( +- SSL_ERROR_ZERO_RETURN, +- SSL_ERROR_WANT_READ, +- SSL_ERROR_WANT_WRITE, +- SSL_ERROR_WANT_X509_LOOKUP, +- SSL_ERROR_SYSCALL, +- SSL_ERROR_SSL, +- SSL_ERROR_WANT_CONNECT, +- SSL_ERROR_EOF, +- SSL_ERROR_INVALID_ERROR_CODE, +- ) ++from _ssl import RAND_status, RAND_add ++try: ++ from _ssl import RAND_egd ++except ImportError: ++ # LibreSSL does not provide RAND_egd ++ pass ++ ++def _import_symbols(prefix): ++ for n in dir(_ssl): ++ if n.startswith(prefix): ++ globals()[n] = getattr(_ssl, n) ++ ++_import_symbols('OP_') ++_import_symbols('SSL_ERROR_') ++_import_symbols('PROTOCOL_') ++ + from _ssl import HAS_SNI + ++_PROTOCOL_NAMES = {value: name for name, value in globals().items() if name.startswith('PROTOCOL_')} ++ + from socket import getnameinfo as _getnameinfo + from socket import error as socket_error + from socket import socket, AF_INET, SOCK_STREAM +@@ -518,7 +521,7 @@ + d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)] + return base64.decodebytes(d.encode('ASCII', 'strict')) + +-def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None): ++def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv23, ca_certs=None): + """Retrieve the certificate from the server at the specified address, + and return it as a PEM-encoded string. + If 'ca_certs' is specified, validate the server cert against it. +diff -r -u ../Python-3.2.orig/Modules/_ssl.c ./Modules/_ssl.c +--- ../Python-3.2.orig/Modules/_ssl.c 2011-01-29 11:31:20.000000000 +0000 ++++ ./Modules/_ssl.c 2015-12-20 07:10:38.285929662 +0000 +@@ -63,8 +63,12 @@ + }; + + enum py_ssl_version { ++#ifndef OPENSSL_NO_SSL2 + PY_SSL_VERSION_SSL2, ++#endif ++#ifndef OPENSSL_NO_SSL3 + PY_SSL_VERSION_SSL3, ++#endif + PY_SSL_VERSION_SSL23, + PY_SSL_VERSION_TLS1 + }; +@@ -1448,10 +1452,14 @@ + PySSL_BEGIN_ALLOW_THREADS + if (proto_version == PY_SSL_VERSION_TLS1) + ctx = SSL_CTX_new(TLSv1_method()); ++#ifndef OPENSSL_NO_SSL3 + else if (proto_version == PY_SSL_VERSION_SSL3) + ctx = SSL_CTX_new(SSLv3_method()); ++#endif ++#ifndef OPENSSL_NO_SSL2 + else if (proto_version == PY_SSL_VERSION_SSL2) + ctx = SSL_CTX_new(SSLv2_method()); ++#endif + else if (proto_version == PY_SSL_VERSION_SSL23) + ctx = SSL_CTX_new(SSLv23_method()); + else +@@ -2110,10 +2118,14 @@ + PY_SSL_CERT_REQUIRED); + + /* protocol versions */ ++#ifndef OPENSSL_NO_SSL2 + PyModule_AddIntConstant(m, "PROTOCOL_SSLv2", + PY_SSL_VERSION_SSL2); ++#endif ++#ifndef OPENSSL_NO_SSL3 + PyModule_AddIntConstant(m, "PROTOCOL_SSLv3", + PY_SSL_VERSION_SSL3); ++#endif + PyModule_AddIntConstant(m, "PROTOCOL_SSLv23", + PY_SSL_VERSION_SSL23); + PyModule_AddIntConstant(m, "PROTOCOL_TLSv1",