Skip to content
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.

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

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

Merged
merged 2 commits into from Mar 15, 2022
Merged

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

merged 2 commits into from Mar 15, 2022

Conversation

tiran
Copy link
Member

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

ned-deily
ned-deily reviewed Mar 15, 2022
View changes
Tools/wasm/testrunner.py Outdated Show resolved Hide resolved
@tiran tiran force-pushed the bpo-47024-openssl-111n branch from aecb6f1 to 6fb95b0 Compare Mar 15, 2022
@tiran tiran marked this pull request as ready for review Mar 15, 2022
@tiran tiran requested review from as code owners Mar 15, 2022
ned-deily
ned-deily approved these changes Mar 15, 2022
View changes
Copy link
Member

@ned-deily ned-deily left a comment

The Mac/BuildScript changes LGTM, thanks!

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

@zware zware left a comment

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

Misc/NEWS.d/next/Build/2022-03-15-09-28-55.bpo-47024.t7-dcu.rst Outdated Show resolved Hide resolved
@tiran tiran force-pushed the bpo-47024-openssl-111n branch from 44554fd to 1e43c29 Compare Mar 15, 2022
@tiran
Copy link
Member Author

@tiran tiran commented Mar 15, 2022

Need has a manual backport to 3.7.

@ned-deily
Copy link
Member

@ned-deily 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 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 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
21 of 23 checks passed
@tiran tiran deleted the bpo-47024-openssl-111n branch Mar 15, 2022
@miss-islington
Copy link
Contributor

@miss-islington 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 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 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
Copy link

@bedevere-bot 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 issue Mar 15, 2022
@tiran
[3.10] bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895)
00023da 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>.
(cherry picked from commit af0a50d)

Co-authored-by: Christian Heimes <christian@python.org>
tiran added a commit to tiran/cpython that referenced this issue Mar 15, 2022
@tiran
[3.9] [3.10] bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895)
62df2bc 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>.
(cherry picked from commit af0a50d)

Co-authored-by: Christian Heimes <christian@python.org>.
(cherry picked from commit 00023da)

Co-authored-by: Christian Heimes <christian@python.org>
@bedevere-bot
Copy link

@bedevere-bot 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 issue Mar 15, 2022
@tiran
[3.10] bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) (GH-31916)
a59ac1e 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>.
Co-authored-by: Christian Heimes <christian@python.org>
tiran added a commit that referenced this issue Mar 15, 2022
@tiran
[3.9] bpo-47024: Update OpenSSL to 1.1.1n (GH-31895) (#31917)
513911b 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>.
Co-authored-by: Christian Heimes <christian@python.org>.
Co-authored-by: Christian Heimes <christian@python.org>
asvetlov added a commit to YvesDup/cpython that referenced this issue Mar 25, 2022
@tiran @zware @asvetlov
bpo-47024: Update OpenSSL to 1.1.1n (pythonGH-31895)
5d55289 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ned-deily ned-deily

@zware zware

Assignees

@tiran tiran

Labels
CLA signed type-security
Projects
None yet
Milestone
No milestone
6 participants
@tiran @ned-deily @miss-islington @bedevere-bot @zware @the-knights-who-say-ni