Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-03-12 16:22:03 (GMT) |
| commit | 410d721ec495e29e15d45cbd921a9bb59133973d (patch) | |
| tree | 9d1dfd3f5d85ecdf41ba1296b518b65c269edc2a /Swiften/SASL | |
| parent | b5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff) | |
| download | swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.zip swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2 | |
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/SASL')
| -rw-r--r-- | Swiften/SASL/DIGESTMD5Properties.cpp | 2 | ||||
| -rw-r--r-- | Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/SASL/DIGESTMD5Properties.cpp b/Swiften/SASL/DIGESTMD5Properties.cpp index c7a2474..dfff9c8 100644 --- a/Swiften/SASL/DIGESTMD5Properties.cpp +++ b/Swiften/SASL/DIGESTMD5Properties.cpp @@ -25,7 +25,7 @@ namespace { } ByteArray stripQuotes(const ByteArray& v) { - const char* data = v.getData(); + const char* data = reinterpret_cast<const char*>(v.getData()); size_t size = v.getSize(); if (v[0] == '"') { data++; diff --git a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp index 72d535a..2dd7bf4 100644 --- a/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp +++ b/Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp @@ -65,7 +65,7 @@ bool SCRAMSHA1ClientAuthenticator::setChallenge(const boost::optional<ByteArray> } initialServerMessage = *challenge; - std::map<char, std::string> keys = parseMap(std::string(initialServerMessage.getData(), initialServerMessage.getSize())); + std::map<char, std::string> keys = parseMap(initialServerMessage.toString()); // Extract the salt ByteArray salt = Base64::decode(keys['s']); |