diff options
Diffstat (limited to 'sleekxmpp/features/feature_mechanisms/mechanisms.py')
| -rw-r--r-- | sleekxmpp/features/feature_mechanisms/mechanisms.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py index dae2f59f..c5b4c754 100644 --- a/sleekxmpp/features/feature_mechanisms/mechanisms.py +++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py @@ -7,6 +7,7 @@ """ import sys +import ssl import logging from sleekxmpp.util import sasl @@ -120,7 +121,12 @@ class FeatureMechanisms(BasePlugin): result = {} for value in values: if value == 'encrypted': - result[value] = 'starttls' in self.xmpp.features + if 'starttls' in self.xmpp.features: + result[value] = True + elif isinstance(self.xmpp.socket, ssl.SSLSocket): + result[value] = True + else: + result[value] = False else: result[value] = self.config.get(value, False) return result |