Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-22 12:26:12 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-22 12:26:59 (GMT) |
| commit | 14fbc9a52ffad2573e1955f09b033c714b9f2ff4 (patch) | |
| tree | 32823fc14819e8fe7840b3c7164b32225279738c /Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | |
| parent | 1621d7001dbc560df9d5e497db47cf315a2c83a9 (diff) | |
| download | swift-14fbc9a52ffad2573e1955f09b033c714b9f2ff4.zip swift-14fbc9a52ffad2573e1955f09b033c714b9f2ff4.tar.bz2 | |
Added SCRAM-SHA-1 unit test for final server message.
Diffstat (limited to 'Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp')
| -rw-r--r-- | Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp index b0a9f96..16c938a 100644 --- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp +++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp @@ -14,25 +14,20 @@ namespace Swift { SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const String& nonce) : ClientAuthenticator("SCRAM-SHA-1"), step(Initial), clientnonce(nonce) { // TODO: Normalize authentication id // TODO: Normalize getPassword() } -ByteArray SCRAMSHA1ClientAuthenticator::getResponse() { +ByteArray SCRAMSHA1ClientAuthenticator::getResponse() const { if (step == Initial) { return "n,," + getInitialBareClientMessage(); } else { - ByteArray saltedPassword = PBKDF2::encode(getPassword(), salt, iterations); ByteArray clientKey = HMACSHA1::getResult(saltedPassword, "Client Key"); ByteArray storedKey = SHA1::getBinaryHash(clientKey); - ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key"); - - ByteArray authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=biwsCg==," + "r=" + clientnonce + serverNonce; ByteArray clientSignature = HMACSHA1::getResult(storedKey, authMessage); - serverSignature = HMACSHA1::getResult(serverKey, authMessage); ByteArray clientProof = clientKey; for (unsigned int i = 0; i < clientProof.getSize(); ++i) { clientProof[i] ^= clientSignature[i]; } ByteArray result = ByteArray("c=biwsCg==,r=") + clientnonce + serverNonce + ",p=" + Base64::encode(clientProof); return result; @@ -42,22 +37,29 @@ ByteArray SCRAMSHA1ClientAuthenticator::getResponse() { bool SCRAMSHA1ClientAuthenticator::setChallenge(const ByteArray& challenge) { if (step == Initial) { initialServerMessage = challenge; // TODO: Check if these values are correct std::map<char, String> keys = parseMap(String(initialServerMessage.getData(), initialServerMessage.getSize())); - salt = Base64::decode(keys['s']); + ByteArray salt = Base64::decode(keys['s']); String clientServerNonce = keys['r']; serverNonce = clientServerNonce.getSubstring(clientnonce.getUTF8Size(), clientServerNonce.npos()); - iterations = boost::lexical_cast<int>(keys['i'].getUTF8String()); + int iterations = boost::lexical_cast<int>(keys['i'].getUTF8String()); + + // Compute all the values needed for the server signature + saltedPassword = PBKDF2::encode(StringPrep::getPrepared(getPassword(), StringPrep::SASLPrep), salt, iterations); + authMessage = getInitialBareClientMessage() + "," + initialServerMessage + "," + "c=biwsCg==," + "r=" + clientnonce + serverNonce; + ByteArray serverKey = HMACSHA1::getResult(saltedPassword, "Server Key"); + serverSignature = HMACSHA1::getResult(serverKey, authMessage); step = Proof; return true; } else { - return challenge == Base64::encode(ByteArray("v=") + Base64::encode(serverSignature)); + ByteArray result = ByteArray("v=") + ByteArray(Base64::encode(serverSignature)); + return challenge == result; } } std::map<char, String> SCRAMSHA1ClientAuthenticator::parseMap(const String& s) { // TODO: Do some proper checking here std::map<char, String> result; |