Changeset 40329 in vbox for trunk/src/VBox/Runtime/common/checksum

Timestamp:

Mar 2, 2012 4:13:50 PM (13 years ago)

Author:

vboxsync

Message:

Main/Runtime/VBoxManage: SHA256 support comes with OVF 2.0

File:

• trunk/src/VBox/Runtime/common/checksum/manifest.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/checksum/manifest.cpp

@@ -196 +196 @@
 }
 
-RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, const char * const *papszFiles, size_t cFiles,
+RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, RTDIGESTTYPE enmDigestType,
+                                   const char * const *papszFiles, size_t cFiles,
                                    PFNRTPROGRESS pfnProgressCallback, void *pvUser)
 {
@@ -239 +240 @@
         {
             size_t cbSize = 0;
-            rc = RTManifestWriteFilesBuf(&pvBuf, &cbSize, paFiles, cFiles);
+            rc = RTManifestWriteFilesBuf(&pvBuf, &cbSize, enmDigestType, paFiles, cFiles);
             if (RT_FAILURE(rc))
                 break;
@@ -442 +443 @@
 }
 
-RTR3DECL(int) RTManifestWriteFilesBuf(void **ppvBuf, size_t *pcbSize, PRTMANIFESTTEST paFiles, size_t cFiles)
+RTR3DECL(int) RTManifestWriteFilesBuf(void **ppvBuf, size_t *pcbSize, RTDIGESTTYPE enmDigestType, PRTMANIFESTTEST paFiles, size_t cFiles)
 {
     /* Validate input */
@@ -468 +469 @@
     char * pszTmp = RTStrAlloc(cbMaxSize + 1);
     size_t cbPos = 0;
+    const char *pcszDigestType;
+    switch (enmDigestType)
+    {
+        case RTDIGESTTYPE_CRC32:  pcszDigestType = "CRC32:"; break;
+        case RTDIGESTTYPE_CRC64:  pcszDigestType = "CRC64:"; break;
+        case RTDIGESTTYPE_MD5:    pcszDigestType = "MD5:";   break;
+        case RTDIGESTTYPE_SHA1:   pcszDigestType = "SHA1:";  break;
+        case RTDIGESTTYPE_SHA256: pcszDigestType = "SHA256"; break;
+        default: return VERR_INVALID_PARAMETER;
+    }
     for (size_t i = 0; i < cFiles; ++i)
     {
-        size_t cch = RTStrPrintf(pszTmp, cbMaxSize + 1, "SHA1 (%s)= %s\n", RTPathFilename(paFiles[i].pszTestFile), paFiles[i].pszTestDigest);
+        size_t cch = RTStrPrintf(pszTmp, cbMaxSize + 1, "%s (%s)= %s\n", pcszDigestType, RTPathFilename(paFiles[i].pszTestFile), paFiles[i].pszTestDigest);
         memcpy(&((char*)pvBuf)[cbPos], pszTmp, cch);
         cbPos += cch;