Changeset 33062 in vbox

Timestamp:

Oct 12, 2010 12:47:12 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: use RTSHA1CONTEXT instead of SHA_CTX

File:

• trunk/src/VBox/Main/ApplianceImplIO.cpp (modified) (5 diffs)

trunk/src/VBox/Main/ApplianceImplIO.cpp

@@ -32 +32 @@
 #include <iprt/stream.h>
 #include <VBox/VBoxHDD.h>
-
-#include <openssl/sha.h>
 
 /******************************************************************************
@@ -84 +82 @@
     RTSEMEVENT calcFinishedEvent;
     /** SHA1 calculation context. */
-    SHA_CTX ctx;
+    RTSHA1CONTEXT ctx;
 } SHA1STORAGEINTERNAL, *PSHA1STORAGEINTERNAL;
 
@@ -441 +439 @@
             {
                 /* Update the SHA1 context with the next data block. */
-                if(!SHA1_Update(&pInt->ctx, pInt->pcBuf, pInt->cbCurBuf))
-                {
-                    rc = VERR_INTERNAL_ERROR;
-                    fLoop = false;
-                }
+                RTSha1Update(&pInt->ctx, pInt->pcBuf, pInt->cbCurBuf);
                 /* Reset the thread status and signal the main thread that we
                    are finished. */
@@ -569 +563 @@
         {
             /* Create a sha1 context the sha1 worker thread will work with. */
-            if (!SHA1_Init(&pInt->ctx))
-            {
-                rc = VERR_INTERNAL_ERROR;
-                break;
-            }
+            RTSha1Init(&pInt->ctx);
             /* Create an event semaphore to indicate a state change for the sha1
                worker thread. */
@@ -651 +641 @@
         unsigned char auchDig[RTSHA1_HASH_SIZE];
         char *pszDigest;
-        if (!SHA1_Final(auchDig, &pInt->ctx))
-            rc = VERR_INTERNAL_ERROR;
+        RTSha1Final(&pInt->ctx, auchDig);
         rc = RTStrAllocEx(&pszDigest, RTSHA1_DIGEST_LEN + 1);
         if (RT_SUCCESS(rc))