diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-09-27 07:09:09 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-09-27 07:09:09 (GMT) |
| commit | c78f27d239d6f82b3dbf6393638dad5d6efcae35 (patch) | |
| tree | 02e3fcf08f9115708f1ac50d08965b20359d0c28 | |
| parent | 8299e9b59ecea5cd7236949bf17392e2fd56aec8 (diff) | |
| parent | d330822c12c279b2a89af00bf899a64559eeadb3 (diff) | |
| download | cpython-c78f27d239d6f82b3dbf6393638dad5d6efcae35.zip cpython-c78f27d239d6f82b3dbf6393638dad5d6efcae35.tar.gz cpython-c78f27d239d6f82b3dbf6393638dad5d6efcae35.tar.bz2 | |
merge 3.5 (#23329)
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ssl.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -141,6 +141,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 ca3549c..e43c502 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 |