diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2019-11-15 17:24:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 17:24:59 +0100 |
| commit | 50443df3404e660984c5bbfd999dc96d0bc9b1b2 (patch) | |
| tree | 58a1636284b7a933b7c483531723f780f77e6efc /pathod | |
| parent | 3eebfed79f4d54840a054c2dc5061e155c416d3e (diff) | |
| parent | f6f9eb2c4e022cd44ccc39b3f61fdf31cbfea793 (diff) | |
| download | mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.gz mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.tar.bz2 mitmproxy-50443df3404e660984c5bbfd999dc96d0bc9b1b2.zip | |
Merge branch 'master' into master
Diffstat (limited to 'pathod')
| -rw-r--r-- | pathod/pathod.py | 4 | ||||
| -rw-r--r-- | pathod/test.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pathod/pathod.py b/pathod/pathod.py index b330a293..3fe2f901 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -21,6 +21,7 @@ CONFDIR = "~/.mitmproxy" CERTSTORE_BASENAME = "mitmproxy" CA_CERT_NAME = "mitmproxy-ca.pem" DEFAULT_CRAFT_ANCHOR = "/p/" +KEY_SIZE = 2048 logger = logging.getLogger('pathod') @@ -54,7 +55,8 @@ class SSLOptions: self.alpn_select = alpn_select self.certstore = mcerts.CertStore.from_store( os.path.expanduser(confdir), - CERTSTORE_BASENAME + CERTSTORE_BASENAME, + KEY_SIZE ) for i in certs or []: self.certstore.add_cert_file(*i) diff --git a/pathod/test.py b/pathod/test.py index e8c3c84a..b6e5e4d0 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -25,7 +25,7 @@ class Daemon: def __enter__(self): return self - def __exit__(self, type, value, traceback) -> bool: + def __exit__(self, type, value, traceback): self.logfp.truncate(0) self.shutdown() return False |