[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#23329)

Sun Sep 27 09:09:14 CEST 2015

https://hg.python.org/cpython/rev/747996431c7e
changeset: 98297:747996431c7e
parent: 98295:bb1a2944bcb6
parent: 98296:38a5b0f6531b
user: Benjamin Peterson <benjamin at python.org>
date: Sun Sep 27 00:09:09 2015 -0700
summary:
 merge 3.5 (#23329)
files:
 Misc/NEWS | 3 +++
 Modules/_ssl.c | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -141,6 +141,9 @@
 Library
 -------
 
+- Issue #23329: Allow the ssl module to be built with older versions of
+ LibreSSL.
+
 - Prevent overflow in _Unpickler_Read.
 
 - Issue #25047: The XML encoding declaration written by Element Tree now
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -109,8 +109,7 @@
 # define HAVE_SNI 0
 #endif
 
-/* ALPN added in OpenSSL 1.0.2 */
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
 # define HAVE_ALPN
 #endif
 
-- 
Repository URL: https://hg.python.org/cpython
