From fc907c2557a82a49ec12ee55e8a023e7312bd36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Tue, 11 Aug 2020 13:51:37 +0200
Subject: [PATCH] Allow for more modern ciphers - also fixes compatibility with
newer openssl and Python 2.7.13
---
warden_client/warden_client.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/warden_client/warden_client.py b/warden_client/warden_client.py
index 04c8515..8b2c8ad 100644
--- a/warden_client/warden_client.py
+++ b/warden_client/warden_client.py
@@ -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
--
GitLab