From ef03396072e3959e7d03f55d91c2ffa1faa51d8d Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Tue, 20 Dec 2011 19:46:28 +0100
Subject: [PATCH] QCryptographicHash: allow to hash the content of a QIODevice

This adds a new function (and tests) to give the possibility of doing a
QCryptographicHash of a QIODevice, like a QFile or whatever people
needs.

It is a quite handy overload in many cases.

Change-Id: I22fd272f05571844641b3daefcc6746be4e5c7c3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/tools/qcryptographichash.cpp      |  23 +++++++++++++
 src/corelib/tools/qcryptographichash.h        |   2 ++
 .../data/2c1517dad3678f03917f15849b052fd5.md5 | Bin 0 -> 8375 bytes
 .../data/d41d8cd98f00b204e9800998ecf8427e.md5 |   0
 .../qcryptographichash/qcryptographichash.pro |  12 +++++++
 .../tst_qcryptographichash.cpp                |  32 ++++++++++++++++++
 6 files changed, 69 insertions(+)
 create mode 100644 tests/auto/corelib/tools/qcryptographichash/data/2c1517dad3678f03917f15849b052fd5.md5
 create mode 100644 tests/auto/corelib/tools/qcryptographichash/data/d41d8cd98f00b204e9800998ecf8427e.md5

diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp
index 89b3bab7c6e..e5ac73c3f57 100644
--- a/src/corelib/tools/qcryptographichash.cpp
+++ b/src/corelib/tools/qcryptographichash.cpp
@@ -50,6 +50,7 @@
 #include "../../3rdparty/md4/md4.h"
 #include "../../3rdparty/md4/md4.cpp"
 #include "../../3rdparty/sha1/sha1.cpp"
+#include <qiodevice.h>
 
 
 QT_BEGIN_NAMESPACE
@@ -154,6 +155,28 @@ void QCryptographicHash::addData(const QByteArray &data)
     addData(data.constData(), data.length());
 }
 
+/*!
+  Reads the data from the open QIODevice \a device until it ends
+  and hashes it. Returns true if reading was successful.
+ */
+bool QCryptographicHash::addData(QIODevice* device)
+{
+    if (!device->isReadable())
+        return false;
+
+    if (!device->isOpen())
+        return false;
+
+    char buffer[1024];
+    int length;
+
+    while ((length = device->read(buffer,sizeof(buffer))) > 0)
+        addData(buffer,length);
+
+    return device->atEnd();
+}
+
+
 /*!
   Returns the final hash value.
 
diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h
index b40e8cc25ba..15ebd224185 100644
--- a/src/corelib/tools/qcryptographichash.h
+++ b/src/corelib/tools/qcryptographichash.h
@@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Core)
 
 class QCryptographicHashPrivate;
+class QIODevice;
 
 class Q_CORE_EXPORT QCryptographicHash
 {
@@ -68,6 +69,7 @@ public:
 
     void addData(const char *data, int length);
     void addData(const QByteArray &data);
+    bool addData(QIODevice* device);
 
     QByteArray result() const;
 
diff --git a/tests/auto/corelib/tools/qcryptographichash/data/2c1517dad3678f03917f15849b052fd5.md5 b/tests/auto/corelib/tools/qcryptographichash/data/2c1517dad3678f03917f15849b052fd5.md5
new file mode 100644
index 0000000000000000000000000000000000000000..dd5c63cce173668c3187374bfb4c3257036a2654
GIT binary patch
literal 8375
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
N>FJR=aTjLNwPEqle?9;J

literal 0
HcmV?d00001

diff --git a/tests/auto/corelib/tools/qcryptographichash/data/d41d8cd98f00b204e9800998ecf8427e.md5 b/tests/auto/corelib/tools/qcryptographichash/data/d41d8cd98f00b204e9800998ecf8427e.md5
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
index 39987bac35a..fddd67fbd68 100644
--- a/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
+++ b/tests/auto/corelib/tools/qcryptographichash/qcryptographichash.pro
@@ -2,3 +2,15 @@ CONFIG += testcase parallel_test
 TARGET = tst_qcryptographichash
 QT = core testlib
 SOURCES = tst_qcryptographichash.cpp
+
+
+wince* {
+   addFiles.files = data/*
+   addFiles.path = data/
+   DEPLOYMENT += addFiles
+
+   DEFINES += SRCDIR=\\\".\\\"
+}
+else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
\ No newline at end of file
diff --git a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
index b8592e18502..8ca13ff244d 100644
--- a/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
+++ b/tests/auto/corelib/tools/qcryptographichash/tst_qcryptographichash.cpp
@@ -51,6 +51,8 @@ private slots:
     void intermediary_result_data();
     void intermediary_result();
     void sha1();
+    void files_data();
+    void files();
 };
 #include <QtCore>
 
@@ -150,5 +152,35 @@ void tst_QCryptographicHash::sha1()
 }
 
 
+Q_DECLARE_METATYPE(QCryptographicHash::Algorithm);
+
+void tst_QCryptographicHash::files_data() {
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<QCryptographicHash::Algorithm>("algorithm");
+    QTest::addColumn<QByteArray>("md5sum");
+    QTest::newRow("Line") << QString::fromAscii("data/2c1517dad3678f03917f15849b052fd5.md5") << QCryptographicHash::Md5 << QByteArray("2c1517dad3678f03917f15849b052fd5");
+    QTest::newRow("Line") << QString::fromAscii("data/d41d8cd98f00b204e9800998ecf8427e.md5") << QCryptographicHash::Md5 << QByteArray("d41d8cd98f00b204e9800998ecf8427e");
+}
+
+
+void tst_QCryptographicHash::files()
+{
+    QFETCH(QString, filename);
+    QFETCH(QCryptographicHash::Algorithm, algorithm);
+    QFETCH(QByteArray, md5sum);
+    {
+        QFile f(QString::fromLocal8Bit(SRCDIR) + filename);
+        QCryptographicHash hash(algorithm);
+        QVERIFY(! hash.addData(&f)); // file is not open for reading;
+        if (f.open(QIODevice::ReadOnly)) {
+            QVERIFY(hash.addData(&f));
+            QCOMPARE(hash.result().toHex(),md5sum);
+        } else {
+            QFAIL("Failed to open file for testing. should not happen");
+        }
+    }
+}
+
+
 QTEST_MAIN(tst_QCryptographicHash)
 #include "tst_qcryptographichash.moc"