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

diff --git a/Misc/NEWS b/Misc/NEWS
index 3421cbd75b10f187fedb2fef8fccde9e41bbf888..630cb01228fcb401279dafbc60f0cb202ce39810 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -806,6 +806,8 @@ Documentation
 Build
 -----
 
+- bpo-29572: Update Windows build and OS X installers to use OpenSSL 1.0.2k.
+
 - Issue #27659: Prohibit implicit C function declarations: use
   -Werror=implicit-function-declaration when possible (GCC and Clang, but it
   depends on the compiler version). Patch written by Chi Hsuan Yen.

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a5185becee5a96d69a0e3cc961e30acc6480f202..98a755d870ad90fe1d2aa2bfb6cb83ab9a8c7ab6 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.14.2.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0\r
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0\r

diff --git a/PCbuild/python.props b/PCbuild/python.props
index dde94f733a13ae76488e0c07c9a48042f4e716f5..d6bfd0877e09df536bf449e809e63473dc26856b 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -45,7 +45,7 @@
     <sqlite3Dir>$(ExternalsDir)sqlite-3.14.2.0\</sqlite3Dir>
     <bz2Dir>$(ExternalsDir)bzip2-1.0.6\</bz2Dir>
     <lzmaDir>$(ExternalsDir)xz-5.2.2\</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 00b50be0175565903e7d881aa9d2ee379d00c461..2afa847e3c2bc2d4be2c7337da9b9453a016910a 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