diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-14 19:50:35 +0200 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2015-06-14 19:50:35 +0200 |
| commit | 0d137eac6f4c00a72d3aa4d11fce7d1ea15f0f21 (patch) | |
| tree | 4fb0ceff384eeb5602be08576f74e450daf1ad25 /netlib | |
| parent | 8d71a5b4aba8248b97918b11b12275bbf5197337 (diff) | |
| download | mitmproxy-0d137eac6f4c00a72d3aa4d11fce7d1ea15f0f21.tar.gz mitmproxy-0d137eac6f4c00a72d3aa4d11fce7d1ea15f0f21.tar.bz2 mitmproxy-0d137eac6f4c00a72d3aa4d11fce7d1ea15f0f21.zip | |
simplify ALPN
Diffstat (limited to 'netlib')
| -rw-r--r-- | netlib/tcp.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 74fe70d4..897e3e65 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -535,7 +535,6 @@ class BaseHandler(_Connection): request_client_cert=None, chain_file=None, dhparams=None, - alpn_select=None, **sslctx_kwargs): """ cert: A certutils.SSLCert object. @@ -562,9 +561,7 @@ class BaseHandler(_Connection): until then we're conservative. """ - context = self._create_ssl_context( - alpn_select=alpn_select, - **sslctx_kwargs) + context = self._create_ssl_context(**sslctx_kwargs) context.use_privatekey(key) context.use_certificate(cert.x509) @@ -589,7 +586,7 @@ class BaseHandler(_Connection): return context - def convert_to_ssl(self, cert, key, alpn_select=None, **sslctx_kwargs): + def convert_to_ssl(self, cert, key, **sslctx_kwargs): """ Convert connection to SSL. For a list of parameters, see BaseHandler._create_ssl_context(...) @@ -598,7 +595,6 @@ class BaseHandler(_Connection): context = self.create_ssl_context( cert, key, - alpn_select=alpn_select, **sslctx_kwargs) self.connection = SSL.Connection(context, self.connection) self.connection.set_accept_state() |