Skip to content

Comments

bpo-47024: Update OpenSSL to 1.1.1n (GH-31895)#31895

Merged
tiran merged 2 commits intopython:mainfrom
tiran:bpo-47024-openssl-111n
Mar 15, 2022
Merged

bpo-47024: Update OpenSSL to 1.1.1n (GH-31895)#31895
tiran merged 2 commits intopython:mainfrom
tiran:bpo-47024-openssl-111n

Conversation

@tiran
Copy link
Member

@tiran tiran commented Mar 15, 2022 •
edited by bedevere-bot
Loading

ned-deily
ned-deily reviewed Mar 15, 2022
View reviewed changes
@tiran tiran force-pushed the bpo-47024-openssl-111n branch from aecb6f1 to 6fb95b0 Compare March 15, 2022 15:37
@tiran tiran marked this pull request as ready for review March 15, 2022 15:39
@tiran tiran requested review from a team as code owners March 15, 2022 15:39
ned-deily
ned-deily approved these changes Mar 15, 2022
View reviewed changes
Copy link
Member

@ned-deily ned-deily left a comment

Choose a reason for hiding this comment

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

The Mac/BuildScript changes LGTM, thanks!

zware
zware approved these changes Mar 15, 2022
View reviewed changes
Copy link
Member

@zware zware left a comment

Choose a reason for hiding this comment

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

LGTM with a NEWS note suggestion (and a rebase is now needed).

@tiran tiran force-pushed the bpo-47024-openssl-111n branch from 44554fd to 1e43c29 Compare March 15, 2022 17:22
@tiran
Copy link
Member Author

tiran commented Mar 15, 2022

Need has a manual backport to 3.7.

@ned-deily
Copy link
Member

ned-deily commented Mar 15, 2022

@tiran I also have a 3.8 backport in progress, should land shortly.

@ned-deily
Copy link
Member

ned-deily commented Mar 15, 2022

@tiran 3.8 backport for your review #31912

@ned-deily ned-deily closed this Mar 15, 2022
@ned-deily ned-deily reopened this Mar 15, 2022
@ned-deily
Copy link
Member

ned-deily commented Mar 15, 2022

(restarting the CI)

@tiran tiran changed the title bpo-47024: Update OpenSSL to 1.1.1n bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) Mar 15, 2022
@tiran tiran merged commit af0a50d into python:main Mar 15, 2022
@tiran tiran deleted the bpo-47024-openssl-111n branch March 15, 2022 20:03
@miss-islington
Copy link
Contributor

miss-islington commented Mar 15, 2022

Thanks @tiran for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9, 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Mar 15, 2022

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

@miss-islington
Copy link
Contributor

miss-islington commented Mar 15, 2022

Sorry @tiran, I had trouble checking out the 3.9 backport branch.
Please backport using cherry_picker on command line.
cherry_picker af0a50de4b77dc774fcfdf5468ec320b08bfb53b 3.9

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 15, 2022
@bedevere-bot
Copy link

bedevere-bot commented Mar 15, 2022

GH-31916 is a backport of this pull request to the 3.10 branch.

tiran added a commit to tiran/cpython that referenced this pull request Mar 15, 2022
@tiran
[3.10] bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895)
00023da 
Co-authored-by: Zachary Ware <[email protected]>.
(cherry picked from commit af0a50d)

Co-authored-by: Christian Heimes <[email protected]>
tiran added a commit to tiran/cpython that referenced this pull request Mar 15, 2022
@tiran
[3.9] [3.10] bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895)
62df2bc 
Co-authored-by: Zachary Ware <[email protected]>.
(cherry picked from commit af0a50d)

Co-authored-by: Christian Heimes <[email protected]>.
(cherry picked from commit 00023da)

Co-authored-by: Christian Heimes <[email protected]>
@bedevere-bot
Copy link

bedevere-bot commented Mar 15, 2022

GH-31917 is a backport of this pull request to the 3.9 branch.

tiran added a commit that referenced this pull request Mar 15, 2022
@tiran
[3.10] bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) (GH-31916)
a59ac1e 
Co-authored-by: Zachary Ware <[email protected]>.
Co-authored-by: Christian Heimes <[email protected]>
tiran added a commit that referenced this pull request Mar 15, 2022
@tiran
[3.9] bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) (#31917)
513911b 
Co-authored-by: Zachary Ware <[email protected]>.
Co-authored-by: Christian Heimes <[email protected]>.
Co-authored-by: Christian Heimes <[email protected]>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
@tiran @hello-adam
[3.9] bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895) (python#31917
51e74bf 
)

Co-authored-by: Zachary Ware <[email protected]>.
Co-authored-by: Christian Heimes <[email protected]>.
Co-authored-by: Christian Heimes <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ned-deily ned-deily ned-deily approved these changes

@zware zware zware approved these changes

Assignees

@tiran tiran

Labels

type-security A security issue

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tiran @ned-deily @miss-islington @bedevere-bot @zware @the-knights-who-say-ni