Date: Sat, 28 Apr 2018 19:11:13 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468566 - head/lang/python27/files Message-ID: <201804281911.w3SJBD3V016911@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Apr 28 19:11:13 2018 New Revision: 468566 URL: https://svnweb.freebsd.org/changeset/ports/468566 Log: lang/python27: Fix build with LibreSSL 2.7 PR: 226883 Submitted by: Charlie Li <ml+freebsd vishwin info> Approved by: python (koobs) Differential Revision: https://reviews.freebsd.org/D14837 Added: head/lang/python27/files/patch-issue33127 (contents, props changed) Added: head/lang/python27/files/patch-issue33127 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python27/files/patch-issue33127 Sat Apr 28 19:11:13 2018 (r468566) @@ -0,0 +1,83 @@ +From edd541897b9c28ee0d0f0131746aa5f19665a104 Mon Sep 17 00:00:00 2001 +From: Christian Heimes <christian@python.org> +Date: Sat, 24 Mar 2018 19:34:15 +0100 +Subject: [PATCH] [2.7] bpo-33127: Compatibility patch for LibreSSL 2.7.0 + (GH-6210) (GH-6215) + +LibreSSL 2.7 introduced OpenSSL 1.1.0 API. The ssl module now detects +LibreSSL 2.7 and only provides API shims for OpenSSL < 1.1.0 and +LibreSSL < 2.7. + +Documentation updates and fixes for failing tests will be provided in +another patch set. + +Signed-off-by: Christian Heimes <christian@python.org>. +(cherry picked from commit 4ca0739c9d97ac7cd45499e0d31be68dc659d0e1) + +Co-authored-by: Christian Heimes <christian@python.org> +--- + .../2018-03-24-15-08-24.bpo-33127.olJmHv.rst | 1 + + Modules/_ssl.c | 24 ++++++++++++++-------- + Tools/ssl/multissltests.py | 3 ++- + 3 files changed, 19 insertions(+), 9 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst + +diff --git a/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst b/Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst +new file mode 100644 +index 000000000000..635aabbde031 +--- /dev/null ++++ Misc/NEWS.d/next/Library/2018-03-24-15-08-24.bpo-33127.olJmHv.rst +@@ -0,0 +1 @@ ++The ssl module now compiles with LibreSSL 2.7.1. +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index da8b20f54f35..d0ce913d3d89 100644 +--- Modules/_ssl.c.orig ++++ Modules/_ssl.c +@@ -102,6 +102,12 @@ struct py_ssl_library_code { + + #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + # define OPENSSL_VERSION_1_1 1 ++# define PY_OPENSSL_1_1_API 1 ++#endif ++ ++/* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ ++#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL ++# define PY_OPENSSL_1_1_API 1 + #endif + + /* Openssl comes with TLSv1.1 and TLSv1.2 between 1.0.0h and 1.0.1 +@@ -149,16 +155,18 @@ struct py_ssl_library_code { + #define INVALID_SOCKET (-1) + #endif + +-#ifdef OPENSSL_VERSION_1_1 +-/* OpenSSL 1.1.0+ */ +-#ifndef OPENSSL_NO_SSL2 +-#define OPENSSL_NO_SSL2 +-#endif +-#else /* OpenSSL < 1.1.0 */ +-#if defined(WITH_THREAD) ++/* OpenSSL 1.0.2 and LibreSSL needs extra code for locking */ ++#if !defined(OPENSSL_VERSION_1_1) && defined(WITH_THREAD) + #define HAVE_OPENSSL_CRYPTO_LOCK + #endif + ++#if defined(OPENSSL_VERSION_1_1) && !defined(OPENSSL_NO_SSL2) ++#define OPENSSL_NO_SSL2 ++#endif ++ ++#ifndef PY_OPENSSL_1_1_API ++/* OpenSSL 1.1 API shims for OpenSSL < 1.1.0 and LibreSSL < 2.7.0 */ ++ + #define TLS_method SSLv23_method + + static int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne) +@@ -201,7 +209,7 @@ static X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *store) + { + return store->param; + } +-#endif /* OpenSSL < 1.1.0 or LibreSSL */ ++#endif /* OpenSSL < 1.1.0 or LibreSSL < 2.7.0 */ + + + enum py_ssl_error {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804281911.w3SJBD3V016911>