diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-08-25 10:46:11 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-08-25 10:46:11 +1200 |
| commit | c4e6d7aea6ac6f2040f8bd282a42d32264691db8 (patch) | |
| tree | f7d0995e19d05f08a1b6512fc6b374f86191018a /libpathod | |
| parent | d2855089941b9f55a0625458130c69a6124655ab (diff) | |
| parent | 42aede6181c643bb5bbd35ca81b6c1b1c69ec4b5 (diff) | |
| download | mitmproxy-c4e6d7aea6ac6f2040f8bd282a42d32264691db8.tar.gz mitmproxy-c4e6d7aea6ac6f2040f8bd282a42d32264691db8.tar.bz2 mitmproxy-c4e6d7aea6ac6f2040f8bd282a42d32264691db8.zip | |
Merge branch 'master' of ssh.github.com:mitmproxy/pathod
Diffstat (limited to 'libpathod')
| -rw-r--r-- | libpathod/pathod.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 621ef867..5fc1fd55 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -12,7 +12,7 @@ class SSLOptions: def __init__(self, certfile=None, keyfile=None, not_after_connect=None, request_client_cert=False): self.keyfile = keyfile or utils.data.path("resources/server.key") self.certfile = certfile or utils.data.path("resources/server.crt") - self.cert = certutils.SSLCert.from_pem(file(self.certfile, "r").read()) + self.cert = certutils.SSLCert.from_pem(file(self.certfile, "rb").read()) self.not_after_connect = not_after_connect self.request_client_cert = request_client_cert |