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

(cherry picked from commit dd2000cbe475da48fdc94e8f05618e9f460077fd)

diff --git a/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst
new file mode 100644 (file)
index 0000000..9bf71f9
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst
@@ -0,0 +1 @@
+Update Windows build and OS X installers to use OpenSSL 1.0.2k.

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 808d623dd460f06e46d7f088f3723429cda4d631..a99907812a2929e94af08a119cf43a1907bc37b3 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
 for %%e in (\r
             bzip2-1.0.6\r
             nasm-2.11.06\r
-            openssl-1.0.2j\r
+            openssl-1.0.2k\r
             tcl-8.6.1.0\r
             tk-8.6.1.0\r
             tix-8.4.3.4\r

diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 79b495229d11800a05242505f04098a00daacddd..25d27436a09e9d077ac933244586c336a9ea9567 100644 (file)
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -5,7 +5,7 @@
     <OutDir>$(SolutionDir)</OutDir>
     <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>  
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)'=='x64'">
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName>
@@ -20,7 +20,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>
     <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
     <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
     <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 148a3056d4361e95fdffc1b40d041982dc9d626e..8031d17b97e1fba220eb9fc680a8575a96bc480f 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -171,7 +171,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