diff options
| -rw-r--r-- | netlib/tcp.py | 6 | ||||
| -rw-r--r-- | setup.py | 4 |
2 files changed, 3 insertions, 7 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) @@ -74,7 +74,7 @@ setup( "hyperframe>=4.0.1, <5", "jsbeautifier>=1.6.3, <1.7", "lxml>=3.5.0, <=3.6.0", # no wheels for 3.6.1 yet. - "Pillow>=3.2, <3.4", + "Pillow>=3.2, <3.5", "passlib>=1.6.5, <1.7", "pyasn1>=0.1.9, <0.2", "pyOpenSSL>=16.0, <17.0", @@ -120,7 +120,7 @@ setup( ], 'examples': [ "beautifulsoup4>=4.4.1, <4.6", - "pytz>=2015.07.0, <=2016.6.1", + "pytz>=2015.07.0, <=2016.7", ] } ) |