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>

diff --git a/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst b/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst
new file mode 100644 (file)
index 0000000..7e76add
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2022-04-01-14-57-40.bpo-47194.IB0XL4.rst
@@ -0,0 +1 @@
+Update ``zlib`` to v1.2.12 to resolve CVE-2018-25032.

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index e0183bf250ae8efebf7e61618b64cc89b4dad15b..9e2d70cd5d863822ce60abbda7b9c8b2eac5c015 100644 (file)
--- 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.9.0
 if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.9.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 ec33f3d60e9722a353b2de35741e0722212c827d..a2d541bd76ae9f2ccbe5a2a6b68f08997b62ca95 100644 (file)
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -66,7 +66,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>