cpython: e1e5691d02d8 (original) (raw)
Mercurial > cpython
changeset 102190:e1e5691d02d8 3.5
Issue #26930: Update Windows build to OpenSSL 1.0.2h [#26930]
Zachary Ware zachary.ware@gmail.com | |
---|---|
date | Wed, 15 Jun 2016 17:13:28 -0500 |
parents | 4d04aca4afb0 |
children | 36cd79252be0 |
files | Misc/NEWS PCbuild/get_externals.bat PCbuild/python.props PCbuild/readme.txt |
diffstat | 4 files changed, 14 insertions(+), 5 deletions(-)[+] [-] Misc/NEWS 13 PCbuild/get_externals.bat 2 PCbuild/python.props 2 PCbuild/readme.txt 2 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,8 +10,17 @@ Release date: 2016-06-26 Core and Builtins ----------------- -Library -------- +- Issue #26930: Update Windows builds to use OpenSSL 1.0.2h. + +Tests +----- + +- Issue #26867: Ubuntu's openssl OP_NO_SSLv3 is forced on by default; fix test. + +IDLE +---- + +- Issue #27365: Allow non-ascii in idlelib/NEWS.txt - minimal part for 3.5.2. What's New in Python 3.5.2 release candidate 1?
--- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeSSL%"=="false" set libraries=%libraries% nasm-2.11.06 -if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g +if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2h set libraries=%libraries% sqlite-3.8.11.0 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
--- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,7 +41,7 @@ $(ExternalsDir)sqlite-3.8.11.0</sqlite3Dir> $(ExternalsDir)bzip2-1.0.6</bz2Dir> $(ExternalsDir)xz-5.0.5</lzmaDir>
- $(ExternalsDir)openssl-1.0.2h</opensslDir> $(opensslDir)include32 $(opensslDir)include64 $(ExternalsDir)\nasm-2.11.06</nasmDir>
--- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ are: Homepage: http://tukaani.org/xz/[](#l4.5) _ssl
- Python wrapper for version 1.0.2h of the OpenSSL secure sockets library, which is built by ssl.vcxproj Homepage: http://www.openssl.org/[](#l4.11)