Skip to content

gh-132339: Add support for OpenSSL 3.5#137720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
zware merged 8 commits into from
Aug 14, 2025
Merged

gh-132339: Add support for OpenSSL 3.5 #137720

zware merged 8 commits into from
Aug 14, 2025

Conversation

@zware
Copy link
Member

@zwarezware commented Aug 13, 2025•
edited by bedevere-app bot
Loading

Includes _ssl_data*.h update, as well as updating other versions in CI.

@bedevere-appbedevere-appbot mentioned this pull request Aug 13, 2025
Closed
AA-Turner
AA-Turner reviewed Aug 13, 2025
View reviewed changes
zware
zware commented Aug 13, 2025
View reviewed changes
@zwarezware marked this pull request as ready for review August 13, 2025 17:43
@gpsheadgpshead added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Aug 14, 2025
@zwarezware merged commit 7a703c8 into python:mainAug 14, 2025
87 of 89 checks passed
@zwarezware deleted the ssl35 branch August 14, 2025 04:18
@miss-islington-app
Copy link

miss-islington-appbot commented Aug 14, 2025

Thanks @zware for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

@miss-islington-app
Copy link

miss-islington-appbot commented Aug 14, 2025

Sorry, @zware, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 7a703c8f1942c8bd07943458962f6e59d2892757 3.14

@miss-islington-app
Copy link

miss-islington-appbot commented Aug 14, 2025

Sorry, @zware, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 7a703c8f1942c8bd07943458962f6e59d2892757 3.13

zware added a commit to zware/cpython that referenced this pull request Aug 14, 2025
@zware
[3.14]pythongh-132339: Add support for OpenSSL 3.5 (pythonGH-137720)
209d383
* Add OpenSSL 3.5.2 definitions to Modules/_ssl_data_35.h (moved from Modules/_ssl_data_34.h) * Demote OpenSSL 3.1 to "old", remove it from CI * Update all OpenSSL versions to latest patchlevel in CI config and multissltests defaults * Add OpenSSL 3.5.2 to CI configuration and multissltests default list * Fix a typo in the argument parser description of multissltests.py (cherry picked from commit 7a703c8) Co-authored-by: Zachary Ware <[email protected]>
@bedevere-app
Copy link

bedevere-appbot commented Aug 14, 2025

GH-137747 is a backport of this pull request to the 3.14 branch.

@bedevere-appbedevere-appbot removed the needs backport to 3.14 bugs and security fixes label Aug 14, 2025
@zware
Copy link
MemberAuthor

zware commented Aug 14, 2025

The 3.13 backport is complicated by the fact that 3.4 support was not backported there; presumably we want to do that first? I think we do want to make sure 3.5 at least works back to 3.13 (maybe even further?), but how critical is the _ssl_data*.h update for that?

cc: @encukou from GH-127330 (3.4) and @picnixz from GH-131618 (3.4.1)

hugovk pushed a commit that referenced this pull request Aug 14, 2025
@zware
[3.14]gh-132339: Add support for OpenSSL 3.5 (GH-137720) (#137747)
d8f4d56
* Add OpenSSL 3.5.2 definitions to Modules/_ssl_data_35.h (moved from Modules/_ssl_data_34.h) * Demote OpenSSL 3.1 to "old", remove it from CI * Update all OpenSSL versions to latest patchlevel in CI config and multissltests defaults * Add OpenSSL 3.5.2 to CI configuration and multissltests default list * Fix a typo in the argument parser description of multissltests.py (cherry picked from commit 7a703c8)
@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@encukou
Copy link
Member

encukou commented Aug 14, 2025

The ssl_data*.h is only used for error messages.

@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@serhiy-storchaka
Copy link
Member

serhiy-storchaka commented Aug 14, 2025

Reminder about backporting. @zware

@zware
Copy link
MemberAuthor

zware commented Aug 14, 2025

@serhiy-storchaka: See note above; I'm not certain how we want to handle this.

@encukouencukou mentioned this pull request Aug 15, 2025
Merged
@encukou
Copy link
Member

encukou commented Aug 15, 2025

See #127331 (comment).

@encukouencukou removed the needs backport to 3.13 bugs and security fixes label Aug 15, 2025
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@zware@Agent-Hellboy
pythongh-132339: Add support for OpenSSL 3.5 (pythonGH-137720)
b1e373f
* Add OpenSSL 3.5.2 definitions to Modules/_ssl_data_35.h (moved from Modules/_ssl_data_34.h) * Demote OpenSSL 3.1 to "old", remove it from CI * Update all OpenSSL versions to latest patchlevel in CI config and multissltests defaults * Add OpenSSL 3.5.2 to CI configuration and multissltests default list * Fix a typo in the argument parser description of multissltests.py
@Edward-KnightEdward-Knight mentioned this pull request Aug 26, 2025
Closed
kumaraditya303 pushed a commit to miss-islington/cpython that referenced this pull request Sep 9, 2025
@zware@kumaraditya303
[3.14]pythongh-132339: Add support for OpenSSL 3.5 (pythonGH-137720) (…
a53eaeb
…python#137747) * Add OpenSSL 3.5.2 definitions to Modules/_ssl_data_35.h (moved from Modules/_ssl_data_34.h) * Demote OpenSSL 3.1 to "old", remove it from CI * Update all OpenSSL versions to latest patchlevel in CI config and multissltests defaults * Add OpenSSL 3.5.2 to CI configuration and multissltests default list * Fix a typo in the argument parser description of multissltests.py (cherry picked from commit 7a703c8)
@hugovkhugovk mentioned this pull request Jan 17, 2026
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AA-TurnerAA-TurnerAA-Turner left review comments

@gpsheadgpsheadgpshead approved these changes

@picnixzpicnixzAwaiting requested review from picnixzpicnixz is a code owner

@ezio-melottiezio-melottiAwaiting requested review from ezio-melottiezio-melotti is a code owner

@hugovkhugovkAwaiting requested review from hugovkhugovk is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@zware@bedevere-bot@encukou@serhiy-storchaka@gpshead@hugovk@AA-Turner