From 3ab73f6bbf4ff66e7ace3c4eab25461b5c7d71d4 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 16 Sep 2019 15:21:16 +0100 Subject: [PATCH] bpo-38117: Update bundled Windows OpenSSL to 1.1.1d (GH-16184) --- .../next/Windows/2019-09-16-14-07-11.bpo-38117.hJVf0C.rst | 1 + PCbuild/get_externals.bat | 4 ++-- PCbuild/python.props | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2019-09-16-14-07-11.bpo-38117.hJVf0C.rst diff --git a/Misc/NEWS.d/next/Windows/2019-09-16-14-07-11.bpo-38117.hJVf0C.rst b/Misc/NEWS.d/next/Windows/2019-09-16-14-07-11.bpo-38117.hJVf0C.rst new file mode 100644 index 00000000000..4fd8a66d279 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-09-16-14-07-11.bpo-38117.hJVf0C.rst @@ -0,0 +1 @@ +Update bundled OpenSSL to 1.1.1d diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 04c71acd469..100149e83c1 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -53,7 +53,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries% libffi-3.3.0-rc0-r1 -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1c +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1d set libraries=%libraries% sqlite-3.28.0.0 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 @@ -77,7 +77,7 @@ echo.Fetching external binaries... set binaries= if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi -if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1c +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1d if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index ba68ce334b6..8583138feb6 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -62,8 +62,8 @@ $(ExternalsDir)libffi\ $(ExternalsDir)libffi\$(ArchName)\ $(libffiOutDir)include - $(ExternalsDir)openssl-1.1.1c\ - $(ExternalsDir)openssl-bin-1.1.1c\$(ArchName)\ + $(ExternalsDir)openssl-1.1.1d\ + $(ExternalsDir)openssl-bin-1.1.1d\$(ArchName)\ $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ $(ExternalsDir)\zlib-1.2.11\