Commit16a809f

and

authored

bpo-47194: Update zlib to v1.2.12 on Windows to resolveCVE-2018-25032 (GH-32241)

(cherry picked from commit6066739)Co-authored-by: Zachary Ware <zach@python.org>

1 parent1069d52 commit16a809fCopy full SHA for 16a809f

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Update ``zlib`` to v1.2.12 to resolve CVE-2018-25032.

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.`
`59`	`59`	`ifNOT"%IncludeTkinterSrc%"=="false"setlibraries=%libraries% tk-8.6.12.0`
`60`	`60`	`ifNOT"%IncludeTkinterSrc%"=="false"setlibraries=%libraries% tix-8.4.3.6`
`61`	`61`	`setlibraries=%libraries% xz-5.2.2`
`62`		`-setlibraries=%libraries% zlib-1.2.11`
	`62`	`+setlibraries=%libraries% zlib-1.2.12`
`63`	`63`
`64`	`64`	`for%%ein (%libraries%)do (`
`65`	`65`	`ifexist"%EXTERNALS_DIR%\%%e" (`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`<opensslOutDir>$(ExternalsDir)openssl-bin-1.1.1n\$(ArchName)\</opensslOutDir>`
`68`	`68`	`<opensslIncludeDir>$(opensslOutDir)include</opensslIncludeDir>`
`69`	`69`	`<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>`
`70`		`- <zlibDir>$(ExternalsDir)\zlib-1.2.11\</zlibDir>`
	`70`	`+ <zlibDir>$(ExternalsDir)\zlib-1.2.12\</zlibDir>`
`71`	`71`
`72`	`72`	`<!-- Suffix for all binaries when building for debug-->`
`73`	`73`	`<PyDebugExtCondition="'$(PyDebugExt)' == '' and $(Configuration) == 'Debug'">_d</PyDebugExt>`

Comments

(0)