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

4f6d3a13 · Benjamin Peterson · 035738d1 · 4f6d3a13 · 4f6d3a13
Commit 4f6d3a13 authored Sep 27, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Misc/NEWS Misc/NEWS +3 -0

Modules/_ssl.c Modules/_ssl.c +1 -2

No files found.
--- 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

--- 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 */
+#ifdef TLSEXT_TYPE_application_layer_protocol_negotiation
-#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x1000200fL && !defined(OPENSSL_NO_TLSEXT)
 # define HAVE_ALPN
 #endif