Issue #26930: Update Windows build to OpenSSL 1.0.2h

diff --git a/Misc/NEWS b/Misc/NEWS
index 8979afd8302c6eaf59647840f83f4d954f665052..4ad25511bb6d890f3c2b0461faa6fbe911375dab 100644 (file)
--- 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?

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 63ba282d8baaf8e5be93805a5ae20a2400f7271e..9b2a084bc2f8d9bfef44cbef07e74df6a72d62fb 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
 set libraries=\r
 set libraries=%libraries%                                    bzip2-1.0.6\r
 if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2g\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2h\r
 set libraries=%libraries%                                    sqlite-3.8.11.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 07acfaba7b2b75b94ddc63ae70b328779f46d677..843771d3f0090d89bcfc298694464b900f6aa916 100644 (file)
--- 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 e68cc5c859b43efee59cd2224bdcd3ff6699b3b8..d45eb271f820b8dd10b8a35f10cbe4a8e2dfafe3 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -169,7 +169,7 @@ _lzma
     Homepage:\r
         http://tukaani.org/xz/\r
 _ssl\r
-    Python wrapper for version 1.0.2g of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2h of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r