[proxy] github.com — ← back | site home | direct (HTTPS) ↗ | proxy home | ◑ dark◐ light
/ cpython Public

Conversation

Copy link
Member

vstinner commented Sep 8, 2017 •
edited
Loading

(cherry picked from commit dd2000c)

https://bugs.python.org/issue29572

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
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 requested a review from tiran September 8, 2017 02:23
zware approved these changes Sep 8, 2017
View reviewed changes
Copy link
Member

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 :)

Copy link
Member Author

vstinner commented Sep 8, 2017

Similar change for macOS: PR #3447.

vstinner mentioned this pull request Sep 8, 2017
Closed
vstinner added the type-security A security issue label Sep 8, 2017
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
Copy link
Contributor

larryhastings commented Nov 25, 2017

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.

Copy link
Member Author

vstinner commented Nov 27, 2017

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

Copy link
Member Author

vstinner commented Nov 28, 2017

@larryhastings: Is it better now?

larryhastings merged commit 092db6c into python:3.4 Dec 8, 2017
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 approved these changes

zware zware approved these changes

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