diff options
| author |   Victor Stinner <victor.stinner@gmail.com> | 2017-12-08 23:48:37 +0100 |
|---|---|---|
| committer |   larryhastings <larry@hastings.org> | 2017-12-08 14:48:37 -0800 |
| commit | 092db6c3cb049052fbfca15efc85ad68093676e7 (patch) | |
| tree | 4c189fabdfa4dd4c869b81b9dd089b06048d5039 | |
| parent | bpo-30657: Fix CVE-2017-1000158 (#4758) (diff) | |
| download | cpython-092db6c3cb049052fbfca15efc85ad68093676e7.tar.gz cpython-092db6c3cb049052fbfca15efc85ad68093676e7.tar.bz2 cpython-092db6c3cb049052fbfca15efc85ad68093676e7.zip | |
bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) (#3445)
(cherry picked from commit dd2000cbe475da48fdc94e8f05618e9f460077fd)
| -rw-r--r-- | Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst | 1 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.props | 4 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst b/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst new file mode 100644 index 00000000000..9bf71f90d81 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-09-07-19-19-19.bpo-29572.iZ1XKK.rst @@ -0,0 +1 @@ +Update Windows build and OS X installers to use OpenSSL 1.0.2k. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 808d623dd46..a99907812a2 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -54,7 +54,7 @@ echo.Fetching external libraries... for %%e in (
bzip2-1.0.6
nasm-2.11.06
- openssl-1.0.2j
+ openssl-1.0.2k
tcl-8.6.1.0
tk-8.6.1.0
tix-8.4.3.4
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 79b495229d1..25d27436a09 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -5,7 +5,7 @@ <OutDir>$(SolutionDir)</OutDir> <IntDir>$(SolutionDir)$(PlatformName)-temp-$(Configuration)\$(ProjectName)\</IntDir> <LinkIncremental>false</LinkIncremental> - </PropertyGroup> + </PropertyGroup> <PropertyGroup Condition="'$(Platform)'=='x64'"> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_PropertySheetDisplayName>amd64</_PropertySheetDisplayName> @@ -20,7 +20,7 @@ <sqlite3Dir>$(externalsDir)\sqlite-3.8.11.0</sqlite3Dir> <bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir> <lzmaDir>$(externalsDir)\xz-5.0.5</lzmaDir> - <opensslDir>$(externalsDir)\openssl-1.0.2j</opensslDir> + <opensslDir>$(externalsDir)\openssl-1.0.2k</opensslDir> <tcltkDir>$(externalsDir)\tcltk</tcltkDir> <tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir> <tcltkLib>$(tcltkDir)\lib\tcl86t.lib;$(tcltkDir)\lib\tk86t.lib</tcltkLib> diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 148a3056d43..8031d17b97e 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -171,7 +171,7 @@ _lzma Homepage:
http://tukaani.org/xz/
_ssl
- Python wrapper for version 1.0.2j of the OpenSSL secure sockets
+ Python wrapper for version 1.0.2k of the OpenSSL secure sockets
library, which is built by ssl.vcxproj
Homepage:
http://www.openssl.org/
|