Changeset 59522 in vbox for trunk

Timestamp:

Jan 29, 2016 3:09:48 PM (9 years ago)

Author:

vboxsync

Message:

Backed out r105295 (manifest hack).

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;
@@ -349 +348 @@
     /* 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;
@@ -472 +468 @@
                 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);
@@ -508 +488 @@
         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. */