From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 3 Mar 2017 22:07:07 +0000 (-0600)
Subject: bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-439)
X-Git-Tag: v3.7.0a1~1212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc64c351c7757f0ebdb7da65cb74871e494a2add;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 3421cbd75b..630cb01228 100644
--- 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 a5185becee..98a755d870 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.2j
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2k
 set libraries=%libraries%                                    sqlite-3.14.2.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
 if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
diff --git a/PCbuild/python.props b/PCbuild/python.props
index dde94f733a..d6bfd0877e 100644
--- 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 00b50be017..2afa847e3c 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.2j of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2k of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/