From: Zachary Ware <zachary.ware@gmail.com>
Date: Fri, 6 Jun 2014 06:13:37 +0000 (-0500)
Subject: Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1h
X-Git-Tag: v2.7.8~37^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b8626628db55b80353bc3452583787ac3af4526;p=thirdparty%2FPython%2Fcpython.git

Issue #21671, CVE-2014-0224: Update the Windows build to openssl-1.0.1h
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0c526dff3dd4..6b5b4553cae9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,12 @@ Tests
 
 - Issue #20635: Added tests for Tk geometry managers.
 
+Windows
+-------
+
+- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
+  updated to 1.0.1h.
+
 What's New in Python 2.7.7
 ==========================
 
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index dfdc556f5351..0dd61e537019 100644
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
 	/>
 	<UserMacro
 		Name="opensslDir"
-		Value="$(externalsDir)\openssl-1.0.1g"
+		Value="$(externalsDir)\openssl-1.0.1h"
 	/>
 	<UserMacro
 		Name="tcltkDir"
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index b96fef28768c..9c017dff4101 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -132,7 +132,7 @@ _ssl
 
     Get the source code through
 
-    svn export http://svn.python.org/projects/external/openssl-0.9.8y
+    svn export http://svn.python.org/projects/external/openssl-1.0.1h
 
     ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
     obtaining external sources then you don't need to manually get the source
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 7e4419964b56..8453dcb56896 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -21,6 +21,7 @@ cd ..
 @rem if exist db-4.7.25.0 rd /s/q db-4.7.25.0
 @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 sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -34,8 +35,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-0.9.8y rd /s/q openssl-0.9.8y
-if not exist openssl-1.0.1g svn export http://svn.python.org/projects/external/openssl-1.0.1g
+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
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (