aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2013-12-10 03:13:37 +0100
committerMaximilian Hils <git@maximilianhils.com>2013-12-10 03:13:37 +0100
commitf0e96be142dc9c43deb174bcaffc4b83726bb9bc (patch)
tree9f936324cb657200fba849ef92dc5f4235827b34 /libmproxy
parent2be19a5620829db198491c2f84b13a77b0ab01dd (diff)
downloadmitmproxy-f0e96be142dc9c43deb174bcaffc4b83726bb9bc.tar.gz
mitmproxy-f0e96be142dc9c43deb174bcaffc4b83726bb9bc.tar.bz2
mitmproxy-f0e96be142dc9c43deb174bcaffc4b83726bb9bc.zip
ensure binary read on windows
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/proxy.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index a62803fb..7b2f9bfe 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -302,7 +302,8 @@ class ProxyHandler(tcp.BaseHandler):
def find_cert(self, cc, host, port, sni):
if self.config.certfile:
- return certutils.SSLCert.from_pem(file(self.config.certfile, "r").read())
+ with open(self.config.certfile, "rb") as f:
+ return certutils.SSLCert.from_pem(f.read())
else:
sans = []
if not self.config.no_upstream_cert: