Skip to content

gh-148292: Update ssl._SSLSocket for OpenSSL 4 - #149102

Merged
vstinner merged 10 commits into
python:mainfrom
vstinner:ssl_got_eof_error
May 4, 2026
Merged

gh-148292: Update ssl._SSLSocket for OpenSSL 4#149102
vstinner merged 10 commits into
python:mainfrom
vstinner:ssl_got_eof_error

Conversation

@vstinner

@vstinnervstinner commented Apr 28, 2026•
edited
Loading

Copy link
Copy Markdown
Member

The _SSLSocket object now remembers if it gets an EOF error. In this case, read(), sendfile(), write() and do_handshake() method calls fail with SSLEOFError without calling the underlying OpenSSL function.

@vstinner
pythongh-148292: Update ssl._SSLSocket for OpenSSL 4
a05a9ce
The _SSLSocket object now remembers if it gets an EOF error. In this
case, read(), sendfile() and write() method calls fail with
SSLEOFError without calling the underlying OpenSSL function.
@bedevere-appbedevere-appBot mentioned this pull request Apr 28, 2026
Closed
@vstinnervstinner mentioned this pull request Apr 28, 2026
Closed
@read-the-docs-community

read-the-docs-communityBot commented Apr 28, 2026•
edited
Loading

Copy link
Copy Markdown

Documentation build overview

📚 cpython-previews | 🛠️ Build #32472356 | 📁 Comparing 0f650cc against main (2b6a137)

🔍 Preview build

2 files changed
±download.html
±whatsnew/changelog.html

gpshead
gpshead reviewed Apr 28, 2026
View reviewed changes
Comment threadModules/_ssl.c Outdated
Comment threadLib/test/test_ssl.py
Comment threadLib/test/test_ssl.py
Comment threadLib/test/test_ssl.py Outdated
Comment threadMisc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst Outdated
Comment threadMisc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst Outdated
@@ -0,0 +1,7 @@
:mod:`ssl`: Update :class:`ssl.SSLSocket` for OpenSSL 4. The class now
remembers if it gets a :exc:`ssl.SSLEOFError`. In this case, following
:meth:`~ssl.SSLSocket.read`, :meth:`!sendfile`, :meth:`~ssl.SSLSocket.write`,

@gpsheadgpsheadApr 28, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:meth:~ssl.SSLSocket.sendfile ?

@vstinnervstinnerApr 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using :meth:~ssl.SSLSocket.sendfile makes the documentation fails to build. It doesn't work since SSLSocket.sendfile() has no anchor at https://docs.python.org/dev/library/ssl.html#ssl.SSLSocket, but SSLSocket.sendfile() method is documented

@vstinner

vstinner commented Apr 29, 2026

Copy link
Copy Markdown
MemberAuthor

@gpshead: Please review the updated PR.

Note: Before, I didn't want to use self.addCleanup(server.join) in the test since the server could hang. I added the timeout that you suggested on the socket and so the server should no longer hang on error.

vstinner
vstinner commented Apr 29, 2026
View reviewed changes
Comment threadMisc/NEWS.d/next/Library/2026-04-28-17-47-55.gh-issue-148292.oIq3ml.rst Outdated
Comment threadLib/test/test_ssl.py Outdated
@vstinner
Apply suggestions from code review
0f650cc
Co-authored-by: Victor Stinner <vstinner@python.org>
@vstinner

vstinner commented Apr 30, 2026

Copy link
Copy Markdown
MemberAuthor

@picnixz: Would you mind to review this change?

It would be nice to have OpenSSL 4 support in Python 3.15 beta1 (feature freeze is next Tuesday).

@vstinner
vstinner merged commit 7b7fa3f into python:mainMay 4, 2026
54 checks passed
@vstinner
vstinner deleted the ssl_got_eof_error branch May 4, 2026 11:53
@HiassofTHiassofT mentioned this pull request May 6, 2026
Open
vstinner added a commit to vstinner/cpython that referenced this pull request May 13, 2026
@vstinner@gpshead
pythongh-148292: Update _ssl._SSLSocket for OpenSSL 4 (python#149102)
3c2a301
The _SSLSocket object now remembers if it gets an EOF error. In this
case, read(), sendfile(), write() and do_handshake method calls fail
with SSLEOFError without calling the underlying OpenSSL function.
Co-authored-by: Gregory P. Smith <greg@krypto.org>
(cherry picked from commit 7b7fa3f)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gpsheadgpsheadgpshead left review comments
@picnixzpicnixzAwaiting requested review from picnixzpicnixz 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.

2 participants

@vstinner@gpshead