Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing how certifi is made the default ca_path to simplify calling logic.

This commit is contained in:
Kyle Morton 2015-06-26 14:57:00 -07:00
parent 8ca103cba5
commit 0a2b25187f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netlib/tcp.py
View File

@ -390,7 +390,7 @@ class _Connection(object):
method=SSL_DEFAULT_METHOD, method=SSL_DEFAULT_METHOD,
options=SSL_DEFAULT_OPTIONS, options=SSL_DEFAULT_OPTIONS,
verify_options=SSL.VERIFY_NONE, verify_options=SSL.VERIFY_NONE,
ca_path=certifi.where(), ca_path=None,
ca_pemfile=None, ca_pemfile=None,
cipher_list=None, cipher_list=None,
alpn_protos=None, alpn_protos=None,
@ -421,6 +421,8 @@ class _Connection(object):
return is_cert_verified return is_cert_verified
context.set_verify(verify_options, verify_cert) 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) context.load_verify_locations(ca_pemfile, ca_path)
# Workaround for # Workaround for