summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2014-08-07 04:21:03 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2014-08-07 04:21:03 (GMT)
commitb40cf1f80490c48b087a50a83bcaa032ce6cdbd6 (patch)
tree948eba1348d55e180a6ec28116a1ab6e4055a4c7
parent2897d07623c95de6a99e8fb2d64cec970b9444c7 (diff)
downloadcpython-b40cf1f80490c48b087a50a83bcaa032ce6cdbd6.zip
cpython-b40cf1f80490c48b087a50a83bcaa032ce6cdbd6.tar.gz
cpython-b40cf1f80490c48b087a50a83bcaa032ce6cdbd6.tar.bz2
Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
-rw-r--r--Misc/NEWS4
-rw-r--r--PCbuild/get_externals.bat2
-rw-r--r--PCbuild/pyproject.props2
3 files changed, 4 insertions, 4 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a3ebd5..749e2ae 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 f472448..783df5c 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 20b63fc..e566cdc 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>