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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #4363

Merged
merged 5 commits into from Dec 21, 2020
Merged

Cleanup #4363

merged 5 commits into from Dec 21, 2020

Conversation

mhils
Copy link
Member

@mhils mhils commented Dec 19, 2020

@Kriechi: I also want some of the cake, here are ~2000 more lines! 馃槃

As a bonus, this PR reduces test time on Windows by 50%. 馃コ

mitmproxy/test/taddons.py Outdated Show resolved Hide resolved
@@ -52,6 +49,7 @@ def test_create_logfun(self):
tls.MasterSecretLogger.create_logfun("test"),
tls.MasterSecretLogger)
assert not tls.MasterSecretLogger.create_logfun(False)
"""
Copy link
Member

Choose a reason for hiding this comment

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

just temporary - or whats the plan?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. I have thoroughly cleaned up the TLS implementation (draft PR in a second), but that currently depends on a cryptography release followed by a pyOpenSSL PR (pyca/pyopenssl#985) followed by a pyOpenSSL release.

@mhils mhils merged commit b0a258f into mitmproxy:master Dec 21, 2020
@mhils mhils deleted the cleanup branch December 21, 2020 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants