Skip to content

Conversation

@vstinner
Copy link
Member

@vstinner vstinner commented Sep 8, 2017

(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
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 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

Labels

type-security A security issue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants