Changeset 65315 in vbox

Timestamp:

Jan 16, 2017 11:01:37 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8646: Guest Additions and Extension Pack downloaders: Replace the sum calculation algorithm from Qt one to our own, get rid of superfluous call.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

• UIDownloaderAdditions.cpp (modified) (4 diffs)
• UIDownloaderExtensionPack.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp

@@ -23 +23 @@
 # include <QDir>
 # include <QFile>
-# include <QCryptographicHash>
 
 /* Local includes: */
@@ -34 +33 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
+/* Other VBox includes: */
+#include <iprt/sha.h>
 
 
@@ -121 +123 @@
 {
     /* Try to verify the SHA-256 checksum: */
+    QString strCalculatedSumm;
     bool fSuccess = false;
     do
@@ -143 +146 @@
             if (strFileName == source().fileName())
             {
-                /* Calculate the SHA-256 hash ourselves: */
-                QCryptographicHash hashSHA256(QCryptographicHash::Sha256);
-                hashSHA256.addData(m_receivedData);
-                const QString strCalculatedSumm(hashSHA256.result().toHex());
+                /* Calc the SHA-256 on the bytes, creating a string: */
+                uint8_t abHash[RTSHA256_HASH_SIZE];
+                RTSha256(m_receivedData.constData(), m_receivedData.length(), abHash);
+                char szDigest[RTSHA256_DIGEST_LEN + 1];
+                int rc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
+                if (RT_FAILURE(rc))
+                {
+                    AssertRC(rc);
+                    szDigest[0] = '\0';
+                }
+                strCalculatedSumm = &szDigest[0];
                 //printf("Downloaded SHA-256 summ: [%s]\n", strDownloadedSumm.toUtf8().constData());
                 //printf("Calculated SHA-256 summ: [%s]\n", strCalculatedSumm.toUtf8().constData());

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

@@ -23 +23 @@
 # include <QDir>
 # include <QFile>
-# include <QCryptographicHash>
 
 /* Local includes: */
@@ -35 +34 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
+/* Other VBox includes: */
 #include <iprt/sha.h>
 
@@ -107 +107 @@
 {
     /* Try to verify the SHA-256 checksum: */
+    QString strCalculatedSumm;
     bool fSuccess = false;
     do
@@ -129 +130 @@
             if (strFileName == source().fileName())
             {
-                /* Calculate the SHA-256 hash ourselves: */
-                QCryptographicHash hashSHA256(QCryptographicHash::Sha256);
-                hashSHA256.addData(m_receivedData);
-                const QString strCalculatedSumm(hashSHA256.result().toHex());
+                /* Calc the SHA-256 on the bytes, creating a string: */
+                uint8_t abHash[RTSHA256_HASH_SIZE];
+                RTSha256(m_receivedData.constData(), m_receivedData.length(), abHash);
+                char szDigest[RTSHA256_DIGEST_LEN + 1];
+                int rc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
+                if (RT_FAILURE(rc))
+                {
+                    AssertRC(rc);
+                    szDigest[0] = '\0';
+                }
+                strCalculatedSumm = &szDigest[0];
                 //printf("Downloaded SHA-256 summ: [%s]\n", strDownloadedSumm.toUtf8().constData());
                 //printf("Calculated SHA-256 summ: [%s]\n", strCalculatedSumm.toUtf8().constData());
@@ -162 +170 @@
             file.close();
 
-            /* Calc the SHA-256 on the bytes, creating a string: */
-            uint8_t abHash[RTSHA256_HASH_SIZE];
-            RTSha256(m_receivedData.constData(), m_receivedData.length(), abHash);
-            char szDigest[RTSHA256_DIGEST_LEN + 1];
-            int rc = RTSha256ToString(abHash, szDigest, sizeof(szDigest));
-            if (RT_FAILURE(rc))
-            {
-                AssertRC(rc);
-                szDigest[0] = '\0';
-            }
-
             /* Warn the listener about extension-pack was downloaded: */
-            emit sigDownloadFinished(source().toString(), target(), &szDigest[0]);
+            emit sigDownloadFinished(source().toString(), target(), strCalculatedSumm);
             break;
         }