diff options
Diffstat (limited to 'libpathod/pathoc.py')
| -rw-r--r-- | libpathod/pathoc.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libpathod/pathoc.py b/libpathod/pathoc.py index 32ae8441..4e807002 100644 --- a/libpathod/pathoc.py +++ b/libpathod/pathoc.py @@ -14,15 +14,8 @@ class Response: def __repr__(self): return "Response(%s - %s)"%(self.status_code, self.msg) -SSLVERSIONS = { - 1: tcp.TLSv1_METHOD, - 2: tcp.SSLv2_METHOD, - 3: tcp.SSLv3_METHOD, - 4: tcp.SSLv23_METHOD, -} - class Pathoc(tcp.TCPClient): - def __init__(self, address, ssl=None, sni=None, sslversion=1, clientcert=None): + def __init__(self, address, ssl=None, sni=None, sslversion=1, clientcert=None, ciphers=None): tcp.TCPClient.__init__(self, address) self.settings = dict( staticdir = os.getcwd(), @@ -30,7 +23,8 @@ class Pathoc(tcp.TCPClient): ) self.ssl, self.sni = ssl, sni self.clientcert = clientcert - self.sslversion = SSLVERSIONS[sslversion] + self.sslversion = utils.SSLVERSIONS[sslversion] + self.ciphers = ciphers def http_connect(self, connect_to): self.wfile.write( @@ -56,7 +50,12 @@ class Pathoc(tcp.TCPClient): self.http_connect(connect_to) if self.ssl: try: - self.convert_to_ssl(sni=self.sni, cert=self.clientcert, method=self.sslversion) + self.convert_to_ssl( + sni=self.sni, + cert=self.clientcert, + method=self.sslversion, + cipher_list = self.ciphers + ) except tcp.NetLibError, v: raise PathocError(str(v)) |