Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-22 10:26:01 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-22 10:27:06 (GMT) |
| commit | a393a4ac64abb24b0fc2cb0e3e154706013d7803 (patch) | |
| tree | 2ae8c502b0a465ab202e9f38ae9fd7dd176c92ca /Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | |
| parent | 2df5e148de44c6c91c5a28d197b8b2b913ca80d4 (diff) | |
| download | swift-a393a4ac64abb24b0fc2cb0e3e154706013d7803.zip swift-a393a4ac64abb24b0fc2cb0e3e154706013d7803.tar.bz2 | |
Stringprep SCRAM-SHA-1 authcid.
Diffstat (limited to 'Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp')
| -rw-r--r-- | Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp index 15c8ab6..b0a9f96 100644 --- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp +++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp @@ -5,12 +5,13 @@ #include <boost/lexical_cast.hpp> #include "Swiften/StringCodecs/SHA1.h" #include "Swiften/StringCodecs/Base64.h" #include "Swiften/StringCodecs/HMACSHA1.h" #include "Swiften/StringCodecs/PBKDF2.h" +#include "Swiften/StringPrep/StringPrep.h" namespace Swift { SCRAMSHA1ClientAuthenticator::SCRAMSHA1ClientAuthenticator(const String& nonce) : ClientAuthenticator("SCRAM-SHA-1"), step(Initial), clientnonce(nonce) { // TODO: Normalize authentication id // TODO: Normalize getPassword() @@ -84,13 +85,13 @@ std::map<char, String> SCRAMSHA1ClientAuthenticator::parseMap(const String& s) { result[key] = value; } return result; } ByteArray SCRAMSHA1ClientAuthenticator::getInitialBareClientMessage() const { - String authenticationID = getAuthenticationID(); + String authenticationID = StringPrep::getPrepared(getAuthenticationID(), StringPrep::SASLPrep); String escapedAuthenticationID; for (size_t i = 0; i < authenticationID.getUTF8Size(); ++i) { if (authenticationID[i] == ',') { escapedAuthenticationID += "=2C"; } else if (authenticationID[i] == '=') { |