diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:23:03 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-18 12:23:03 +1200 |
| commit | 4579c67150a3f845757b7d3fbeef49859d3f979b (patch) | |
| tree | 527b46970d7c8f86425f4c26eca4899627e4f823 /netlib | |
| parent | 6e301f37d0597d86008c440f62526f906f0ae9f4 (diff) | |
| parent | c9c93af453ec332b660f70402b78ae8f269280f0 (diff) | |
| download | mitmproxy-4579c67150a3f845757b7d3fbeef49859d3f979b.tar.gz mitmproxy-4579c67150a3f845757b7d3fbeef49859d3f979b.tar.bz2 mitmproxy-4579c67150a3f845757b7d3fbeef49859d3f979b.zip | |
Merge branch 'master' of https://github.com/kyle-m/netlib into kyle-m-master
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/tcp.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 52ebc3c0..65075776 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -7,6 +7,7 @@ import threading import time import traceback +import certifi import OpenSSL from OpenSSL import SSL @@ -378,7 +379,7 @@ class _Connection(object): method=SSLv23_METHOD, options=SSL_DEFAULT_OPTIONS, verify_options=SSL.VERIFY_NONE, - ca_path=None, + ca_path=certifi.where(), ca_pemfile=None, cipher_list=None, alpn_protos=None, @@ -410,8 +411,7 @@ class _Connection(object): (err_depth, errno)) context.set_verify(verify_options, verify_cert) - if ca_path is not None or ca_pemfile is not None: - context.load_verify_locations(ca_pemfile, ca_path) + context.load_verify_locations(ca_pemfile, ca_path) # Workaround for # https://github.com/pyca/pyopenssl/issues/190 |