Changeset 23501 in vbox for trunk/src

Timestamp:

Oct 2, 2009 10:59:42 AM (15 years ago)

Author:

vboxsync

Message:

IPRT: Added SHA-1, SHA-256 and SHA-512 APIs. Added a simple digest program for testing these.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/checksum/RTSha1Digest.cpp (moved) (moved from trunk/src/VBox/Runtime/common/checksum/sha1.cpp ) (4 diffs)
• common/checksum/manifest.cpp (modified) (1 diff)
• common/checksum/sha256.cpp (added)
• common/checksum/sha512.cpp (added)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstRTDigest.cpp (added)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -848 +848 @@
         common/misc/s3.cpp \
         r3/xml.cpp \
+        common/checksum/RTSha1Digest.cpp \
+        common/checksum/manifest.cpp \
         common/checksum/sha1.cpp \
-        common/checksum/manifest.cpp
+        common/checksum/sha256.cpp \
+        common/checksum/sha512.cpp
 VBoxRT_SOURCES.$(KBUILD_TARGET) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET))
 VBoxRT_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))

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

@@ -29 +29 @@
  */
 
-#include <iprt/sha1.h>
+
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include "internal/iprt.h"
+#include <iprt/sha.h>
+
+#include <iprt/assert.h>
+#include <iprt/err.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
-#include <iprt/assert.h>
-#include <iprt/err.h>
 
 #include <openssl/sha.h>
 
-/*******************************************************************************
-*   Public RTSha1Digest interface                                              *
-*******************************************************************************/
+
 
 RTR3DECL(int) RTSha1Digest(const char *pszFile, char **ppszDigest)
 {
     /* Validate input */
-    if (!pszFile || !ppszDigest)
-    {
-        AssertMsgFailed(("Must supply pszFile and ppszDigest!\n"));
-        return VERR_INVALID_PARAMETER;
-    }
+    AssertPtrReturn(pszFile, VERR_INVALID_POINTER);
+    AssertPtrReturn(ppszDigest, VERR_INVALID_POINTER);
 
     *ppszDigest = NULL;
@@ -56 +57 @@
     if (!SHA1_Init(&ctx))
         return VERR_INTERNAL_ERROR;
+
+    /** @todo r=bird: Using a stream here doesn't really serve much purpose as
+     *        few stream implementations uses a buffer much larger than 4KB. (The
+     *        only I'm aware of is libc on OS/2, which uses 8KB.) */
 
     /* Open the file to calculate a SHA1 sum of */
@@ -77 +82 @@
             break;
         }
-    }
-    while (cbRead > 0);
+    } while (cbRead > 0);
     RTStrmClose(pStream);
 
@@ -85 +89 @@
 
     /* Finally calculate & format the SHA1 sum */
-    unsigned char pucDig[20];
-    if (!SHA1_Final(pucDig, &ctx))
+    unsigned char auchDig[20];
+    if (!SHA1_Final(auchDig, &ctx))
         return VERR_INTERNAL_ERROR;
 
-    int cbRet = RTStrAPrintf(ppszDigest, "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
-                             pucDig[0] , pucDig[1] , pucDig[2] , pucDig[3] , pucDig[4],
-                             pucDig[5] , pucDig[6] , pucDig[7] , pucDig[8] , pucDig[9],
-                             pucDig[10], pucDig[11], pucDig[12], pucDig[13], pucDig[14],
-                             pucDig[15], pucDig[16], pucDig[17], pucDig[18], pucDig[19]);
-    if (RT_UNLIKELY(cbRet == -1))
+    int cch = RTStrAPrintf(ppszDigest, "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x",
+                           auchDig[0] , auchDig[1] , auchDig[2] , auchDig[3] , auchDig[4],
+                           auchDig[5] , auchDig[6] , auchDig[7] , auchDig[8] , auchDig[9],
+                           auchDig[10], auchDig[11], auchDig[12], auchDig[13], auchDig[14],
+                           auchDig[15], auchDig[16], auchDig[17], auchDig[18], auchDig[19]);
+    if (RT_UNLIKELY(cch == -1))
         rc = VERR_INTERNAL_ERROR;
 

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

@@ -40 +40 @@
 #include <iprt/mem.h>
 #include <iprt/path.h>
-#include <iprt/sha1.h>
+#include <iprt/sha.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>

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

@@ -55 +55 @@
         tstRTCritSect \
         tstDeadlock \
+        tstRTDigest \
         tstDir \
         tstDir-2 \
@@ -167 +168 @@
 tstDeadlock_SOURCES = tstDeadlock.cpp
 
+tstRTDigest_SOURCES = tstRTDigest.cpp
+
 tstDir_SOURCES = tstDir.cpp