From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 7 Aug 2014 04:21:03 +0000 (-0500)
Subject: Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
X-Git-Tag: v3.5.0a1~1104
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b40cf1f80490c48b087a50a83bcaa032ce6cdbd6;p=python

Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 4a3ebd56e5..749e2ae575 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -925,8 +925,8 @@ Windows
 
 - Issue #21907: Improved the batch scripts provided for building Python.
 
-- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
-  updated to 1.0.1h.
+- Issue #21671, #22160, CVE-2014-0224: The bundled version of OpenSSL has been
+  updated to 1.0.1i.
 
 - Issue #10747: Use versioned labels in the Windows start menu.
   Patch by Olive Kilburn.
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index f472448121..783df5c14a 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -51,7 +51,7 @@ echo.Fetching external libraries...
 
 for %%e in (
             bzip2-1.0.6
-            openssl-1.0.1h
+            openssl-1.0.1i
             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 20b63fcb70..e566cdc550 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.1h</opensslDir>
+    <opensslDir>$(externalsDir)\openssl-1.0.1i</opensslDir>
     <tclDir>$(externalsDir)\tcl-8.6.1.0</tclDir>
     <tkDir>$(externalsDir)\tk-8.6.1.0</tkDir>
     <tixDir>$(externalsDir)\tix-8.4.3.4</tixDir>