From 864db7f47614476ba26860db31d125c8edfa3b36 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Tue, 28 May 2019 18:11:15 +0200 Subject: [PATCH] bpo-37081: Test with OpenSSL 1.1.1c Signed-off-by: Christian Heimes --- .azure-pipelines/ci.yml | 4 ++-- .azure-pipelines/pr.yml | 4 ++-- .travis.yml | 2 +- .../next/Tests/2019-05-28-17-48-22.bpo-37081.qxB-1l.rst | 1 + Tools/ssl/multissltests.py | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2019-05-28-17-48-22.bpo-37081.qxB-1l.rst diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 1576599379c489..fcfac85ed9c442 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.1b + openssl_version: 1.1.1c steps: - template: ./posix-steps.yml @@ -116,7 +116,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.1b + openssl_version: 1.1.1c steps: - template: ./posix-steps.yml diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index 0bd7921bcbefcc..2486f88a63fb15 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.0j + openssl_version: 1.1.1c steps: - template: ./posix-steps.yml @@ -116,7 +116,7 @@ jobs: variables: testRunTitle: '$(Build.SourceBranchName)-linux-coverage' testRunPlatform: linux-coverage - openssl_version: 1.1.0j + openssl_version: 1.1.1c steps: - template: ./posix-steps.yml diff --git a/.travis.yml b/.travis.yml index c1efe24b646bb5..02de997750abc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ cache: env: global: - - OPENSSL=1.1.0i + - OPENSSL=1.1.1c - 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-05-28-17-48-22.bpo-37081.qxB-1l.rst b/Misc/NEWS.d/next/Tests/2019-05-28-17-48-22.bpo-37081.qxB-1l.rst new file mode 100644 index 00000000000000..df5b8f2482d351 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-05-28-17-48-22.bpo-37081.qxB-1l.rst @@ -0,0 +1 @@ +Test with OpenSSL 1.1.1c diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 759f5f4a3e7872..07bd9b016d97f8 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -45,9 +45,9 @@ ] OPENSSL_RECENT_VERSIONS = [ - "1.0.2p", - "1.1.0i", - "1.1.1", + "1.0.2s", + "1.1.0k", + "1.1.1c", ] LIBRESSL_OLD_VERSIONS = [