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/pathoc.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/pathoc.py')
| -rw-r--r-- | libpathod/pathoc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 0627f8ca..a32e13b5 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -154,7 +154,7 @@ class Pathoc(tcp.TCPClient): # SSL ssl=None, sni=None, - sslversion='SSLv23', + ssl_version=tcp.SSL_DEFAULT_METHOD, clientcert=None, ciphers=None, @@ -193,7 +193,7 @@ class Pathoc(tcp.TCPClient): self.ssl, self.sni = ssl, sni self.clientcert = clientcert - self.sslversion = utils.SSLVERSIONS[sslversion] + self.ssl_version = ssl_version self.ciphers = ciphers self.sslinfo = None @@ -280,7 +280,7 @@ class Pathoc(tcp.TCPClient): self.convert_to_ssl( sni=self.sni, cert=self.clientcert, - method=self.sslversion, + method=self.ssl_version, cipher_list=self.ciphers, alpn_protos=alpn_protos ) @@ -461,7 +461,7 @@ def main(args): # pragma: nocover (args.host, args.port), ssl=args.ssl, sni=args.sni, - sslversion=args.sslversion, + ssl_version=args.ssl_version, clientcert=args.clientcert, ciphers=args.ciphers, use_http2=args.use_http2, |