Changeset 51851 in vbox for trunk/src/VBox/Runtime/common/checksum/RTSha256Digest.cpp

Timestamp:

Jul 3, 2014 2:01:28 PM (11 years ago)

Author:

vboxsync

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

94702

Message:

Renamed hash implementations to fit better into the build system, supplying the missing OpenSSL-based MD5. VBoxRT uses the OpenSSL variants, all other libraries uses the alternatives. Also removed stupid OpenSSL dependencies in RTSha1Digest.cpp and RTSha256Digest.cpp.

File:

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

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

@@ -1 +1 @@
 /** @file
  * IPRT - SHA256 digest creation
+ *
+ * @todo Replace this with generic RTCrDigest based implementation. Too much
+ *       stupid code duplication.
  */
 
 /*
- * Copyright (C) 2009-2013 Oracle Corporation
+ * Copyright (C) 2009-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -37 +40 @@
 #include <iprt/file.h>
 
-#include <openssl/sha.h>
-
 
 RTR3DECL(int) RTSha256Digest(void* pvBuf, size_t cbBuf, char **ppszDigest, PFNRTPROGRESS pfnProgressCallback, void *pvUser)
@@ -50 +51 @@
     *ppszDigest = NULL;
 
-    /* Initialize OpenSSL. */
-    SHA256_CTX ctx;
-    if (!SHA256_Init(&ctx))
-        return VERR_INTERNAL_ERROR;
+    /* Initialize the hash context. */
+    RTSHA256CONTEXT Ctx;
+    RTSha256Init(&Ctx);
 
     /* Buffer size for progress callback */
-    double rdMulti = 100.0 / cbBuf;
+    double rdMulti = 100.0 / (cbBuf ? cbBuf : 1);
 
     /* Working buffer */
@@ -62 +62 @@
 
     /* Process the memory in blocks */
-    size_t cbRead;
     size_t cbReadTotal = 0;
     for (;;)
     {
-        cbRead = RT_MIN(cbBuf - cbReadTotal, _1M);
-        if(!SHA256_Update(&ctx, pvTmp, cbRead))
-        {
-            rc = VERR_INTERNAL_ERROR;
-            break;
-        }
+        size_t cbRead = RT_MIN(cbBuf - cbReadTotal, _1M);
+        RTSha256Update(&Ctx, pvTmp, cbRead);
         cbReadTotal += cbRead;
         pvTmp += cbRead;
@@ -89 +84 @@
     {
         /* Finally calculate & format the SHA256 sum */
-        unsigned char auchDig[RTSHA256_HASH_SIZE];
-        if (!SHA256_Final(auchDig, &ctx))
-            return VERR_INTERNAL_ERROR;
+        uint8_t abHash[RTSHA256_HASH_SIZE];
+        RTSha256Final(&Ctx, abHash);
 
         char *pszDigest;
@@ -97 +91 @@
         if (RT_SUCCESS(rc))
         {
-            rc = RTSha256ToString(auchDig, pszDigest, RTSHA256_DIGEST_LEN + 1);
+            rc = RTSha256ToString(abHash, pszDigest, RTSHA256_DIGEST_LEN + 1);
             if (RT_SUCCESS(rc))
                 *ppszDigest = pszDigest;
@@ -117 +111 @@
     *ppszDigest = NULL;
 
-    /* Initialize OpenSSL. */
-    SHA256_CTX ctx;
-    if (!SHA256_Init(&ctx))
-        return VERR_INTERNAL_ERROR;
+    /* Initialize the hash context. */
+    RTSHA256CONTEXT Ctx;
+    RTSha256Init(&Ctx);
 
     /* Open the file to calculate a SHA256 sum of */
@@ -139 +132 @@
             return rc;
         }
-        rdMulti = 100.0 / cbFile;
+        rdMulti = 100.0 / (cbFile ? cbFile : 1);
     }
 
@@ -153 +146 @@
 
     /* Read that file in blocks */
-    size_t cbRead;
     size_t cbReadTotal = 0;
     for (;;)
     {
+        size_t cbRead;
         rc = RTFileRead(hFile, pvBuf, cbBuf, &cbRead);
         if (RT_FAILURE(rc) || !cbRead)
             break;
-        if(!SHA256_Update(&ctx, pvBuf, cbRead))
-        {
-            rc = VERR_INTERNAL_ERROR;
-            break;
-        }
+        RTSha256Update(&Ctx, pvBuf, cbRead);
         cbReadTotal += cbRead;
 
@@ -182 +171 @@
 
     /* Finally calculate & format the SHA256 sum */
-    unsigned char auchDig[RTSHA256_HASH_SIZE];
-    if (!SHA256_Final(auchDig, &ctx))
-        return VERR_INTERNAL_ERROR;
+    uint8_t abHash[RTSHA256_HASH_SIZE];
+    RTSha256Final(&Ctx, abHash);
 
     char *pszDigest;
@@ -190 +178 @@
     if (RT_SUCCESS(rc))
     {
-        rc = RTSha256ToString(auchDig, pszDigest, RTSHA256_DIGEST_LEN + 1);
+        rc = RTSha256ToString(abHash, pszDigest, RTSHA256_DIGEST_LEN + 1);
         if (RT_SUCCESS(rc))
             *ppszDigest = pszDigest;