diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 17:13:28 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-06-15 17:13:28 -0500 |
| commit | 4762d3eefd6cb29241d683d84236fb5df40e9f70 (patch) | |
| tree | 1ebcdb57e924c8918a50770cb0a0fb55e9f4e143 | |
| parent | 2e5067e8ddb1bec6b65421a92cf2eb1177fd82df (diff) | |
| download | cpython-4762d3eefd6cb29241d683d84236fb5df40e9f70.tar.gz | |
Issue #26930: Update Windows build to OpenSSL 1.0.2h
| -rw-r--r-- | Misc/NEWS | 13 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 14 insertions, 5 deletions
@@ -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? diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 63ba282d8b..9b2a084bc2 100644 --- 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
diff --git a/PCbuild/python.props b/PCbuild/python.props index 07acfaba7b..843771d3f0 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -41,7 +41,7 @@ <sqlite3Dir>$(ExternalsDir)sqlite-3.8.11.0\</sqlite3Dir> <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir> <lzmaDir>$(ExternalsDir)xz-5.0.5\</lzmaDir> - <opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir> + <opensslDir>$(ExternalsDir)openssl-1.0.2h\</opensslDir> <opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir> <opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index e68cc5c859..d45eb271f8 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -169,7 +169,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.2g of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2h of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|