Issue #21462 PEP 466: upgrade OpenSSL in the Python 2.7 Windows builds

diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops
index 024bfa82b2d67df018e7c55b0759fe774767f197..dfdc556f53511d9b97019fab2cece63bcbae6fb0 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -82,7 +82,7 @@
        />\r
        <UserMacro\r
                Name="opensslDir"\r
-               Value="$(externalsDir)\openssl-0.9.8y"\r
+               Value="$(externalsDir)\openssl-1.0.1g"\r
        />\r
        <UserMacro\r
                Name="tcltkDir"\r

diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 2b4ba42bf3474794cbd8b4469200d40d26070327..7e4419964b56a77d5ddce39b4775c640ed6f5820 100644 (file)
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -20,6 +20,7 @@ cd ..
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
 @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 sqlite-3.6.21 rd /s/q sqlite-3.6.21
 
 @rem bzip
@@ -33,7 +34,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 not exist openssl-0.9.8y svn export http://svn.python.org/projects/external/openssl-0.9.8y
+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
 
 @rem tcl/tk
 if not exist tcl-8.5.15.0 (