summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-04-28 21:26:03 +0100
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2017-04-28 21:26:03 +0100
commite4107d8b4d57476721d4d383208fa785f6306a1f (patch)
tree9e309864fef4624adf3deff52a123e1acdb4f21d
parentda5cb72d3a550a293986413b70ecf2a89558de77 (diff)
downloadslixmpp-e4107d8b4d57476721d4d383208fa785f6306a1f.tar.gz
slixmpp-e4107d8b4d57476721d4d383208fa785f6306a1f.tar.bz2
slixmpp-e4107d8b4d57476721d4d383208fa785f6306a1f.tar.xz
slixmpp-e4107d8b4d57476721d4d383208fa785f6306a1f.zip
sasl: Merge two bytes instead of concatenating them at runtime.
-rw-r--r--slixmpp/util/sasl/mechanisms.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/slixmpp/util/sasl/mechanisms.py b/slixmpp/util/sasl/mechanisms.py
index b74d09c9..36b2795c 100644
--- a/slixmpp/util/sasl/mechanisms.py
+++ b/slixmpp/util/sasl/mechanisms.py
@@ -291,8 +291,7 @@ class SCRAM(Mech):
cbind_input = self.gs2_header + cbind_data
channel_binding = b'c=' + b64encode(cbind_input).replace(b'\n', b'')
- client_final_message_without_proof = channel_binding + b',' + \
- b'r=' + nonce
+ client_final_message_without_proof = channel_binding + b',r=' + nonce
salted_password = self.Hi(self.credentials['password'],
salt,