diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-20 14:43:27 +0000 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2010-08-20 14:43:27 +0000 |
| commit | 366cfdd6fa26bbc7b39d5fb902b58bf69a35cda3 (patch) | |
| tree | 076a7a79ff80054ddea8c943c667f4be20dc1565 | |
| parent | c3a6b2c40144785fcd1a1d975b457d1d41e7cdc7 (diff) | |
| download | qxmpp-366cfdd6fa26bbc7b39d5fb902b58bf69a35cda3.tar.gz | |
move hex conversion to calculateDigestMd5
| -rw-r--r-- | src/QXmppStream.cpp | 2 | ||||
| -rw-r--r-- | src/QXmppUtils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp index dd76d2fc..0ff172d6 100644 --- a/src/QXmppStream.cpp +++ b/src/QXmppStream.cpp @@ -866,7 +866,7 @@ void QXmppStream::sendAuthDigestMD5ResponseStep1(const QString& challenge) response["nc"] = nc; response["qop"] = "auth"; response["digest-uri"] = digest_uri; - response["response"] = calculateDigestMd5(a1, nonce, nc, cnonce, digest_uri, authzid); + response["response"] = calculateDigestMd5(a1, nonce, nc, cnonce, digest_uri, authzid).toHex(); if(!authzid.isEmpty()) response["authzid"] = authzid; response["charset"] = "utf-8"; diff --git a/src/QXmppUtils.cpp b/src/QXmppUtils.cpp index d05851db..33754692 100644 --- a/src/QXmppUtils.cpp +++ b/src/QXmppUtils.cpp @@ -302,7 +302,7 @@ QByteArray calculateDigestMd5(const QByteArray &a1, QByteArray HA2 = QCryptographicHash::hash(A2, QCryptographicHash::Md5).toHex(); QByteArray KD = HA1 + ':' + nonce + ':' + nc + ':' + cnonce + ':' + "auth" + ':' + HA2; - return QCryptographicHash::hash(KD, QCryptographicHash::Md5).toHex(); + return QCryptographicHash::hash(KD, QCryptographicHash::Md5); } QMap<QByteArray, QByteArray> parseDigestMd5(const QByteArray &ba) |