diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-06-01 17:13:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-01 17:13:35 (GMT) |
| commit | 25543aecfe1e11c1a7aca02e2a83ddbfbadde85f (patch) | |
| tree | 9630f64737f8c68d38d4ae0a5dc21cb41130f50a /Tools | |
| parent | 6375287b37c226eb95d032b4714c43f8c04b7edb (diff) | |
| download | cpython-25543aecfe1e11c1a7aca02e2a83ddbfbadde85f.zip cpython-25543aecfe1e11c1a7aca02e2a83ddbfbadde85f.tar.gz cpython-25543aecfe1e11c1a7aca02e2a83ddbfbadde85f.tar.bz2 | |
[3.12] gh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (GH-105174) (#105199)
gh-103142: Upgrade binary builds and CI to OpenSSL 1.1.1u (GH-105174)
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, and adds a new _ssl_data_31.h file from 3.1.1 along with the ssl.c code to use it.
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).
backports of this prior to 3.12 will not include the openssl 3.1 header.
(cherry picked from commit ede89af605b1c0442353435ad22195c16274f65d)
Co-authored-by: Gregory P. Smith [Google] <greg@krypto.org>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/c-analyzer/cpython/_parser.py | 1 | ||||
| -rwxr-xr-x | Tools/ssl/multissltests.py | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Tools/c-analyzer/cpython/_parser.py b/Tools/c-analyzer/cpython/_parser.py index 9bd54db..2ee341f 100644 --- a/Tools/c-analyzer/cpython/_parser.py +++ b/Tools/c-analyzer/cpython/_parser.py @@ -71,6 +71,7 @@ Python/thread_pthread_stubs.h # only huge constants (safe but parsing is slow) Modules/_ssl_data.h +Modules/_ssl_data_31.h Modules/_ssl_data_300.h Modules/_ssl_data_111.h Modules/cjkcodecs/mappings_*.h diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index c0fbee9..f9809c9 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -46,8 +46,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 = [ |