Skip to content
Snippets Groups Projects
Commit fc907c25 authored by Pavel Kácha's avatar Pavel Kácha
Browse files

Allow for more modern ciphers - also fixes compatibility with newer openssl and Python 2.7.13

parent 15f59fbf
No related branches found
No related tags found
No related merge requests found
......@@ -42,9 +42,9 @@ class HTTPSConnection(httplib.HTTPSConnection):
Used only if ssl.SSLContext is not available (Python version < 2.7.9)
'''
def __init__(self, host, **kwargs):
self.ciphers = kwargs.pop('ciphers',None)
self.ca_certs = kwargs.pop('ca_certs',None)
self.ssl_version = kwargs.pop('ssl_version',ssl.PROTOCOL_SSLv23)
self.ciphers = kwargs.pop('ciphers', None)
self.ca_certs = kwargs.pop('ca_certs', None)
self.ssl_version = kwargs.pop('ssl_version', ssl.PROTOCOL_TLS)
httplib.HTTPSConnection.__init__(self,host,**kwargs)
......@@ -269,8 +269,8 @@ class Client(object):
self.retry = int(retry)
self.pause = int(pause)
self.ciphers = 'TLS_RSA_WITH_AES_256_CBC_SHA'
self.sslversion = ssl.PROTOCOL_TLSv1
self.ciphers = None
self.sslversion = ssl.PROTOCOL_TLS
# If Python is new enough to have SSLContext, use it for SSL settings,
# otherwise our own class derived from httplib.HTTPSConnection is used
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment