summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
index 7842b4f..98460b1 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
@@ -85,29 +85,24 @@ bool SCRAMSHA1ClientAuthenticator::setChallenge(const boost::optional<ByteArray>
// Extract the number of iterations
int iterations = 0;
try {
iterations = boost::lexical_cast<int>(keys['i']);
}
catch (const boost::bad_lexical_cast&) {
return false;
}
if (iterations <= 0) {
return false;
}
- ByteArray channelBindData;
- if (useChannelBinding && tlsChannelBindingData) {
- channelBindData = *tlsChannelBindingData;
- }
-
// Compute all the values needed for the server signature
try {
saltedPassword = PBKDF2::encode<HMAC_SHA1>(StringPrep::getPrepared(getPassword(), StringPrep::SASLPrep), salt, iterations);
}
catch (const std::exception&) {
}
authMessage = concat(getInitialBareClientMessage(), createByteArray(","), initialServerMessage, createByteArray(","), getFinalMessageWithoutProof());
ByteArray serverKey = HMAC_SHA1()(saltedPassword, createByteArray("Server Key"));
serverSignature = HMAC_SHA1()(serverKey, authMessage);
step = Proof;
return true;