Changeset 45227 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 28, 2013 12:22:11 PM (12 years ago)

Author:

vboxsync

Message:

Main: OVF 2.0 support. Part 1 - SHA256 digest is supported.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• VBox/VBoxRTImp.def (modified) (1 diff)
• common/checksum/manifest.cpp (modified) (2 diffs)
• testcase/tstRTDigest.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -269 +269 @@
         common/checksum/manifest-file.cpp \
         common/checksum/RTSha1Digest.cpp \
+        common/checksum/RTSha256Digest.cpp \
         common/checksum/sha1.cpp \
         common/checksum/sha1str.cpp \

trunk/src/VBox/Runtime/VBox/VBoxRTImp.def

@@ -1008 +1008 @@
     RTSha256ToString
     RTSha256Update
+    RTSha256Digest
+    RTSha256DigestFromFile
     RTSha512
     RTSha512Final

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

@@ -268 +268 @@
 }
 
+
+RTR3DECL(int) RTManifestVerifyDigestType(void *pvBuf, size_t cbSize, RTDIGESTTYPE &digestType)
+{
+    /* Validate input */
+    AssertPtrReturn(pvBuf, VERR_INVALID_POINTER);
+    AssertReturn(cbSize > 0, VERR_INVALID_PARAMETER);
+
+    int rc = VINF_SUCCESS;
+
+    char *pcBuf = (char*)pvBuf;
+    size_t cbRead = 0;
+    /* Parse the manifest file line by line */
+    for (;;)
+    {
+        if (cbRead >= cbSize)
+        {
+            digestType = RTDIGESTTYPE_UNKNOWN;
+            rc = VERR_MANIFEST_UNSUPPORTED_DIGEST_TYPE;
+            break;
+        }
+
+        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;
+        }
+
+        /* 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;
+            break;
+        }
+    }
+
+    return rc;
+}
+
 RTR3DECL(int) RTManifestVerifyFilesBuf(void *pvBuf, size_t cbSize, PRTMANIFESTTEST paTests, size_t cTests, size_t *piFailed)
 {
@@ -318 +377 @@
 
         /* Check for the digest algorithm */
-        if (   cch < 4
-            || !(   pcBuf[0] == 'S'
+        if (   cch < 4  ||
+               (!(   pcBuf[0] == 'S'
                  && pcBuf[1] == 'H'
                  && pcBuf[2] == 'A'
-                 && pcBuf[3] == '1'))
+                 && pcBuf[3] == '1')
+                        &&
+               !(   pcBuf[0] == 'S'
+                 && pcBuf[1] == 'H'
+                 && pcBuf[2] == 'A'
+                 && pcBuf[3] == '2'
+                 && pcBuf[4] == '5'
+                 && pcBuf[5] == '6'))
+               )
         {
             /* Digest unsupported */

trunk/src/VBox/Runtime/testcase/tstRTDigest.cpp

@@ -160 +160 @@
                              }
 
+                             case kDigestType_SHA256:
+                             {
+                                 char *pszDigest;
+                                 int rc = RTSha256DigestFromFile(ValueUnion.psz, &pszDigest, NULL, NULL);
+                                 if (RT_FAILURE(rc))
+                                     return Error("RTSha256Digest(%s,) -> %Rrc\n", ValueUnion.psz, rc);
+                                 RTPrintf("%s  %s\n", pszDigest, ValueUnion.psz);
+                                 RTStrFree(pszDigest);
+                                 break;
+                             }
                              default:
                                  return Error("The file method isn't implemented for this digest\n");