mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #22160: Update OpenSSL to 1.0.1i for the Windows build.

Browse source
This commit is contained in:
Zachary Ware 2014-08-06 23:19:29 -05:00
parent 1241c47aa2
commit 22f2d2efb7
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Misc/NEWS
View file

@ -283,8 +283,8 @@ Tests
Windows Windows
------- -------
- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been - Issue #21671, #22160, CVE-2014-0224: The bundled version of OpenSSL has been
updated to 1.0.1h. updated to 1.0.1i.
- Issue #10747: Use versioned labels in the Windows start menu. - Issue #10747: Use versioned labels in the Windows start menu.
Patch by Olive Kilburn. Patch by Olive Kilburn.

2
PCbuild/pyproject.props
View file

@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir> <sqlite3Dir>$(externalsDir)\sqlite-3.8.3.1</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> <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> <tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib>

8
Tools/buildbot/external-common.bat
View file

@ -11,7 +11,7 @@ cd ..
@rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0 @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 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 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 if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip @rem bzip
@ -21,9 +21,9 @@ if not exist bzip2-1.0.6 (
) )
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.1h ( if not exist openssl-1.0.1i (
rd /s/q openssl-1.0.1g rd /s/q openssl-1.0.1h
svn export http://svn.python.org/projects/external/openssl-1.0.1h svn export http://svn.python.org/projects/external/openssl-1.0.1i
) )
@rem tcl/tk @rem tcl/tk