From e427a07d55dbaff1cf4008e4cefadc3c2a16d985 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Sun, 29 Aug 2010 12:14:07 +0000
Subject: move remaining SASL code out of QXmppUtils

---
 src/QXmppOutgoingClient.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/QXmppOutgoingClient.cpp')

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"))
     {
-- 
cgit v1.2.3