diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-05-21 01:14:55 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-05-21 01:14:55 +0200 |
| commit | 66ac56509f754d1239f81c92b6f7cfb65509dc47 (patch) | |
| tree | dddaef161d6bfff9ce9134bdecc36848d3cbfc84 /netlib/tcp.py | |
| parent | 52c6ba8880363ba5d82b5e767559afbc72371272 (diff) | |
| download | mitmproxy-66ac56509f754d1239f81c92b6f7cfb65509dc47.tar.gz mitmproxy-66ac56509f754d1239f81c92b6f7cfb65509dc47.tar.bz2 mitmproxy-66ac56509f754d1239f81c92b6f7cfb65509dc47.zip | |
add support for ctx.load_verify_locations, refs mitmproxy/mitmproxy#174
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index e72d5e48..c5bb7c4b 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -343,7 +343,7 @@ class BaseHandler(_Connection): def _create_ssl_context(self, cert, key, method=SSLv23_METHOD, options=None, handle_sni=None, request_client_cert=None, cipher_list=None, - dhparams=None ): + dhparams=None, ca_file=None): """ cert: A certutils.SSLCert object. method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, or TLSv1_METHOD @@ -371,6 +371,8 @@ class BaseHandler(_Connection): ctx = SSL.Context(method) if not options is None: ctx.set_options(options) + if ca_file: + ctx.load_verify_locations(ca_file) if cipher_list: try: ctx.set_cipher_list(cipher_list) @@ -450,7 +452,7 @@ class TCPServer(object): if ex[0] == EINTR: continue else: - raise + raise if self.socket in r: connection, client_address = self.socket.accept() t = threading.Thread( |