diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-10-03 13:26:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-03 13:26:26 -0700 |
| commit | 73c95efacceea96525df3c37bd81365034546a7e (patch) | |
| tree | a766a7032bafdf1ef94e727d5aa5228eeb2b1370 /netlib/tcp.py | |
| parent | 611dad12a7a94fd90619a2db44cd42aab922b4e2 (diff) | |
| parent | fbf8567a79a84ee0379e11dbecf215768dcaa706 (diff) | |
| download | mitmproxy-73c95efacceea96525df3c37bd81365034546a7e.tar.gz mitmproxy-73c95efacceea96525df3c37bd81365034546a7e.tar.bz2 mitmproxy-73c95efacceea96525df3c37bd81365034546a7e.zip | |
Merge pull request #1590 from rofreg/chain_file_conflict
Fix SSL error on OS X
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index b1a6db5a..64b9ce3b 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -817,7 +817,7 @@ class BaseHandler(_Connection): until then we're conservative. """ - context = self._create_ssl_context(**sslctx_kwargs) + context = self._create_ssl_context(ca_pemfile=chain_file, **sslctx_kwargs) context.use_privatekey(key) if isinstance(cert, certutils.SSLCert): @@ -840,10 +840,6 @@ class BaseHandler(_Connection): return True context.set_verify(SSL.VERIFY_PEER, save_cert) - # Cert Verify - if chain_file: - context.load_verify_locations(chain_file) - if dhparams: SSL._lib.SSL_CTX_set_tmp_dh(context._context, dhparams) |