summaryrefslogtreecommitdiff
path: root/sleekxmpp/features
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-14 11:06:36 -0700
committerLance Stout <lancestout@gmail.com>2012-08-14 11:06:36 -0700
commitf0e1fc5aadcde96a8c8e776c77dd80e91368d216 (patch)
treef6aca220d46558da799768a9f0d0f8cd35b41561 /sleekxmpp/features
parentc6ac64ed2dc4b7a3562d15d030ce3b7f76f941dc (diff)
downloadslixmpp-f0e1fc5aadcde96a8c8e776c77dd80e91368d216.tar.gz
slixmpp-f0e1fc5aadcde96a8c8e776c77dd80e91368d216.tar.bz2
slixmpp-f0e1fc5aadcde96a8c8e776c77dd80e91368d216.tar.xz
slixmpp-f0e1fc5aadcde96a8c8e776c77dd80e91368d216.zip
Fix using PLAIN over older SSL method.
Diffstat (limited to 'sleekxmpp/features')
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py8
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