[Python-checkins] cpython (3.5): detect alpn by feature flag not openssl version (closes #23329)

[benjamin.peterson]

https://hg.python.org/cpython/rev/38a5b0f6531b
changeset:   98296:38a5b0f6531b
branch:      3.5
parent:      98291:fd9009f313b9
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 27 00:09:02 2015 -0700
summary:
  detect alpn by feature flag not openssl version (closes #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
@@ -21,6 +21,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