[3.7] bpo-38117: Test with OpenSSL 1.1.1d (GH-15983) (GH-15994)

Signed-off-by: Christian Heimes <christian@python.org>.
(cherry picked from commit 58ab13479d854491ac9207bacfae25e8b18b044a)

Co-authored-by: Christian Heimes <christian@python.org>
https://bugs.python.org/issue38117

Automerge-Triggered-By: @matrixise

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 9d8da910acda74bd8e13bf872dcda4180519982c..38d0cc3e47dd58f94580acefdfb361b0dbab1ee6 100644 (file)
--- 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 bafed733a75d93cf52737391498d8a07837c1bed..8661da93d7e7803e0a0404ee5936f54ab4eccd96 100644 (file)
--- 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 378f3e5eb733d877629e3fa027b2fe1ce8eca4b7..1f67b70f799cce83f4824bd35e5b420b21af3063 100644 (file)
--- 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 (file)
index 0000000..d328037
--- /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 07bd9b016d97f805a0e73d5ca8c51c80d7603f9f..d816810d57078d70307cd1a7ffc1d8db5e1c5a2e 100755 (executable)
--- 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