From d91a140b0c03b8b7710bf224ccfd31aed2d109f7 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Tue, 6 Apr 2021 12:27:51 +0100 Subject: [PATCH] bpo-43745: Actually updates Windows release to OpenSSL 1.1.1k. Earlier releases were mislabelled and included 1.1.1i again. --- .../next/Windows/2021-04-06-12-27-33.bpo-43745.rdKNda.rst | 2 ++ PCbuild/get_externals.bat | 2 +- PCbuild/python.props | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2021-04-06-12-27-33.bpo-43745.rdKNda.rst diff --git a/Misc/NEWS.d/next/Windows/2021-04-06-12-27-33.bpo-43745.rdKNda.rst b/Misc/NEWS.d/next/Windows/2021-04-06-12-27-33.bpo-43745.rdKNda.rst new file mode 100644 index 00000000000000..8ec498d11ea938 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2021-04-06-12-27-33.bpo-43745.rdKNda.rst @@ -0,0 +1,2 @@ +Actually updates Windows release to OpenSSL 1.1.1k. Earlier releases were +mislabelled and actually included 1.1.1i again. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 42afe2c841f9c7..a8bb06f8199878 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -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.1k +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1k-1 if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.10.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06 diff --git a/PCbuild/python.props b/PCbuild/python.props index 5822ba13950f44..e056482c13f28f 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -63,7 +63,7 @@ $(ExternalsDir)libffi\$(ArchName)\ $(libffiOutDir)include $(ExternalsDir)openssl-1.1.1k\ - $(ExternalsDir)openssl-bin-1.1.1k\$(ArchName)\ + $(ExternalsDir)openssl-bin-1.1.1k-1\$(ArchName)\ $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ $(ExternalsDir)\zlib-1.2.11\