diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-23 22:19:42 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-23 22:19:42 +1200 |
| commit | 0e15b9436890a60c8657b1d5df41f3bf1c4f9eb8 (patch) | |
| tree | 1ea0095e59fbc64851c798f83847e27eaa4ff6fe /libpathod/pathod.py | |
| parent | ed8a80e65ab27ef5b0be4b181f1e83469ae839c4 (diff) | |
| parent | 5d63afdc6d351472e2d1dd5c3eb5026273d80963 (diff) | |
| download | mitmproxy-0e15b9436890a60c8657b1d5df41f3bf1c4f9eb8.tar.gz mitmproxy-0e15b9436890a60c8657b1d5df41f3bf1c4f9eb8.tar.bz2 mitmproxy-0e15b9436890a60c8657b1d5df41f3bf1c4f9eb8.zip | |
Merge pull request #29 from Kriechi/ssl-version-handling
unify SSL version/method handling
Diffstat (limited to 'libpathod/pathod.py')
| -rw-r--r-- | libpathod/pathod.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpathod/pathod.py b/libpathod/pathod.py index 76170990..fc63da18 100644 --- a/libpathod/pathod.py +++ b/libpathod/pathod.py @@ -37,7 +37,7 @@ class SSLOptions(object): sans=(), not_after_connect=None, request_client_cert=False, - sslversion=tcp.SSLv23_METHOD, + ssl_version=tcp.SSL_DEFAULT_METHOD, ciphers=None, certs=None, alpn_select=http2.HTTP2Protocol.ALPN_PROTO_H2, @@ -47,7 +47,7 @@ class SSLOptions(object): self.sans = sans self.not_after_connect = not_after_connect self.request_client_cert = request_client_cert - self.sslversion = sslversion + self.ssl_version = ssl_version self.ciphers = ciphers self.alpn_select = alpn_select self.certstore = certutils.CertStore.from_store( @@ -181,7 +181,7 @@ class PathodHandler(tcp.BaseHandler): handle_sni=self._handle_sni, request_client_cert=self.server.ssloptions.request_client_cert, cipher_list=self.server.ssloptions.ciphers, - method=self.server.ssloptions.sslversion, + method=self.server.ssloptions.ssl_version, alpn_select=self.server.ssloptions.alpn_select, ) except tcp.NetLibError as v: @@ -403,7 +403,7 @@ class PathodHandler(tcp.BaseHandler): handle_sni=self._handle_sni, request_client_cert=self.server.ssloptions.request_client_cert, cipher_list=self.server.ssloptions.ciphers, - method=self.server.ssloptions.sslversion, + method=self.server.ssloptions.ssl_version, alpn_select=self.server.ssloptions.alpn_select, ) except tcp.NetLibError as v: @@ -592,7 +592,7 @@ def main(args): # pragma: nocover confdir=args.confdir, not_after_connect=args.ssl_not_after_connect, ciphers=args.ciphers, - sslversion=utils.SSLVERSIONS[args.sslversion], + ssl_version=args.ssl_version, certs=args.ssl_certs, sans=args.sans, ) |