summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-09-11 17:09:28 (GMT)
committerGitHub <noreply@github.com>2019-09-11 17:09:28 (GMT)
commit0b7f3706e6a4d72f7e9988cebc4826ad2c4c4753 (patch)
treeb89ab817f35d171f18be5b32894b5e32c4a619f5
parentf90cbcbfe318fc4f0107bfad3cfc653ad1501c58 (diff)
downloadcpython-0b7f3706e6a4d72f7e9988cebc4826ad2c4c4753.zip
cpython-0b7f3706e6a4d72f7e9988cebc4826ad2c4c4753.tar.gz
cpython-0b7f3706e6a4d72f7e9988cebc4826ad2c4c4753.tar.bz2
bpo-38117: Test with OpenSSL 1.1.1d (GH-15983)
Signed-off-by: Christian Heimes <christian@python.org> (cherry picked from commit 58ab13479d854491ac9207bacfae25e8b18b044a) Co-authored-by: Christian Heimes <christian@python.org>
-rw-r--r--.azure-pipelines/ci.yml4
-rw-r--r--.azure-pipelines/pr.yml4
-rw-r--r--.travis.yml2
-rw-r--r--Misc/NEWS.d/next/Tests/2019-09-11-17-22-32.bpo-38117.X7LgGY.rst1
-rwxr-xr-xTools/ssl/multissltests.py9
5 files changed, 10 insertions, 10 deletions
diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml
index 12ff7d4..fe10e45 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.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 e3e24ae..09209fc 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.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 519dd9c..8a960c5 100644
--- 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
new file mode 100644
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 7fda4df..d816810 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -45,17 +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 = [
- "2.9.2",
]
LIBRESSL_RECENT_VERSIONS = [
- "2.8.3",
+ "2.9.2",
]
# store files in ../multissl