From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 27 Sep 2015 07:09:02 +0000 (-0700)
Subject: detect alpn by feature flag not openssl version (closes #23329)
X-Git-Tag: v3.5.1rc1~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d330822c12c279b2a89af00bf899a64559eeadb3;p=thirdparty%2FPython%2Fcpython.git

detect alpn by feature flag not openssl version (closes #23329)
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 249bd5a8cb7a..1e13f63483a8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,9 @@ Core and Builtins
 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
index ca3549c6570b..e43c5026b77c 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -109,8 +109,7 @@ struct py_ssl_library_code {
 # 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