diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | sleekxmpp/util/sasl/mechanisms.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/version.py | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github ``develop`` branch. **Latest Release** - - `1.1.11 <http://github.com/fritzy/SleekXMPP/zipball/1.1.11>`_ + - `1.2.5 <http://github.com/fritzy/SleekXMPP/zipball/1.2.5>`_ **Develop Releases** - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_ diff --git a/sleekxmpp/util/sasl/mechanisms.py b/sleekxmpp/util/sasl/mechanisms.py index 523eabc2..36fcb928 100644 --- a/sleekxmpp/util/sasl/mechanisms.py +++ b/sleekxmpp/util/sasl/mechanisms.py @@ -287,7 +287,9 @@ class SCRAM(Mech): if nonce[:len(self.cnonce)] != self.cnonce: raise SASLCancelled('Invalid nonce') - cbind_data = self.credentials['channel_binding'] + cbind_data = b'' + if self.use_channel_binding: + cbind_data = self.credentials['channel_binding'] cbind_input = self.gs2_header + cbind_data channel_binding = b'c=' + b64encode(cbind_input).replace(b'\n', b'') diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index 21efebbc..cbb6d9e5 100644 --- a/sleekxmpp/version.py +++ b/sleekxmpp/version.py @@ -9,5 +9,5 @@ # We don't want to have to import the entire library # just to get the version info for setup.py -__version__ = '1.2.4' -__version_info__ = (1, 2, 4, '', 0) +__version__ = '1.2.5' +__version_info__ = (1, 2, 5, '', 0) |