bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443)

diff --git a/Misc/NEWS b/Misc/NEWS
index b17ad90a01398a1e9428308384796192b3c3cfb0..47e3d05a1bef71ca55ee058f77bc0c36acbb46f7 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -127,6 +127,11 @@ Tests
   determine the candidate encoding for the test regex (allowing it to correctly
   skip the test when the default locale encoding is a multi-byte encoding)
 
+Build
+-----
+
+- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
+
 
 What's New in Python 3.5.3?
 ===========================

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 1c3cdee2c4bd84cc224e4be8d86f924989d8cadb..dfaf5496a2b6148bd30ef2a8c0505deca0ec4ccd 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.2j\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2k\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 1553731d1fece3331e04c7ac2a58e46fae72beae..0a6fd2a6513826d90e54bbbc23c11f437b43fabf 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -46,7 +46,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.2j\</opensslDir>
+    <opensslDir>$(ExternalsDir)openssl-1.0.2k\</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 24620128ec98dae8129ce599e4ea4dca74445228..68579256f28b84aeb4325238b5b01bbac3f3450e 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.2j of the OpenSSL secure sockets\r
+    Python wrapper for version 1.0.2k of the OpenSSL secure sockets\r
     library, which is built by ssl.vcxproj\r
     Homepage:\r
         http://www.openssl.org/\r