summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2023-06-05 09:07:30 -0700
committerGitHub <noreply@github.com>2023-06-05 18:07:30 +0200
commitcb37100bec64a9313a325151ebef9896e8c76046 (patch)
treec65a243cb5518025f6005d404be3e900f48a3e0d /Tools
parent[3.10] gh-105184: document that marshal functions can fail and need to be che... (diff)
downloadcpython-cb37100bec64a9313a325151ebef9896e8c76046.tar.gz
cpython-cb37100bec64a9313a325151ebef9896e8c76046.tar.bz2
cpython-cb37100bec64a9313a325151ebef9896e8c76046.zip
[3.10] gh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (GH-105174) (GH-105200) (#105204)
Upgrade builds to OpenSSL 1.1.1u. This OpenSSL version addresses a pile if less-urgent CVEs since 1.1.1t. The Mac/BuildScript/build-installer.py was already updated. Also updates _ssl_data_111.h from OpenSSL 1.1.1u, _ssl_data_300.h from 3.0.9. Manual edits to the _ssl_data_300.h file prevent it from removing any existing definitions in case those exist in some peoples builds and were important (avoiding regressions during backporting). (cherry picked from commit ede89af). (cherry picked from commit a5d2b546c1b0b73d0695b98838a3ddd497382999) (cherry picked from commit f90d3f68db720bd6d0deda8cc0030339ccd43858) Co-authored-by: Gregory P. Smith <greg@krypto.org>
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/ssl/multissltests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 27e9032395f..c15405b704c 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -47,8 +47,9 @@ OPENSSL_OLD_VERSIONS = [
]
OPENSSL_RECENT_VERSIONS = [
- "1.1.1t",
- "3.0.8"
+ "1.1.1u",
+ "3.0.9",
+ "3.1.1",
]
LIBRESSL_OLD_VERSIONS = [