diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-11-28 13:29:06 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-11-28 13:29:06 +0100 |
| commit | 34bf3a2496ee82e1142547b95b28a0918a911bff (patch) | |
| tree | 83c7ec7cddbb165d256f1eb771ebcc8de004d770 /mitmproxy/net | |
| parent | e64d2ce829a7d2019d6f9c085fb99aa199782014 (diff) | |
| download | mitmproxy-34bf3a2496ee82e1142547b95b28a0918a911bff.tar.gz mitmproxy-34bf3a2496ee82e1142547b95b28a0918a911bff.tar.bz2 mitmproxy-34bf3a2496ee82e1142547b95b28a0918a911bff.zip | |
fix #1783 (#1794)
Diffstat (limited to 'mitmproxy/net')
| -rw-r--r-- | mitmproxy/net/tcp.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py index 117fda6d..ac78e70d 100644 --- a/mitmproxy/net/tcp.py +++ b/mitmproxy/net/tcp.py @@ -551,7 +551,14 @@ class _Connection: context.set_verify(verify_options, verify_cert) if ca_path is None and ca_pemfile is None: ca_pemfile = certifi.where() - context.load_verify_locations(ca_pemfile, ca_path) + try: + context.load_verify_locations(ca_pemfile, ca_path) + except SSL.Error: + raise exceptions.TlsException( + "Cannot load trusted certificates ({}, {}).".format( + ca_pemfile, ca_path + ) + ) # Workaround for # https://github.com/pyca/pyopenssl/issues/190 |