Changeset 59516 in vbox

Timestamp:

Jan 29, 2016 8:14:44 AM (9 years ago)

Author:

vboxsync

Message:

bugref:6022. OVF import: Workaround in the case if there is no the SHA digest of OVF description file inside manifest file.

File:

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

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

@@ -52 +52 @@
     char *pszManifestDigest;
     PRTMANIFESTTEST pTestPattern;
+    bool fSkipThisFile;
 } RTMANIFESTFILEENTRY;
 typedef RTMANIFESTFILEENTRY* PRTMANIFESTFILEENTRY;
@@ -348 +349 @@
     /* Fill our compare list */
     for (size_t i = 0; i < cTests; ++i)
+    {
         paFiles[i].pTestPattern = &paTests[i];
+        paFiles[i].fSkipThisFile = false;
+    }
 
     char *pcBuf = (char*)pvBuf;
@@ -468 +472 @@
                 break;
             }
+            else
+            {
+                /*
+                * use case when manifest file doesn't contain the SHA digest of OVF description file 
+                * OVF2.0 standard says that "The manifest file shall contain SHA digests for all distinct files
+                * referenced in the References element of the OVF descriptor and for no other files." 
+                * So we have OVF description file in our package file list but there is no SHA digest for him.
+                */
+                char *suffix = RTPathSuffix(paFiles[i].pTestPattern->pszTestFile);//get suffix
+
+                if (RTStrICmp(suffix, ".ovf") == 0)
+                {
+                    paFiles[i].fSkipThisFile = true;//workaround for this case
+                    fFound = true;
+                }
+            }
         }
         RTMemTmpFree(pszName);
@@ -488 +508 @@
         for (size_t i = 0; i < cTests; ++i)
         {
+            if(paFiles[i].fSkipThisFile == true)
+                continue;
             /* If there is an entry in the file list, which hasn't an
              * equivalent in the manifest file, its an error. */