diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 15:14:22 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-03-02 15:14:22 +1300 |
| commit | a34a4831843d5745e200c1df58672973a57aebb0 (patch) | |
| tree | e67625c2196510be1d2c0529b52d67f79d1a162b /libmproxy | |
| parent | 43a760c935a340d11a990e75033b6ab2bfc133cf (diff) | |
| download | mitmproxy-a34a4831843d5745e200c1df58672973a57aebb0.tar.gz mitmproxy-a34a4831843d5745e200c1df58672973a57aebb0.tar.bz2 mitmproxy-a34a4831843d5745e200c1df58672973a57aebb0.zip | |
Adapt for new pathod and netlib APIs.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/console/flowview.py | 1 | ||||
| -rw-r--r-- | libmproxy/proxy.py | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libmproxy/console/flowview.py b/libmproxy/console/flowview.py index f95f2ded..3486f57e 100644 --- a/libmproxy/console/flowview.py +++ b/libmproxy/console/flowview.py @@ -346,7 +346,6 @@ class FlowView(common.WWrap): wrapped, wrapped_message = self.search_wrapped_around(last_find_line, last_search_index, backwards) if wrapped: - print(wrapped, wrapped_message) return wrapped_message def search_get_start(self, search_string): diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py index b6480822..0203ba86 100644 --- a/libmproxy/proxy.py +++ b/libmproxy/proxy.py @@ -48,7 +48,7 @@ class ProxyConfig: self.forward_proxy = forward_proxy self.transparent_proxy = transparent_proxy self.authenticator = authenticator - self.certstore = certutils.CertStore() + self.certstore = certutils.CertStore(cacert) class ClientConnection(tcp.BaseHandler, stateobject.SimpleStateObject): @@ -422,7 +422,7 @@ class ConnectionHandler: host = upstream_cert.cn.decode("utf8").encode("idna") sans = upstream_cert.altnames - ret = self.config.certstore.get_cert(host, sans, self.config.cacert) + ret = self.config.certstore.get_cert(host, sans) if not ret: raise ProxyError(502, "Unable to generate dummy cert.") return ret |