traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.5 (#23329)

This commit is contained in:
Benjamin Peterson 2015-09-27 00:09:09 -07:00
parent 8299e9b59e d330822c12
commit c78f27d239
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -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

3
Modules/_ssl.c
View File

@ -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