Skip to content

gh-139929: fix incorrect OpenSSL version-based guard in _ssl.c #139945

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
merged 1 commit into from
Oct 11, 2025
Merged

gh-139929: fix incorrect OpenSSL version-based guard in _ssl.c #139945

merged 1 commit into from
Oct 11, 2025
+1 −1

Conversation

@picnixz
Copy link
Member

@picnixz picnixz commented Oct 11, 2025 •
edited by bedevere-app bot
Loading

@picnixz picnixz requested a review from gpshead as a code owner October 11, 2025 09:11
@bedevere-app bedevere-app bot mentioned this pull request Oct 11, 2025
Closed
@picnixz picnixz added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 11, 2025
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @picnixz for commit ef2eb97 🤖

Results will be shown at:

https://buildbot.python.org/all/#/grid?branch=refs%2Fpull%2F139945%2Fmerge

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Oct 11, 2025
@gpshead gpshead merged commit cdd3eee into python:main Oct 11, 2025
119 of 125 checks passed
@gpshead gpshead added the needs backport to 3.14 bugs and security fixes label Oct 11, 2025
@miss-islington-app
Copy link

Thanks @picnixz for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 11, 2025
@picnixz @miss-islington
pythongh-139929: fix incorrect OpenSSL version-based guard in _ssl.c (
b797fdd 
pythonGH-139945)

fix OpenSSL version-based guards
(cherry picked from commit cdd3eee)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Oct 11, 2025

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

@bedevere-app bedevere-app bot removed the needs backport to 3.14 bugs and security fixes label Oct 11, 2025
@gpshead gpshead added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Oct 11, 2025
@miss-islington-app
Copy link

Thanks @picnixz for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @picnixz for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

@miss-islington-app
Copy link

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

cherry_picker cdd3eee7fc26538c8365dcbf2dd844ec7cdf7fb7 3.13

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 11, 2025
@picnixz @miss-islington
pythongh-139929: fix incorrect OpenSSL version-based guard in _ssl.c (
494c87e 
pythonGH-139945)

fix OpenSSL version-based guards
(cherry picked from commit cdd3eee)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@miss-islington-app
Copy link

Sorry @picnixz and @gpshead, I had trouble completing the backport.
Please retry by removing and re-adding the "needs backport to 3.14" label.
Please backport backport using cherry_picker on the command line.

cherry_picker cdd3eee7fc26538c8365dcbf2dd844ec7cdf7fb7 3.14

@gpshead gpshead removed needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Oct 11, 2025
@gpshead
Copy link
Member

gpshead commented Oct 11, 2025

not worried about the backports, just figured i'd do the obvious ones if they were easy. the irony of this check is that it is for a long obsolete version of OpenSSL.

gpshead pushed a commit that referenced this pull request Oct 11, 2025
@miss-islington @picnixz
[3.14] gh-139929: fix incorrect OpenSSL version-based guard in `_ssl.…
187588e 
…c` (GH-139945) (#139964)

gh-139929: fix incorrect OpenSSL version-based guard in `_ssl.c` (GH-139945)

fix OpenSSL version-based guards
(cherry picked from commit cdd3eee)

Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
@picnixz picnixz deleted the fix/ssl/guard-139929 branch October 11, 2025 18:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpshead gpshead gpshead approved these changes

Assignees

@gpshead gpshead

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@picnixz @bedevere-bot @gpshead