Skip to content
This repository was archived by the owner on Feb 19, 2020. It is now read-only.

Commit 6e27f28

Browse files
authored
Merge pull request #407 from SnijderC/develop
Use `ssl.get_protocol_name()` to find out which TLS version is in use
2 parents 44db794 + 6ebcf6b commit 6e27f28

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

sleekxmpp/xmlstream/xmlstream.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def _connect(self, reattempt=True):
464464
if self.reconnect_delay is None:
465465
delay = 1.0
466466
self.reconnect_delay = delay
467-
467+
468468
if reattempt:
469469
delay = min(self.reconnect_delay * 2, self.reconnect_max_delay)
470470
delay = random.normalvariate(delay, delay * 0.1)
@@ -839,8 +839,10 @@ def start_tls(self):
839839
to be restarted.
840840
"""
841841
log.info("Negotiating TLS")
842-
ssl_versions = {3: 'TLS 1.0', 1: 'SSL 3', 2: 'SSL 2/3'}
843-
log.info("Using SSL version: %s", ssl_versions[self.ssl_version])
842+
log.info(
843+
"Using SSL version: %s",
844+
ssl.get_protocol_name(self.ssl_version).replace('PROTOCOL_', '', 1)
845+
)
844846
if self.ca_certs is None:
845847
cert_policy = ssl.CERT_NONE
846848
else:

0 commit comments

Comments
 (0)