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

This commit is contained in:
Zachary Ware 2014-06-06 01:13:37 -05:00
parent 90bcdd71a5
commit 6b8626628d
4 changed files with 11 additions and 4 deletions

View File

@ -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
==========================

View File

@ -82,7 +82,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.1g"
Value="$(externalsDir)\openssl-1.0.1h"
/>
<UserMacro
Name="tcltkDir"

View File

@ -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

View File

@ -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 (