Skip to content
This repository was archived by the owner on Jun 1, 2018. It is now read-only.

HTTP/2: preparations for pathod #67

Merged
merged 7 commits into from
Jun 14, 2015
Merged

Conversation

Kriechi
Copy link
Member

@Kriechi Kriechi commented Jun 12, 2015

This PR adds new methods for the upcoming Pathoc & Pathod integration.

@Kriechi Kriechi force-pushed the http2-wip branch 2 times, most recently from d22b0db to 5af65a3 Compare June 12, 2015 14:11
@@ -369,14 +372,14 @@ def finish(self):
"""

def _create_ssl_context(self,
method=SSLv23_METHOD,
method=TLSv1_2_METHOD,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That shouldn't be required?
SSLv23_METHOD + OP_NO_SSLv2 | OP_NO_SSLv3 == TLS 1.0+, which is what we want to keep for now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also causes an issue with OpenSSL compatibility. TLS 1.2 was introduced in OpenSSL 1.0.1 (iirc). The default version on OSX 10.10.3 is is 0.9.8, so this will fail. I suggest we check what's supported on import and pick the best default to use.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted this change.

@mhils
Copy link
Member

mhils commented Jun 12, 2015

Good stuff 👍 . Apart from the comment above, LGTM.

cortesi added a commit that referenced this pull request Jun 14, 2015
HTTP/2: preparations for pathod
@cortesi cortesi merged commit 4fbe406 into mitmproxy:master Jun 14, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants