From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 22 Jul 2015 04:20:47 +0000 (-0500)
Subject: Issue #24603: Update the Windows build to use OpenSSL 1.0.2d
X-Git-Tag: v3.5.0b4~25^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=689b55c1cb837c0b89be46b57e52912fe4b2072d;p=python

Issue #24603: Update the Windows build to use OpenSSL 1.0.2d
---

diff --git a/Misc/NEWS b/Misc/NEWS
index ad5fef33fa..a7f42bc793 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -359,8 +359,8 @@ Build
 - Issue #23445: pydebug builds now use "gcc -Og" where possible, to make
   the resulting executable faster.
 
-- Issue #24432: Update Windows builds and OS X 10.5 installer to use OpenSSL
-  1.0.2c.
+- Issue #24603: Update Windows builds and OS X 10.5 installer to use OpenSSL
+  1.0.2d.
 
 C API
 -----
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 8ece4e32c5..fa2a4cbd2c 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.2c
+            openssl-1.0.2d
             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 26fd569fc4..c1efdae058 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,7 @@
     <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
     <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
     <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir>
-    <opensslDir>$(externalsDir)\openssl-1.0.2c</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.2d</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 5b3e980909..1c4845824a 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.2c of the OpenSSL secure sockets
+    Python wrapper for version 1.0.2d of the OpenSSL secure sockets
     library, which is built by ssl.vcxproj
     Homepage:
         http://www.openssl.org/