pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix using PLAIN over older SSL method.

Browse source
This commit is contained in:
Lance Stout 2012-08-14 11:06:36 -07:00
parent c6ac64ed2d
commit f0e1fc5aad
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sleekxmpp/features/feature_mechanisms/mechanisms.py
View file

@ -7,6 +7,7 @@
""" """
import sys import sys
import ssl
import logging import logging
from sleekxmpp.util import sasl from sleekxmpp.util import sasl
@ -120,7 +121,12 @@ class FeatureMechanisms(BasePlugin):
result = {} result = {}
for value in values: for value in values:
if value == 'encrypted': 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: else:
result[value] = self.config.get(value, False) result[value] = self.config.get(value, False)
return result return result