aboutsummaryrefslogtreecommitdiff
path: root/src/QXmppOutgoingClient.cpp
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2010-08-29 12:14:07 +0000
committerJeremy Lainé <jeremy.laine@m4x.org>2010-08-29 12:14:07 +0000
commite427a07d55dbaff1cf4008e4cefadc3c2a16d985 (patch)
tree70a1f5fba687190fb5bf79845702663f33b90c54 /src/QXmppOutgoingClient.cpp
parent1f3472f71ae867d9fc5e5482a355f12465c23ece (diff)
downloadqxmpp-e427a07d55dbaff1cf4008e4cefadc3c2a16d985.tar.gz
move remaining SASL code out of QXmppUtils
Diffstat (limited to 'src/QXmppOutgoingClient.cpp')
-rw-r--r--src/QXmppOutgoingClient.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/QXmppOutgoingClient.cpp b/src/QXmppOutgoingClient.cpp
index b77b72ba..38e06ddb 100644
--- a/src/QXmppOutgoingClient.cpp
+++ b/src/QXmppOutgoingClient.cpp
@@ -718,8 +718,8 @@ void QXmppOutgoingClient::pingTimeout()
// challenge is BASE64 encoded string
void QXmppOutgoingClient::sendAuthDigestMD5ResponseStep1(const QString& challenge)
{
- QByteArray ba = QByteArray::fromBase64(challenge.toUtf8());
- QMap<QByteArray, QByteArray> map = parseDigestMd5(ba);
+ QByteArray ba = QByteArray::fromBase64(challenge.toAscii());
+ QMap<QByteArray, QByteArray> map = QXmppSaslDigestMd5::parseMessage(ba);
if (!map.contains("nonce"))
{
@@ -754,7 +754,7 @@ void QXmppOutgoingClient::sendAuthDigestMD5ResponseStep1(const QString& challeng
response["authzid"] = d->saslDigest.authzid();
response["charset"] = "utf-8";
- const QByteArray data = serializeDigestMd5(response);
+ const QByteArray data = QXmppSaslDigestMd5::serializeMessage(response);
QByteArray packet = "<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"
+ data.toBase64() + "</response>";
sendData(packet);
@@ -762,8 +762,8 @@ void QXmppOutgoingClient::sendAuthDigestMD5ResponseStep1(const QString& challeng
void QXmppOutgoingClient::sendAuthDigestMD5ResponseStep2(const QString &challenge)
{
- QByteArray ba = QByteArray::fromBase64(challenge.toUtf8());
- QMap<QByteArray, QByteArray> map = parseDigestMd5(ba);
+ QByteArray ba = QByteArray::fromBase64(challenge.toAscii());
+ QMap<QByteArray, QByteArray> map = QXmppSaslDigestMd5::parseMessage(ba);
if (!map.contains("rspauth"))
{