Repository navigation
[3.9] bpo-43788: Generate version specific _ssl_data.h (GH-25300) (GH-25310) - #25310
Merged
Merged
Conversation
Signed-off-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: GH:tiran. (cherry picked from commit 150af75) Co-authored-by: Christian Heimes <christian@python.org>
tiran
changed the title
icanhasmath
added a commit
to ActiveState/cpython
that referenced
this pull request
Oct 30, 2026
* closes bpo-39953: Update OpenSSL error codes table. (pythonGH-19082) I updated the error codes using the OpenSSL 1.1.1f source tree. (cherry picked from commit 3e0dd37) * closes bpo-39953: Generate ifdefs around library code definitions. (pythonGH-19490) (cherry picked from commit 909b87d) * closes bpo-40266, closes bpo-39953: Use numeric lib code if compiling against old OpenSSL. (pythonGH-19506) (cherry picked from commit 584a3cf) * bpo-43789: OpenSSL 3.0.0 Don't call passwd callback again in error case (pythonGH-25303) (cherry picked from commit d3b73f3) Co-authored-by: Christian Heimes <christian@python.org> (cherry picked from commit a188bd4) * bpo-4379: Skip TLS 1.0/1.1 tests under OpenSSL 3.0.0 (pythonGH-25304) Signed-off-by: Christian Heimes <christian@python.org> (cherry picked from commit 5151d64) Co-authored-by: Christian Heimes <christian@python.org> (cherry picked from commit 4a5c101) * bpo-43794: OpenSSL 3.0.0: set OP_IGNORE_UNEXPECTED_EOF by default (pythonGH-25309) Signed-off-by: Christian Heimes <christian@python.org> (cherry picked from commit 6f37ebc) Co-authored-by: Christian Heimes <christian@python.org> (cherry picked from commit 54d89a3) * [3.9] bpo-43788: Generate version specific _ssl_data.h (pythonGH-25300) (pythonGH-25310) (cherry picked from commit 150af75) Co-authored-by: Christian Heimes <christian@python.org> (cherry picked from commit 299ae9c) * [3.9] bpo-46114: Fix OpenSSL version check for 3.0.1 (pythonGH-30170) (pythonGH-30173) Co-authored-by: Christian Heimes <christian@python.org> (cherry picked from commit a9b3edb) * [3.9] bpo-41561: skip test_min_max_version_mismatch (pythonGH-22308) (pythonGH-23363) skip test_min_max_version_mismatch when TLS 1.0 is not available Signed-off-by: Christian Heimes <christian@python.org> (cherry picked from commit ce04e71) Co-authored-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: GH:tiran (cherry picked from commit 802ff7c) * 3.7.17.x: copy the OpenSSL DLLs by pattern on Windows openssl.props copied libcrypto-1_1.dll and libssl-1_1.dll from the import library directory, so building against OpenSSL 3 failed at the copy step. OpenSSL 3 installs its DLLs in bin\ and names them libssl-3.dll or libssl-3-x64.dll depending on how it was built; both forms occur among the Platform's shared/openssl 3.5 builds. python.props now sets opensslBinDir (bin\ when OPENSSL_DIR has one, else the import library directory, which is where 1.1 builds and the externals keep them), and openssl.props copies whatever libcrypto-*/libssl-* DLLs and PDBs it finds there. The ActiveState 3.9 builds get the same result from the Platform's core patch, which computes the suffix instead. * Doc: drop pasted citation markers from the 3.7.17.7 notes The 3.7.17.7 section of Doc/whatsnew/3.7.rst carried source markers copied along with its CVE descriptions ("NVD+5SUSE+5linux.oracle.com+5", "starwindsoftware.com+2" and the like), which render as text. The descriptions themselves are unchanged. The headings of the 3.7.17.4 to 3.7.17.7 sections also get underlines as long as their titles. * Update version to 3.7.17.9 and add release notes 3.7.17.9 moves the 3.7 line to OpenSSL 3: the upstream ssl changes the 3.9 line got for OpenSSL 3 (unexpected-EOF handling, per-version error tables, the password-callback fix and the matching test updates) and a Windows build that copies OpenSSL 3's DLLs. The notes list the behavior changes that come with OpenSSL 3 itself. OP_IGNORE_UNEXPECTED_EOF's versionadded says 3.7.17.9, where this line gained it. * 3.7.17.x: pick the OpenSSL DLL names from the OpenSSL version on Windows Copying libssl-*.dll by wildcard broke the Platform's python-builder, which edits openssl.props and stops when its x64 suffix line is missing. Name the DLLs from SSL_MAJOR_VERSION/SSL_MINOR_VERSION (set by the Platform build), detect a 3.x OpenSSL from bin\ when they are unset, and add the x64 suffix only when that DLL exists. python-builder removes the x64 line, as it does for 3.9 and 3.10. Co-Authored-By: Claude <noreply@anthropic.com> * 3.7.17.x: state the RSA key floor for each OpenSSL 3 default security level OpenSSL 3.2 raised the default security level from 1 to 2, so the floor is 2048 bits on the 3.5 release the Platform builds with and 1024 bits on 3.0 and 3.1. --------- Co-authored-by: Benjamin Peterson <benjamin@python.org> Co-authored-by: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Co-authored-by: Christian Heimes <christian@python.org> Co-authored-by: Claude <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Christian Heimes christian@python.org
Automerge-Triggered-By: GH:tiran.
(cherry picked from commit 150af75)
Co-authored-by: Christian Heimes christian@python.org
https://bugs.python.org/issue43788