changeset:   98297:747996431c7e
parent:      98295:bb1a2944bcb6
parent:      98296:38a5b0f6531b
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Sep 27 00:09:09 2015 -0700
files:       Misc/NEWS
description:
merge 3.5 (#23329)


diff -r bb1a2944bcb6 -r 747996431c7e Misc/NEWS
--- a/Misc/NEWS	Sat Sep 26 21:31:23 2015 -0700
+++ b/Misc/NEWS	Sun Sep 27 00:09:09 2015 -0700
@@ -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 -r bb1a2944bcb6 -r 747996431c7e Modules/_ssl.c
--- a/Modules/_ssl.c	Sat Sep 26 21:31:23 2015 -0700
+++ b/Modules/_ssl.c	Sun Sep 27 00:09:09 2015 -0700
@@ -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