bpo-37081: Test with OpenSSL 1.1.1c (GH-13631)

tiran · web-flow · commit 06651ee418b5 · 2019-06-03T20:10:19.000+02:00
Signed-off-by: Christian Heimes &lt;christian@python.org&gt;
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.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
@@ -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
@@ -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
@@ -0,0 +1 @@
+Test with OpenSSL 1.1.1c
diff --git 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 = [

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,9 @@`
`45`	`45`	`]`
`46`	`46`
`47`	`47`	`OPENSSL_RECENT_VERSIONS = [`
`48`		`- "1.0.2p",`
`49`		`- "1.1.0i",`
`50`		`- "1.1.1",`
	`48`	`+ "1.0.2s",`
	`49`	`+ "1.1.0k",`
	`50`	`+ "1.1.1c",`
`51`	`51`	`]`
`52`	`52`
`53`	`53`	`LIBRESSL_OLD_VERSIONS = [`