Changeset 51820 in vbox for trunk/src

Timestamp:

Jul 2, 2014 7:32:59 PM (11 years ago)

Author:

vboxsync

Message:

New message digest testcase + a fix to digest-builtin.cpp.

Location:

trunk/src/VBox/Runtime

Files:

• common/crypto/digest-builtin.cpp (modified) (1 diff)
• testcase/72kb-random.bin (added)
• testcase/72kb-random.h (added)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTDigest-2.cpp (added)
• testcase/tstRTDigest.cpp (modified) (19 diffs)

trunk/src/VBox/Runtime/common/crypto/digest-builtin.cpp

@@ -308 +308 @@
 static PCRTCRDIGESTDESC const g_apDigestOps[] =
 {
+    &g_rtCrDigestMd2Desc,
     &g_rtCrDigestMd5Desc,
     &g_rtCrDigestSha1Desc,

trunk/src/VBox/Runtime/testcase/Makefile.kmk

@@ -55 +55 @@
         tstRTCType \
         tstRTDigest \
+        tstRTDigest-2 \
         tstDir \
         tstDir-2 \
@@ -236 +237 @@
 tstRTCType_SOURCES = tstRTCType.cpp
 
+tstRTDigest_TEMPLATE = VBOXR3TSTEXE
 tstRTDigest_SOURCES = tstRTDigest.cpp
+
+tstRTDigest-2_TEMPLATE = VBOXR3TSTEXE
+tstRTDigest-2_SOURCES = tstRTDigest-2.cpp
 
 ifdef VBOX_WITH_LIBCURL

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

@@ -30 +30 @@
 *******************************************************************************/
 #include <iprt/sha.h>
+#include <iprt/md2.h>
 #include <iprt/md5.h>
 #include <iprt/crc.h>
@@ -61 +62 @@
 
 
+static int MyReadFile(RTFILE hFile, void *pvBuf, size_t cbToRead, size_t *pcbRead, uint64_t *pcbMaxLeft)
+{
+    int rc = VINF_SUCCESS;
+    if (*pcbMaxLeft > 0)
+    {
+        if (cbToRead > *pcbMaxLeft)
+            cbToRead = (size_t)*pcbMaxLeft;
+        rc = RTFileRead(hFile, pvBuf, cbToRead, pcbRead);
+        if (RT_SUCCESS(rc))
+            *pcbMaxLeft -= *pcbRead;
+    }
+    else
+        *pcbRead = 0;
+    return rc;
+}
+
+
+
 int main(int argc, char **argv)
 {
@@ -70 +89 @@
          kDigestType_CRC32,
          kDigestType_CRC64,
+         kDigestType_MD2,
          kDigestType_MD5,
          kDigestType_SHA1,
@@ -75 +95 @@
          kDigestType_SHA512
      } enmDigestType = kDigestType_NotSpecified;
+     const char *pszDigestType = "NotSpecified";
 
      enum
@@ -83 +104 @@
      } enmMethod = kMethod_Block;
 
+     uint64_t   offStart    = 0;
+     uint64_t   cbMax       = UINT64_MAX;
+     bool       fTestcase   = false;
+
      static const RTGETOPTDEF s_aOptions[] =
      {
@@ -88 +113 @@
          { "--method", 'm', RTGETOPT_REQ_STRING },
          { "--help",   'h', RTGETOPT_REQ_NOTHING },
+         { "--length", 'l', RTGETOPT_REQ_UINT64 },
+         { "--offset", 'o', RTGETOPT_REQ_UINT64 },
+         { "--testcase", 'x', RTGETOPT_REQ_NOTHING },
      };
 
@@ -93 +121 @@
      RTGETOPTUNION ValueUnion;
      RTGETOPTSTATE GetState;
-     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, 0);
+     RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 1, RTGETOPTINIT_FLAGS_OPTS_FIRST);
      while ((ch = RTGetOpt(&GetState, &ValueUnion)))
      {
@@ -100 +128 @@
              case 't':
                  if (!RTStrICmp(ValueUnion.psz, "crc32"))
+                 {
+                     pszDigestType = "CRC32";
                      enmDigestType = kDigestType_CRC32;
+                 }
                  else if (!RTStrICmp(ValueUnion.psz, "crc64"))
+                 {
+                     pszDigestType = "CRC64";
                      enmDigestType = kDigestType_CRC64;
+                 }
+                 else if (!RTStrICmp(ValueUnion.psz, "md2"))
+                 {
+                     pszDigestType = "MD2";
+                     enmDigestType = kDigestType_MD2;
+                 }
                  else if (!RTStrICmp(ValueUnion.psz, "md5"))
+                 {
+                     pszDigestType = "MD5";
                      enmDigestType = kDigestType_MD5;
+                 }
                  else if (!RTStrICmp(ValueUnion.psz, "sha1"))
+                 {
+                     pszDigestType = "SHA-1";
                      enmDigestType = kDigestType_SHA1;
+                 }
                  else if (!RTStrICmp(ValueUnion.psz, "sha256"))
+                 {
+                     pszDigestType = "SHA-256";
                      enmDigestType = kDigestType_SHA256;
+                 }
                  else if (!RTStrICmp(ValueUnion.psz, "sha512"))
+                 {
+                     pszDigestType = "SHA-512";
                      enmDigestType = kDigestType_SHA512;
+                 }
                  else
                  {
@@ -132 +183 @@
                  break;
 
+             case 'l':
+                 cbMax = ValueUnion.u64;
+                 break;
+
+             case 'o':
+                 offStart = ValueUnion.u64;
+                 break;
+
+             case 'x':
+                 fTestcase = true;
+                 break;
+
              case 'h':
-                 RTPrintf("syntax: tstRTDigest -t <digest-type> file [file2 [..]]\n");
+                 RTPrintf("usage: tstRTDigest -t <digest-type> [-o <offset>] [-l <length>] [-x] file [file2 [..]]\n");
                  return 1;
 
@@ -147 +210 @@
 
                      case kMethod_File:
+                         if (offStart != 0 || cbMax != UINT64_MAX)
+                             return Error("The -l and -o options do not work with the 'file' method.");
                          switch (enmDigestType)
                          {
@@ -181 +246 @@
                          if (RT_FAILURE(rc))
                              return Error("RTFileOpen(,%s,) -> %Rrc\n", ValueUnion.psz, rc);
-
+                         if (offStart != 0)
+                         {
+                             rc = RTFileSeek(hFile, offStart, RTFILE_SEEK_BEGIN, NULL);
+                             if (RT_FAILURE(rc))
+                                 return Error("RTFileSeek(%s,%ull) -> %Rrc\n", ValueUnion.psz, offStart, rc);
+                         }
+
+                         uint64_t cbMaxLeft = cbMax;
                          size_t  cbRead;
                          uint8_t abBuf[_64K];
@@ -192 +264 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -207 +279 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -217 +289 @@
                              }
 
+                             case kDigestType_MD2:
+                             {
+                                 RTMD2CONTEXT Ctx;
+                                 RTMd2Init(&Ctx);
+                                 for (;;)
+                                 {
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
+                                     if (RT_FAILURE(rc) || !cbRead)
+                                         break;
+                                     RTMd2Update(&Ctx, abBuf, cbRead);
+                                 }
+                                 uint8_t abDigest[RTMD2_HASH_SIZE];
+                                 RTMd2Final(&Ctx, abDigest);
+                                 RTMd2ToString(abDigest, pszDigest, sizeof(abBuf));
+                                 break;
+                             }
+
                              case kDigestType_MD5:
                              {
@@ -223 +312 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -240 +329 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -257 +346 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -274 +363 @@
                                  for (;;)
                                  {
-                                     rc = RTFileRead(hFile, abBuf, sizeof(abBuf), &cbRead);
+                                     rc = MyReadFile(hFile, abBuf, sizeof(abBuf), &cbRead, &cbMaxLeft);
                                      if (RT_FAILURE(rc) || !cbRead)
                                          break;
@@ -294 +383 @@
                              return Error("RTFileRead(%s) -> %Rrc\n", ValueUnion.psz, rc);
                          }
-                         RTPrintf("%s  %s\n", pszDigest, ValueUnion.psz);
+
+                         if (!fTestcase)
+                             RTPrintf("%s  %s\n", pszDigest, ValueUnion.psz);
+                         else if (offStart)
+                             RTPrintf("        { &g_abRandom72KB[%#4llx], %5llu, \"%s\", \"%s %llu bytes @%llu\" },\n",
+                                      offStart, cbMax - cbMaxLeft, pszDigest, pszDigestType, offStart, cbMax - cbMaxLeft);
+                         else
+                             RTPrintf("        { &g_abRandom72KB[0],     %5llu, \"%s\", \"%s %llu bytes\" },\n",
+                                      cbMax - cbMaxLeft, pszDigest, pszDigestType, cbMax - cbMaxLeft);
                          break;
                      }