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

Timestamp:

Jul 4, 2013 11:38:28 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

86988

Message:

Deprecated the old manifest API. r=bird: IPRT does NOT use ugly C++ references, it pointers directly - no cloak and dagger pointers thank you. Please don't reformat if expressions into unreadability. RTDIGESTTYPE_UNKNOWN should be RTDIGESTTYPE_INVALID and there is actually no need to set output variables on failure, just check the status code.

File:

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

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Manifest file handling.
+ * IPRT - Manifest file handling, old style - deprecated.
  */
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -67 +67 @@
 typedef RTMANIFESTCALLBACKDATA* PRTMANIFESTCALLBACKDATA;
 
+
 /*******************************************************************************
 *   Private functions
@@ -96 +97 @@
                                       pData->pvUser);
 }
+
 
 /*******************************************************************************
@@ -269 +271 @@
 
 
-RTR3DECL(int) RTManifestVerifyDigestType(void *pvBuf, size_t cbSize, RTDIGESTTYPE &digestType)
+RTR3DECL(int) RTManifestVerifyDigestType(void *pvBuf, size_t cbSize, RTDIGESTTYPE *penmDigestType)
 {
     /* Validate input */
     AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
     AssertReturn(cbSize > 0, VERR_INVALID_PARAMETER);
+    AssertPtrRetrn(penmDigestType, VERR_INVALID_POINTER)
 
     int rc = VINF_SUCCESS;
 
-    char *pcBuf = (char*)pvBuf;
+    char const *pcBuf = (char *)pvBuf;
     size_t cbRead = 0;
     /* Parse the manifest file line by line */
@@ -283 +286 @@
     {
         if (cbRead >= cbSize)
-        {
-            digestType = RTDIGESTTYPE_UNKNOWN;
-            rc = VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE;
-            break;
-        }
+            return VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE;
 
         size_t cch = rtManifestIndexOfCharInBuf(pcBuf, cbSize - cbRead, '\n') + 1;
@@ -303 +302 @@
         }
 
+/** @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')
-        {
-            digestType = RTDIGESTTYPE_SHA1;
-            break;
-        }
-        else if (pcBuf[0] == 'S'
-                 && pcBuf[1] == 'H'
-                 && pcBuf[2] == 'A'
-                 && pcBuf[3] == '2'
-                 && pcBuf[4] == '5'
-                 && pcBuf[5] == '6')
-        {
-            digestType = RTDIGESTTYPE_SHA256;
+        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;
         }
@@ -329 +329 @@
     return rc;
 }
+
 
 RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTEST paTests, size_t cTests, size_t *piFailed)
@@ -373 +374 @@
         /** @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.
@@ -380 +381 @@
 
         /* 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] == '2'
-                 && pcBuf[4] == '5'
-                 && pcBuf[5] == '6'))
+        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] == '2'
+                     && pcBuf[4] == '5'
+                     && pcBuf[5] == '6')
                )
+            )
         {
             /* Digest unsupported */
@@ -455 +457 @@
         for (size_t i = 0; i < cTests; ++i)
         {
+            /** @todo r=bird: Using RTStrStr here looks bogus. */
             if (RTStrStr(paFiles[i].pTestPattern->pszTestFile, RTStrStrip(pszName)) != NULL)
             {
@@ -578 +581 @@
 }
 
+