From 6ebcf6b60d879e31e41bac58ba7db6ea760579b9 Mon Sep 17 00:00:00 2001 From: Chris Snijder Date: Mon, 2 May 2016 11:43:49 +0200 Subject: [PATCH] Use ssl.get_protocol_name() to find out which TLS version is in use (allows the latest TLS versions to be used as well as any future versions). --- sleekxmpp/xmlstream/xmlstream.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 62d461002..565625cf8 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -464,7 +464,7 @@ def _connect(self, reattempt=True): if self.reconnect_delay is None: delay = 1.0 self.reconnect_delay = delay - + if reattempt: delay = min(self.reconnect_delay * 2, self.reconnect_max_delay) delay = random.normalvariate(delay, delay * 0.1) @@ -839,8 +839,10 @@ def start_tls(self): to be restarted. """ log.info("Negotiating TLS") - ssl_versions = {3: 'TLS 1.0', 1: 'SSL 3', 2: 'SSL 2/3'} - log.info("Using SSL version: %s", ssl_versions[self.ssl_version]) + log.info( + "Using SSL version: %s", + ssl.get_protocol_name(self.ssl_version).replace('PROTOCOL_', '', 1) + ) if self.ca_certs is None: cert_policy = ssl.CERT_NONE else: