diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-06-29 21:53:42 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-06-29 21:53:42 +0200 |
| commit | 9131b96b6338e96894969124afa3e197c7232e9b (patch) | |
| tree | ae58e07082abf6e5d4d8f18eb49408e1cde6e2d1 /netlib/tcp.py | |
| parent | 8ca103cba5aa0e64ca81477dee6a74a183548336 (diff) | |
| parent | 0a2b25187faea1fa29a3b21935cd55294b173bf8 (diff) | |
| download | mitmproxy-9131b96b6338e96894969124afa3e197c7232e9b.tar.gz mitmproxy-9131b96b6338e96894969124afa3e197c7232e9b.tar.bz2 mitmproxy-9131b96b6338e96894969124afa3e197c7232e9b.zip | |
Merge pull request #80 from kyle-m/master
Fixing how certifi is made the default ca_path to simplify calling logic
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 74a275c9..38b77c9e 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -390,7 +390,7 @@ class _Connection(object): method=SSL_DEFAULT_METHOD, options=SSL_DEFAULT_OPTIONS, verify_options=SSL.VERIFY_NONE, - ca_path=certifi.where(), + ca_path=None, ca_pemfile=None, cipher_list=None, alpn_protos=None, @@ -421,6 +421,8 @@ class _Connection(object): return is_cert_verified context.set_verify(verify_options, verify_cert) + if ca_path is None and ca_pemfile is None: + ca_path = certifi.where() context.load_verify_locations(ca_pemfile, ca_path) # Workaround for |