bpo-38117: Test with OpenSSL 1.1.1d (pythonGH-15983)

Signed-off-by: Christian Heimes <christian@python.org>
rjmcnamara · Sep 11, 2019 · 58ab134 · 58ab134
1 parent 5a56ce4
commit 58ab134
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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"
     - CFLAGS="-I${OPENSSL_DIR}/include"

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
@@ -0,0 +1 @@
+Test with OpenSSL 1.1.1d
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
@@ -45,17 +45,16 @@
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.0.2s",
-    "1.1.0k",
-    "1.1.1c",
+    "1.0.2t",
+    "1.1.0l",
+    "1.1.1d",
 ]
 
 LIBRESSL_OLD_VERSIONS = [
-    "2.9.2",
 ]
 
 LIBRESSL_RECENT_VERSIONS = [
-    "2.8.3",
+    "2.9.2",
 ]
 
 # store files in ../multissl