From cec68c31e8507159534b6eec3fb5d801cd3dbf8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Wirtel?= Date: Wed, 11 Sep 2019 19:36:06 +0200 Subject: [PATCH] [3.7] bpo-38117: Test with OpenSSL 1.1.1d (GH-15983) (GH-15994) Signed-off-by: Christian Heimes . (cherry picked from commit 58ab13479d854491ac9207bacfae25e8b18b044a) Co-authored-by: Christian Heimes https://bugs.python.org/issue38117 Automerge-Triggered-By: @matrixise --- .azure-pipelines/ci.yml | 4 ++-- .azure-pipelines/pr.yml | 4 ++-- .travis.yml | 2 +- .../next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst | 1 + Tools/ssl/multissltests.py | 8 ++++---- 5 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 9d8da910acd..38d0cc3e47d 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -59,7 +59,7 @@ jobs: variables: testRunTitle: '$(build.sourceBranchName)-linux' testRunPlatform: linux - openssl_version: 1.1.1c + openssl_version: 1.1.1d steps: - template: ./posix-steps.yml @@ -116,7 +116,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.1c + openssl_version: 1.1.1d steps: - template: ./posix-steps.yml diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index bafed733a75..8661da93d7e 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -59,7 +59,7 @@ jobs: variables: testRunTitle: '$(system.pullRequest.TargetBranch)-linux' testRunPlatform: linux - openssl_version: 1.1.1c + openssl_version: 1.1.1d steps: - template: ./posix-steps.yml @@ -116,7 +116,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.1c + openssl_version: 1.1.1d steps: - template: ./posix-steps.yml diff --git a/.travis.yml b/.travis.yml index 378f3e5eb73..1f67b70f799 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: env: global: - - OPENSSL=1.1.1c + - OPENSSL=1.1.1d - OPENSSL_DIR="$HOME/multissl/openssl/${OPENSSL}" - PATH="${OPENSSL_DIR}/bin:$PATH" # Use -O3 because we don't use debugger on Travis-CI diff --git a/Misc/NEWS.d/next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst b/Misc/NEWS.d/next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst new file mode 100644 index 00000000000..d3280375516 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst @@ -0,0 +1 @@ +Test with OpenSSL 1.1.1d diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 07bd9b016d9..d816810d570 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -45,16 +45,16 @@ OPENSSL_OLD_VERSIONS = [ ] OPENSSL_RECENT_VERSIONS = [ - "1.0.2s", - "1.1.0k", - "1.1.1c", + "1.0.2t", + "1.1.0l", + "1.1.1d", ] LIBRESSL_OLD_VERSIONS = [ ] LIBRESSL_RECENT_VERSIONS = [ - "2.7.4", + "2.9.2", ] # store files in ../multissl