Changeset 59567 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 3, 2016 12:17:58 AM (9 years ago)

Author:

vboxsync

Message:

RTManifestSetAttr,RTManifestEntrySetAttr: Allow the attribute name to be NULL when there is a distinctive fType value given.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -1538 +1538 @@
             /* Add the digest of the ovf to our verification manifest. */
             vrc = RTManifestEntrySetAttr(stack.hSrcDisksManifest, RTPathFilename(pTask->locInfo.strPath.c_str()),
-                                         m->fSha256 ? "SHA256" : "SHA1", m->strOVFSHADigest.c_str(),
+                                         NULL /*pszAttr*/, m->strOVFSHADigest.c_str(),
                                          m->fSha256 ? RTMANIFEST_ATTR_SHA256 : RTMANIFEST_ATTR_SHA1);
             if (RT_FAILURE(vrc))
@@ -1797 +1797 @@
         {
             /* Add the ovf file digest to the verification list. */
-            vrc = RTManifestEntrySetAttr(stack.hSrcDisksManifest, OVFfilename.c_str(), m->fSha256 ? "SHA256" : "SHA1",
+            vrc = RTManifestEntrySetAttr(stack.hSrcDisksManifest, OVFfilename.c_str(), NULL /*pszAttr*/,
                                          m->strOVFSHADigest.c_str(), m->fSha256 ? RTMANIFEST_ATTR_SHA256 : RTMANIFEST_ATTR_SHA1);
             if (RT_FAILURE(vrc))
@@ -2152 +2152 @@
                                                szDigest, sizeof(szDigest), &fType);
                 if (RT_SUCCESS(vrc))
-                    vrc = RTManifestEntrySetAttr(hOvfManifest, pszOvfEntry,
-                                                 fType == RTMANIFEST_ATTR_SHA256 ? "SHA256" : "SHA1", szDigest, fType);
+                    vrc = RTManifestEntrySetAttr(hOvfManifest, pszOvfEntry, NULL /*pszAttr*/, szDigest, fType);
             }
             if (RT_SUCCESS(vrc))
@@ -2737 +2736 @@
         vrc = RTManifestEntrySetAttr(stack.hSrcDisksManifest,
                                      strSourceOVF.c_str(),
-                                     pStorage->fSha256 ? "SHA256" : "SHA1",
+                                     NULL /*pszAttr*/,
                                      pStorage->strDigest.c_str(),
                                      pStorage->fSha256 ? RTMANIFEST_ATTR_SHA256 : RTMANIFEST_ATTR_SHA1);