diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-04-02 13:37:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-02 13:37:39 (GMT) |
| commit | 0f0f85e9d8088eb789cda35477900df32adff546 (patch) | |
| tree | 2019b7ef6461c776afa88be957c20db3b8d6d4b7 /PCbuild | |
| parent | 306a93b4819db611041da735ca3b34117a3bc961 (diff) | |
| download | cpython-0f0f85e9d8088eb789cda35477900df32adff546.zip cpython-0f0f85e9d8088eb789cda35477900df32adff546.tar.gz cpython-0f0f85e9d8088eb789cda35477900df32adff546.tar.bz2 | |
bpo-47194: Update zlib to v1.2.12 on Windows to resolve CVE-2018-25032 (GH-32241)
(cherry picked from commit 6066739ff7794e54c98c08b953a699cbc961cd28)
Co-authored-by: Zachary Ware <zach@python.org>
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/get_externals.bat | 2 | ||||
| -rw-r--r-- | PCbuild/python.props | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 7129898..dc5c909 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12. if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.0 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6 set libraries=%libraries% xz-5.2.2 -set libraries=%libraries% zlib-1.2.11 +set libraries=%libraries% zlib-1.2.12 for %%e in (%libraries%) do ( if exist "%EXTERNALS_DIR%\%%e" ( diff --git a/PCbuild/python.props b/PCbuild/python.props index 7a11cfa..7b42037 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -67,7 +67,7 @@ <opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir> <opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir> <nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir> - <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir> + <zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir> <!-- Suffix for all binaries when building for debug --> <PyDebugExt Condition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt> |