Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

1 files changed, 92 insertions, 15 deletions

diff --git a/src/VBox/Runtime/common/checksum/manifest.cpp b/src/VBox/Runtime/common/checksum/manifest.cpp
index b16a8f6a..77d4d039 100644
--- a/src/VBox/Runtime/common/checksum/manifest.cpp
+++ b/src/VBox/Runtime/common/checksum/manifest.cpp
@@ -1,10 +1,10 @@
 /* $Id: manifest.cpp $ */
 /** @file
- * IPRT - Manifest file handling.
+ * IPRT - Manifest file handling, old style - deprecated.
  */
 
 /*
- * Copyright (C) 2009 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -66,6 +66,7 @@ typedef struct RTMANIFESTCALLBACKDATA
 } RTMANIFESTCALLBACKDATA;
 typedef RTMANIFESTCALLBACKDATA* PRTMANIFESTCALLBACKDATA;
 
+
 /*******************************************************************************
 *   Private functions
 *******************************************************************************/
@@ -96,6 +97,7 @@ int rtSHAProgressCallback(unsigned uPercent, void *pvUser)
                                       pData->pvUser);
 }
 
+
 /*******************************************************************************
 *   Public functions
 *******************************************************************************/
@@ -252,10 +254,13 @@ RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, RTDIGESTTYPE enm
     /* Cleanup */
     if (pvBuf)
         RTMemFree(pvBuf);
-    for (size_t i = 0; i < cFiles; ++i)
-        if (paFiles[i].pszTestDigest)
-            RTStrFree((char*)paFiles[i].pszTestDigest);
-    RTMemFree(paFiles);
+    if (paFiles)
+    {
+        for (size_t i = 0; i < cFiles; ++i)
+            if (paFiles[i].pszTestDigest)
+                RTStrFree((char*)paFiles[i].pszTestDigest);
+        RTMemFree(paFiles);
+    }
 
     /* Delete the manifest file on failure */
     if (RT_FAILURE(rc))
@@ -264,6 +269,67 @@ RTR3DECL(int) RTManifestWriteFiles(const char *pszManifestFile, RTDIGESTTYPE enm
     return rc;
 }
 
+
+RTR3DECL(int) RTManifestVerifyDigestType(void const *pvBuf, size_t cbSize, RTDIGESTTYPE *penmDigestType)
+{
+    /* Validate input */
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbSize > 0, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(penmDigestType, VERR_INVALID_POINTER);
+
+    int rc = VINF_SUCCESS;
+
+    char const *pcBuf = (char *)pvBuf;
+    size_t cbRead = 0;
+    /* Parse the manifest file line by line */
+    for (;;)
+    {
+        if (cbRead >= cbSize)
+            return VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE;
+
+        size_t cch = rtManifestIndexOfCharInBuf(pcBuf, cbSize - cbRead, '\n') + 1;
+
+        /* Skip empty lines (UNIX/DOS format) */
+        if (   (   cch == 1
+                && pcBuf[0] == '\n')
+            || (   cch == 2
+                && pcBuf[0] == '\r'
+                && pcBuf[1] == '\n'))
+        {
+            pcBuf += cch;
+            cbRead += cch;
+            continue;
+        }
+
+/** @todo r=bird: Missing space check here. */
+        /* Check for the digest algorithm */
+        if (   pcBuf[0] == 'S'
+            && pcBuf[1] == 'H'
+            && pcBuf[2] == 'A'
+            && pcBuf[3] == '1')
+        {
+            *penmDigestType = RTDIGESTTYPE_SHA1;
+            break;
+        }
+        if (   pcBuf[0] == 'S'
+            && pcBuf[1] == 'H'
+            && pcBuf[2] == 'A'
+            && pcBuf[3] == '2'
+            && pcBuf[4] == '5'
+            && pcBuf[5] == '6')
+        {
+            *penmDigestType = RTDIGESTTYPE_SHA256;
+            break;
+        }
+
+        pcBuf += cch;
+        cbRead += cch;
+    }
+
+    return rc;
+}
+
+
 RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTEST paTests, size_t cTests, size_t *piFailed)
 {
     /* Validate input */
@@ -307,7 +373,7 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
 
         /** @todo r=bird:
          *  -# Better deal with this EOF line platform dependency
-         *  -# The SHA1 test should probably include a blank space check.
+         *  -# The SHA1 and SHA256 tests should probably include a blank space check.
          *  -# If there is a specific order to the elements in the string, it would be
          *     good if the delimiter searching checked for it.
          *  -# Deal with filenames containing delimiter characters.
@@ -315,10 +381,19 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
 
         /* Check for the digest algorithm */
         if (   cch < 4
-            || !(   pcBuf[0] == 'S'
-                 && pcBuf[1] == 'H'
-                 && pcBuf[2] == 'A'
-                 && pcBuf[3] == '1'))
+            || (   !(   pcBuf[0] == 'S'
+                     && pcBuf[1] == 'H'
+                     && pcBuf[2] == 'A'
+                     && pcBuf[3] == '1')
+                &&
+                   !(   pcBuf[0] == 'S'
+                     && pcBuf[1] == 'H'
+                     && pcBuf[2] == 'A'
+                     && pcBuf[3] == '2'
+                     && pcBuf[4] == '5'
+                     && pcBuf[5] == '6')
+               )
+            )
         {
             /* Digest unsupported */
             rc = VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE;
@@ -363,6 +438,7 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
             pszDigestEnd = rtManifestPosOfCharInBuf(pcBuf, cch, '\n');
         if (!pszDigestEnd)
         {
+            RTMemTmpFree(pszName);
             rc = VERR_MANIFEST_WRONG_FILE_FORMAT;
             break;
         }
@@ -371,6 +447,7 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
         char *pszDigest = (char *)RTMemTmpAlloc(cchDigest + 1);
         if (!pszDigest)
         {
+            RTMemTmpFree(pszName);
             rc = VERR_NO_MEMORY;
             break;
         }
@@ -381,7 +458,8 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
         bool fFound = false;
         for (size_t i = 0; i < cTests; ++i)
         {
-            if (!RTStrCmp(RTPathFilename(paFiles[i].pTestPattern->pszTestFile), RTStrStrip(pszName)))
+            /** @todo r=bird: Using RTStrStr here looks bogus. */
+            if (RTStrStr(paFiles[i].pTestPattern->pszTestFile, RTStrStrip(pszName)) != NULL)
             {
                 /* Add the data of the manifest file to the file list */
                 paFiles[i].pszManifestFile = RTStrDup(RTStrStrip(pszName));
@@ -418,7 +496,7 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
                 break;
             }
 
-            /* Do the manifest SHA1 digest match against the actual digest? */
+            /* Do the manifest SHA digest match against the actual digest? */
             if (RTStrICmp(paFiles[i].pszManifestDigest, paFiles[i].pTestPattern->pszTestDigest))
             {
                 if (piFailed)
@@ -439,7 +517,6 @@ RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTE
     }
     RTMemTmpFree(paFiles);
 
-    RTPrintf("rc = %Rrc\n", rc);
     return rc;
 }
 
@@ -468,7 +545,7 @@ RTR3DECL(int) RTManifestWriteFilesBuf(void **ppvBuf, size_t *pcbSize, RTDIGESTTY
     for (size_t i = 0; i < cFiles; ++i)
     {
         size_t cbTmp = strlen(RTPathFilename(paFiles[i].pszTestFile))
-                     + strlen(paFiles[i].pszTestDigest) 
+                     + strlen(paFiles[i].pszTestDigest)
                      + strlen(pcszDigestType)
                      + 6;
         cbMaxSize = RT_MAX(cbMaxSize, cbTmp);