diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-08-06 23:19:29 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-08-06 23:19:29 -0500 |
| commit | 22f2d2efb7ffdbbd8eca8bddbeb99e970a7975e7 (patch) | |
| tree | ac901d063019633a5ec7a608f19c29da4b5142d5 | |
| parent | 1241c47aa2af26d90be1fdb6b0990a08bf9beafd (diff) | |
| download | cpython-git-22f2d2efb7ffdbbd8eca8bddbeb99e970a7975e7.tar.gz | |
Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 2 | ||||
| -rw-r--r-- | Tools/buildbot/external-common.bat | 8 |
3 files changed, 7 insertions, 7 deletions
@@ -283,8 +283,8 @@ Tests Windows ------- -- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been - updated to 1.0.1h. +- Issue #21671, #22160, CVE-2014-0224: The bundled version of OpenSSL has been + updated to 1.0.1i. - Issue #10747: Use versioned labels in the Windows start menu. Patch by Olive Kilburn. diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 4bc68fb0ad..0b513ceff8 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,7 +20,7 @@ <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> - <opensslDir>$(externalsDir)\openssl-1.0.1h</opensslDir> + <opensslDir>$(externalsDir)\openssl-1.0.1i</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat index f3e220552f..c9db541055 100644 --- a/Tools/buildbot/external-common.bat +++ b/Tools/buildbot/external-common.bat @@ -11,7 +11,7 @@ cd .. @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0 @rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4 @rem if exist db-4.4.20 rd /s/q db-4.4.20 -@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.7.12 rd /s/q sqlite-3.7.12 @rem bzip @@ -21,9 +21,9 @@ if not exist bzip2-1.0.6 ( ) @rem OpenSSL -if not exist openssl-1.0.1h ( - rd /s/q openssl-1.0.1g - svn export http://svn.python.org/projects/external/openssl-1.0.1h +if not exist openssl-1.0.1i ( + rd /s/q openssl-1.0.1h + svn export http://svn.python.org/projects/external/openssl-1.0.1i ) @rem tcl/tk |