diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-01-06 01:18:47 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-01-06 01:18:47 +1300 |
| commit | 060e3198bca48f327984b2d1d73a5d4592866736 (patch) | |
| tree | 976a10c456bab03fd538ba23098972a6127e487b /libmproxy/proxy.py | |
| parent | 891c441a6dc26b725999ca67bb16f649b92176b4 (diff) | |
| download | mitmproxy-060e3198bca48f327984b2d1d73a5d4592866736.tar.gz mitmproxy-060e3198bca48f327984b2d1d73a5d4592866736.tar.bz2 mitmproxy-060e3198bca48f327984b2d1d73a5d4592866736.zip | |
Remove cert_wait_time flag.
We now cater for this by generating certs with a commencement date an hour in
the past in netlib.
Diffstat (limited to 'libmproxy/proxy.py')
| -rw-r--r-- | libmproxy/proxy.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index 98bcb23d..370eca9a 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -38,12 +38,11 @@ class Log(controller.Msg): class ProxyConfig: - def __init__(self, certfile = None, cacert = None, clientcerts = None, cert_wait_time=0, no_upstream_cert=False, body_size_limit = None, reverse_proxy=None, transparent_proxy=None, certdir = None, authenticator=None): + def __init__(self, certfile = None, cacert = None, clientcerts = None, no_upstream_cert=False, body_size_limit = None, reverse_proxy=None, transparent_proxy=None, certdir = None, authenticator=None): assert not (reverse_proxy and transparent_proxy) self.certfile = certfile self.cacert = cacert self.clientcerts = clientcerts - self.cert_wait_time = cert_wait_time self.no_upstream_cert = no_upstream_cert self.body_size_limit = body_size_limit self.reverse_proxy = reverse_proxy @@ -247,9 +246,6 @@ class ProxyHandler(tcp.BaseHandler): sans = cert.altnames host = cert.cn.decode("utf8").encode("idna") ret = self.config.certstore.get_cert(host, sans, self.config.cacert) - # FIXME: Is this still necessary? Can we now set a proper - # commencement date, since we're using PyOpenSSL? - time.sleep(self.config.cert_wait_time) if not ret: raise ProxyError(502, "mitmproxy: Unable to generate dummy cert.") return ret @@ -555,7 +551,6 @@ def process_proxy_options(parser, options): certfile = options.cert, cacert = cacert, clientcerts = options.clientcerts, - cert_wait_time = options.cert_wait_time, body_size_limit = body_size_limit, no_upstream_cert = options.no_upstream_cert, reverse_proxy = rp, |