Skip to content

[3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503) - #158513

Merged
Yhg1s merged 7 commits into
python:3.12from
hugovk:backport-1697ea3-3.12
Sep 30, 2026
Merged

Yhg1s merged 7 commits into
python:3.12from
hugovk:backport-1697ea3-3.12

Conversation

@hugovk

@hugovk hugovk commented Sep 30, 2026 •

Copy link
Copy Markdown
Member

…e wrap_socket() (pythonGH-158503)

(cherry picked from commit 1697ea3)

Co-authored-by: Seth Larson <seth@python.org>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@read-the-docs-community

read-the-docs-community Bot commented Sep 30, 2026 •

Copy link
Copy Markdown

@hugovk
hugovk marked this pull request as draft September 30, 2026 17:36
Comment thread Misc/NEWS.d/next/Security/2026-09-16-14-05-19.gh-issue-156793.Qa1T5Z.rst Outdated
Comment thread Misc/NEWS.d/next/Security/2026-09-23-11-34-30.gh-issue-156793.zC_AjF.rst Outdated
@Yhg1s
Yhg1s marked this pull request as ready for review September 30, 2026 21:18
@Yhg1s
Yhg1s merged commit 869069d into python:3.12 Sep 30, 2026
28 checks passed
@Yhg1s Yhg1s added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Sep 30, 2026
@miss-islington-app

Copy link
Copy Markdown

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

@miss-islington-app

Copy link
Copy Markdown

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

@miss-islington-app

Copy link
Copy Markdown

Sorry, @hugovk and @Yhg1s, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 869069d52ce0efab2f8c38197e92cdaaa312f1ed 3.10

@miss-islington-app

Copy link
Copy Markdown

Sorry, @hugovk and @Yhg1s, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 869069d52ce0efab2f8c38197e92cdaaa312f1ed 3.11

@hugovk
hugovk deleted the backport-1697ea3-3.12 branch September 30, 2026 22:01
pablogsal pushed a commit that referenced this pull request Oct 1, 2026
…_socket() (GH-158503) (#158532)

[3.11] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503) (GH-158513)

* [3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503)
(cherry picked from commit 1697ea3)

* Raise a DeprecationWarning instead of ValueError
(cherry picked from commit 869069d)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Seth Larson <seth@python.org>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
pablogsal added a commit that referenced this pull request Oct 1, 2026
…_socket() (GH-158503) (#158533)

* [3.10] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503) (GH-158513)

* [3.12] gh-156793: Validate SSLContext.wrap_bio() parameters like wrap_socket() (GH-158503)
(cherry picked from commit 1697ea3)

* Raise a DeprecationWarning instead of ValueError
(cherry picked from commit 869069d)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Seth Larson <seth@python.org>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: T. Wouters <thomas@python.org>

* gh-156793: Start the SSL handshake in the 3.10 hostname validation tests

---------

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Seth Larson <seth@python.org>
Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com>
Co-authored-by: Pablo Galindo Salgado <pablogsal@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes topic-SSL type-security A security issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants