From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 11 Oct 2016 02:57:20 +0000 (-0500)
Subject: Issue #28248: Update Windows build to use OpenSSL 1.0.2j
X-Git-Tag: v3.4.6rc1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=068534ab037236aa80d489383aded87c28553eb0;p=python

Issue #28248: Update Windows build to use OpenSSL 1.0.2j
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 6aeb2ec08a..3c117db4c8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,11 @@ Library
 - Issue #27759: Fix selectors incorrectly retain invalid file descriptors.
   Patch by Mark Williams.
 
+Build
+-----
+
+- Issue #28248: Update Windows build to use OpenSSL 1.0.2j.
+
 Tests
 -----
 
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 0b8f0b85f9..808d623dd4 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
 for %%e in (
             bzip2-1.0.6
             nasm-2.11.06
-            openssl-1.0.2d
+            openssl-1.0.2j
             tcl-8.6.1.0
             tk-8.6.1.0
             tix-8.4.3.4
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 03413686e5..79b495229d 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -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.2d</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.2j</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 e0c6685c9e..148a3056d4 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -171,7 +171,7 @@ _lzma
     Homepage:
         http://tukaani.org/xz/
 _ssl
-    Python wrapper for version 1.0.2d of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2j of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/