1 files changed, 11 insertions, 17 deletions
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
index 7842b4f..44fef76 100644
--- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
+++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp
@@ -11,9 +11,8 @@
 #include <boost/lexical_cast.hpp>
 
-#include <Swiften/StringCodecs/SHA1.h>
+#include <Swiften/Crypto/CryptoProvider.h>
 #include <Swiften/StringCodecs/Base64.h>
-#include <Swiften/StringCodecs/HMAC_SHA1.h>
 #include <Swiften/StringCodecs/PBKDF2.h>
-#include <Swiften/IDN/StringPrep.h>
+#include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/Base/Concat.h>
 
@@ -37,5 +36,5 @@ static std::string escape(const std::string& s) {
 
 
-SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const std::string& nonce, bool useChannelBinding) : ClientAuthenticator(useChannelBinding ? "SCRAM-SHA-1-PLUS" : "SCRAM-SHA-1"), step(Initial), clientnonce(nonce), useChannelBinding(useChannelBinding) {
+SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const std::string& nonce, bool useChannelBinding, IDNConverter* idnConverter, CryptoProvider* crypto) : ClientAuthenticator(useChannelBinding ? "SCRAM-SHA-1-PLUS" : "SCRAM-SHA-1"), step(Initial), clientnonce(nonce), useChannelBinding(useChannelBinding), idnConverter(idnConverter), crypto(crypto) {
 }
 
@@ -45,7 +44,7 @@ boost::optional<SafeByteArray> SCRAMSHA1ClientAuthenticator::getResponse() const
 	}
 	else if (step == Proof) {
-		ByteArray clientKey = HMAC_SHA1()(saltedPassword, createByteArray("Client Key"));
-		ByteArray storedKey = SHA1::getHash(clientKey);
-		ByteArray clientSignature = HMAC_SHA1()(createSafeByteArray(storedKey), authMessage);
+		ByteArray clientKey = crypto->getHMACSHA1(saltedPassword, createByteArray("Client Key"));
+		ByteArray storedKey = crypto->getSHA1Hash(clientKey);
+		ByteArray clientSignature = crypto->getHMACSHA1(createSafeByteArray(storedKey), authMessage);
 		ByteArray clientProof = clientKey;
 		for (unsigned int i = 0; i < clientProof.size(); ++i) {
@@ -95,18 +94,13 @@ bool SCRAMSHA1ClientAuthenticator::setChallenge(const boost::optional<ByteArray>
 		}
 
-		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);
+			saltedPassword = PBKDF2::encode(idnConverter->getStringPrepared(getPassword(), IDNConverter::SASLPrep), salt, iterations, crypto);
 		}
 		catch (const std::exception&) {
 		}
 		authMessage = concat(getInitialBareClientMessage(), createByteArray(","), initialServerMessage, createByteArray(","), getFinalMessageWithoutProof());
-		ByteArray serverKey = HMAC_SHA1()(saltedPassword, createByteArray("Server Key"));
-		serverSignature = HMAC_SHA1()(serverKey, authMessage);
+		ByteArray serverKey = crypto->getHMACSHA1(saltedPassword, createByteArray("Server Key"));
+		serverSignature = crypto->getHMACSHA1(serverKey, authMessage);
 
 		step = Proof;
@@ -137,5 +131,5 @@ std::map<char, std::string> SCRAMSHA1ClientAuthenticator::parseMap(const std::st
 			}
 			else if (s[i] == ',') {
-				result[static_cast<size_t>(key)] = value;
+				result[key] = value;
 				value = "";
 				expectKey = true;
@@ -154,5 +148,5 @@ ByteArray SCRAMSHA1ClientAuthenticator::getInitialBareClientMessage() const {
 	std::string authenticationID;
 	try {
-		authenticationID = StringPrep::getPrepared(getAuthenticationID(), StringPrep::SASLPrep);
+		authenticationID = idnConverter->getStringPrepared(getAuthenticationID(), IDNConverter::SASLPrep);
 	}
 	catch (const std::exception&) {