summaryrefslogtreecommitdiff
path: root/sleekxmpp/util/sasl/mechanisms.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-11-27 19:57:48 -0500
committerLance Stout <lancestout@gmail.com>2012-11-27 19:57:48 -0500
commite25a49f80444ff36ba1ee91059b4c3d74644d6ff (patch)
tree46f2acdaef728c25bbe65eb220a35d11fdffa531 /sleekxmpp/util/sasl/mechanisms.py
parent2d066c34fd58882901fea0d82c34ad37e312cd27 (diff)
parentb820351f6468e6718dc75b69a0088b2433a658af (diff)
downloadslixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.gz
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.bz2
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.xz
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/util/sasl/mechanisms.py')
-rw-r--r--sleekxmpp/util/sasl/mechanisms.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/sleekxmpp/util/sasl/mechanisms.py b/sleekxmpp/util/sasl/mechanisms.py
index 55ae44dd..80cb7219 100644
--- a/sleekxmpp/util/sasl/mechanisms.py
+++ b/sleekxmpp/util/sasl/mechanisms.py
@@ -467,7 +467,8 @@ class DIGEST(Mech):
'qop': self.qop,
'digest-uri': quote(self.digest_uri()),
'response': self.response(b'AUTHENTICATE'),
- 'maxbuf': self.maxbuf
+ 'maxbuf': self.maxbuf,
+ 'charset': 'utf-8'
}
resp = b''
for key, value in data.items():
@@ -480,7 +481,7 @@ class DIGEST(Mech):
if self.cnonce and self.nonce and self.nonce_count and self.qop:
self.nonce_count += 1
return self.respond()
- return b''
+ return None
data = self.parse(challenge)
if 'rspauth' in data: