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/QXmppIncomingClient.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/QXmppIncomingClient.cpp')

diff --git a/src/QXmppIncomingClient.cpp b/src/QXmppIncomingClient.cpp
index eb23d7bc..b3556b62 100644
--- a/src/QXmppIncomingClient.cpp
+++ b/src/QXmppIncomingClient.cpp
@@ -223,7 +223,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 challenge["charset"] = "utf-8";
                 challenge["algorithm"] = "md5-sess";
 
-                const QByteArray data = serializeDigestMd5(challenge).toBase64();
+                const QByteArray data = QXmppSaslDigestMd5::serializeMessage(challenge).toBase64();
                 sendData("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" + data +"</challenge>");
             }
             else
@@ -237,7 +237,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
         else if (nodeRecv.tagName() == "response")
         {
             const QByteArray raw = QByteArray::fromBase64(nodeRecv.text().toAscii());
-            QMap<QByteArray, QByteArray> response = parseDigestMd5(raw);
+            QMap<QByteArray, QByteArray> response = QXmppSaslDigestMd5::parseMessage(raw);
 
             if (d->saslStep == 1)
             {
@@ -269,7 +269,7 @@ void QXmppIncomingClient::handleStanza(const QDomElement &nodeRecv)
                 QMap<QByteArray, QByteArray> challenge;
                 challenge["rspauth"] = d->saslDigest.calculateDigest(
                     QByteArray(":") + d->saslDigest.digestUri());
-                const QByteArray data = serializeDigestMd5(challenge).toBase64();
+                const QByteArray data = QXmppSaslDigestMd5::serializeMessage(challenge).toBase64();
                 sendData("<challenge xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>" + data +"</challenge>");
             }
             else if (d->saslStep == 2)
-- 
cgit v1.2.3