Skip to content

[3.4][Security] bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) #3445

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.

Sign up for GitHub

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
Merged
merged 2 commits into from
Dec 8, 2017
Merged

[3.4][Security] bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) #3445

merged 2 commits into from
Dec 8, 2017

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Sep 8, 2017 •
edited
Loading

(cherry picked from commit dd2000c)

https://bugs.python.org/issue29572

@vstinner vstinner changed the title bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) [3.4] bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) Sep 8, 2017
@vstinner
Copy link
Member Author

vstinner commented Sep 8, 2017

Please review carefully this cherry-pick since I had conflicts on the backport. Original change: commit dd2000c.

@vstinner vstinner requested a review from tiran September 8, 2017 02:23
zware
zware approved these changes Sep 8, 2017
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.

Approved, as long as AppVeyor also approves :)

@vstinner
Copy link
Member Author

vstinner commented Sep 8, 2017

Similar change for macOS: PR #3447.

@vstinner vstinner mentioned this pull request Sep 8, 2017
Closed
@vstinner vstinner added the type-security A security issue label Sep 8, 2017
@vstinner vstinner changed the title [3.4] bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) [3.4][Security] bpo-29572: Update Windows build to OpenSSL 1.0.2k (GH-443) Sep 8, 2017
@larryhastings
Copy link
Contributor

I don't understand how this branch is out-of-date with 3.4...? I haven't accepted any patches into the 3.4 branch in a while.

Anyway, please update the PR so that I get a nice green accept button instead of an angry red "Squash And Merge" button. I don't like pressing red buttons.

@vstinner
Copy link
Member Author

I rebased my PR on top of the current 3.4 branch.

@vstinner
Copy link
Member Author

@larryhastings: Is it better now?

@larryhastings larryhastings merged commit 092db6c into python:3.4 Dec 8, 2017
@vstinner vstinner deleted the openssl34 branch May 29, 2018 22:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiran tiran tiran approved these changes

@zware zware zware approved these changes

@larryhastings larryhastings Awaiting requested review from larryhastings

Assignees
No one assigned
Labels
type-security A security issue
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vstinner @larryhastings @tiran @zware @the-knights-who-say-ni @bedevere-bot