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

diff --git a/Misc/NEWS b/Misc/NEWS
index 0c526dff3dd4bb9e7129d776ad7515c0824bdb58..6b5b4553cae97e135b67cd2348e4fc39bd3b3848 100644 (file)
--- 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 dfdc556f53511d9b97019fab2cece63bcbae6fb0..0dd61e53701975e7cbb860b1d4936fc2c18669ee 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-1.0.1g"\r
+               Value="$(externalsDir)\openssl-1.0.1h"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index b96fef28768ccff6a99e429bd2ed3b32e7ff4622..9c017dff41013c6b271c6904a1e8f05b66b39575 100644 (file)
--- 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 7e4419964b56a77d5ddce39b4775c640ed6f5820..8453dcb5689611fe23d9aca1ea31e26e79b7d091 100644 (file)
--- 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 (