From 00c692d55ec470b9148ecab0ae7ce067d429dd32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Srinivas=20Reddy=20Thatiparthy=20=28=E0=B0=B6=E0=B1=8D?= =?UTF-8?q?=E0=B0=B0=E0=B1=80=E0=B0=A8=E0=B0=BF=E0=B0=B5=E0=B0=BE=E0=B0=B8?= =?UTF-8?q?=E0=B1=8D=20=20=E0=B0=B0=E0=B1=86=E0=B0=A1=E0=B1=8D=E0=B0=A1?= =?UTF-8?q?=E0=B0=BF=20=E0=B0=A4=E0=B0=BE=E0=B0=9F=E0=B0=BF=E0=B0=AA?= =?UTF-8?q?=E0=B0=B0=E0=B1=8D=E0=B0=A4=E0=B0=BF=29?= Date: Sat, 13 Jun 2020 02:16:36 +0530 Subject: [PATCH 1/2] bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834) --- .azure-pipelines/ci.yml | 4 ++-- .azure-pipelines/pr.yml | 4 ++-- .../next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst | 1 + PCbuild/get_externals.bat | 7 ++++++- PCbuild/python.props | 4 ++-- 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 Misc/NEWS.d/next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 0a3e27b133cae1..b9038b982f7ddb 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -61,7 +61,7 @@ jobs: variables: testRunTitle: '$(build.sourceBranchName)-linux' testRunPlatform: linux - openssl_version: 1.1.1f + openssl_version: 1.1.1g steps: - template: ./posix-steps.yml @@ -118,7 +118,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.1f + openssl_version: 1.1.1g steps: - template: ./posix-steps.yml diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 5cf4dd7de1fc4c..808b5f1c75bea5 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -61,7 +61,7 @@ jobs: variables: testRunTitle: '$(system.pullRequest.TargetBranch)-linux' testRunPlatform: linux - openssl_version: 1.1.1f + openssl_version: 1.1.1g steps: - template: ./posix-steps.yml @@ -118,7 +118,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.1f + openssl_version: 1.1.1g steps: - template: ./posix-steps.yml diff --git a/Misc/NEWS.d/next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst b/Misc/NEWS.d/next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst new file mode 100644 index 00000000000000..6390de717d71fb --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-06-12-13-13-44.bpo-40164.SPrSn5.rst @@ -0,0 +1 @@ +Updates Windows OpenSSL to 1.1.1g \ No newline at end of file diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index f0e58e64dda53d..0985bfcb8a504b 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -49,7 +49,7 @@ echo.Fetching external libraries... set libraries= set libraries=%libraries% bzip2-1.0.6 -if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1f +if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.1.1g set libraries=%libraries% sqlite-3.31.1.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 @@ -72,7 +72,12 @@ for %%e in (%libraries%) do ( echo.Fetching external binaries... set binaries= +<<<<<<< HEAD if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1f +======= +if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi +if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g +>>>>>>> d8332004f9... bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834) 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 b68191ba754d0b..8be1daa696323c 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -49,8 +49,8 @@ $(ExternalsDir)sqlite-3.31.1.0\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ - $(ExternalsDir)openssl-1.1.1f\ - $(ExternalsDir)openssl-bin-1.1.1f\$(ArchName)\ + $(ExternalsDir)openssl-1.1.1g\ + $(ExternalsDir)openssl-bin-1.1.1g\$(ArchName)\ $(opensslOutDir)include $(ExternalsDir)\nasm-2.11.06\ $(ExternalsDir)\zlib-1.2.11\ From bf168e280d48a633873a0a898369e0ca3813c751 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 12 Jun 2020 21:59:41 +0100 Subject: [PATCH 2/2] Fixup bad merge --- PCbuild/get_externals.bat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 0985bfcb8a504b..38fc2756b18d09 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -72,12 +72,7 @@ for %%e in (%libraries%) do ( echo.Fetching external binaries... set binaries= -<<<<<<< HEAD -if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1f -======= -if NOT "%IncludeLibffi%"=="false" set binaries=%binaries% libffi if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.1.1g ->>>>>>> d8332004f9... bpo-40164: Update Windows OpenSSL to 1.1.1g (GH-20834) if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.9.0 if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06