From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 3 Jun 2019 18:39:57 +0000 (-0700)
Subject: [3.7] bpo-37081: Test with OpenSSL 1.1.1c (GH-13631) (GH-13782)
X-Git-Tag: v3.7.4rc1~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3344197040fe1b05a3244bdb16d429f4647f35b8;p=thirdparty%2FPython%2Fcpython.git

[3.7] bpo-37081: Test with OpenSSL 1.1.1c (GH-13631) (GH-13782)



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


Co-authored-by: Christian Heimes <christian@python.org>


https://bugs.python.org/issue37081
---

diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 1576599379c4..fcfac85ed9c4 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 0bd7921bcbef..2486f88a63fb 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 07d26412333c..378f3e5eb733 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 000000000000..df5b8f2482d3
--- /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 759f5f4a3e78..07bd9b016d97 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -45,9 +45,9 @@ OPENSSL_OLD_VERSIONS = [
 ]
 
 OPENSSL_RECENT_VERSIONS = [
-    "1.0.2p",
-    "1.1.0i",
-    "1.1.1",
+    "1.0.2s",
+    "1.1.0k",
+    "1.1.1c",
 ]
 
 LIBRESSL_OLD_VERSIONS = [