From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 7 Aug 2014 04:17:20 +0000 (-0500)
Subject: Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
X-Git-Tag: v2.7.9rc1~316
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=19e455f9cb76db40013545efdc0dab6b87d313a6;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 34269ac19448..d4c4a550530b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,11 @@ Build
 - Issue #15759: "make suspicious", "make linkcheck" and "make doctest" in Doc/
   now display special message when and only when there are failures.
 
+Windows
+-------
+
+- Issue #22160: The bundled version of OpenSSL has been updated to 1.0.1i.
+
 
 What's New in Python 2.7.8?
 ===========================
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 0dd61e537019..f98ca098ebd5 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1h"
+		Value="$(externalsDir)\openssl-1.0.1i"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 319ef15284ce..09946799d8ad 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -23,6 +23,7 @@ cd ..
 @rem if exist openssl-0.9.8y rd /s/q openssl-0.9.8y
 @rem if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
+@rem if exist openssl-1.0.1i rd /s/q openssl-1.0.1i
 @rem if exist sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -36,8 +37,8 @@ if exist db-4.4.20 rd /s/q db-4.4.20
 if not exist db-4.7.25.0 svn export http://svn.python.org/projects/external/db-4.7.25.0
 
 @rem OpenSSL
-if exist openssl-1.0.1g rd /s/q openssl-1.0.1g
-if not exist openssl-1.0.1h svn export http://svn.python.org/projects/external/openssl-1.0.1h
+if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
+if not exist openssl-1.0.1i svn export http://svn.python.org/projects/external/openssl-1.0.1i
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (