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

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

Merged
merged 2 commits into from
Mar 15, 2022

Conversation

tiran
Copy link
Member

@tiran tiran commented Mar 15, 2022

Tools/wasm/testrunner.py Outdated Show resolved Hide resolved
@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
@tiran tiran added type-security A security issue needs backport to 3.7 needs backport to 3.8 only security fixes needs backport to 3.9 only security fixes needs backport to 3.10 only security fixes labels Mar 15, 2022
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!

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
Copy link
Member Author

tiran commented Mar 15, 2022

Need has a manual backport to 3.7.

@ned-deily
Copy link
Member

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

@ned-deily
Copy link
Member

@tiran 3.8 backport for your review #31912

@ned-deily ned-deily removed the needs backport to 3.8 only security fixes label Mar 15, 2022
@ned-deily ned-deily closed this Mar 15, 2022
@ned-deily ned-deily reopened this Mar 15, 2022
@ned-deily
Copy link
Member

(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

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

@miss-islington
Copy link
Contributor

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

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

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
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 pull request Mar 15, 2022
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 bedevere-bot removed the needs backport to 3.9 only security fixes label Mar 15, 2022
@bedevere-bot
Copy link

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
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>.
Co-authored-by: Christian Heimes <christian@python.org>
tiran added a commit that referenced this pull request Mar 15, 2022
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>
hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
)

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type-security A security issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants