Changeset 51861 in vbox for trunk/src

Timestamp:

Jul 3, 2014 10:56:18 PM (11 years ago)

Author:

vboxsync

Message:

clear the context after use, converted SHA-1 to use an array of H values.

Location:

trunk/src/VBox/Runtime/common/checksum

Files:

• alt-md2.cpp (modified) (1 diff)
• alt-sha1.cpp (modified) (6 diffs)
• alt-sha256.cpp (modified) (3 diffs)
• alt-sha512.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/common/checksum/alt-md2.cpp

@@ -256 +256 @@
     memcpy(pabDigest, pCtx->AltPrivate.abStateX, RTMD2_HASH_SIZE);
 
+    RT_ZERO(pCtx->AltPrivate);
     pCtx->AltPrivate.cbBuffer = UINT8_MAX;
 }

trunk/src/VBox/Runtime/common/checksum/alt-sha1.cpp

@@ -53 +53 @@
     /** The message length (in bytes). */
     uint64_t    cbMessage;
-    /** @name The 5 hash values.
-     * @{ */
-    uint32_t    uH0;
-    uint32_t    uH1;
-    uint32_t    uH2;
-    uint32_t    uH3;
-    uint32_t    uH4;
-    /** @} */
+
+    /** The 5 hash values. */
+    uint32_t    auH[5];
 } RTSHA1ALTPRIVATECTX;
 
@@ -68 +63 @@
 
 AssertCompile(RT_SIZEOFMEMB(RTSHA1CONTEXT, abPadding) >= RT_SIZEOFMEMB(RTSHA1CONTEXT, AltPrivate));
-AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, uH0, sizeof(uint32_t)); AssertCompileAdjacentMembers(RTSHA1ALTPRIVATECTX, uH0, uH1);
-AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, uH1, sizeof(uint32_t)); AssertCompileAdjacentMembers(RTSHA1ALTPRIVATECTX, uH1, uH2);
-AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, uH2, sizeof(uint32_t)); AssertCompileAdjacentMembers(RTSHA1ALTPRIVATECTX, uH2, uH3);
-AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, uH3, sizeof(uint32_t)); AssertCompileAdjacentMembers(RTSHA1ALTPRIVATECTX, uH3, uH4);
-AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, uH4, sizeof(uint32_t)); AssertCompile(sizeof(uint32_t) * 5 == RTSHA1_HASH_SIZE);
+AssertCompileMemberSize(RTSHA1ALTPRIVATECTX, auH, RTSHA1_HASH_SIZE);
 
 
@@ -80 +71 @@
 {
     pCtx->AltPrivate.cbMessage = 0;
-    pCtx->AltPrivate.uH0 = UINT32_C(0x67452301);
-    pCtx->AltPrivate.uH1 = UINT32_C(0xefcdab89);
-    pCtx->AltPrivate.uH2 = UINT32_C(0x98badcfe);
-    pCtx->AltPrivate.uH3 = UINT32_C(0x10325476);
-    pCtx->AltPrivate.uH4 = UINT32_C(0xc3d2e1f0);
+    pCtx->AltPrivate.auH[0] = UINT32_C(0x67452301);
+    pCtx->AltPrivate.auH[1] = UINT32_C(0xefcdab89);
+    pCtx->AltPrivate.auH[2] = UINT32_C(0x98badcfe);
+    pCtx->AltPrivate.auH[3] = UINT32_C(0x10325476);
+    pCtx->AltPrivate.auH[4] = UINT32_C(0xc3d2e1f0);
 }
 RT_EXPORT_SYMBOL(RTSha1Init);
@@ -146 +137 @@
 static void rtSha1BlockProcess(PRTSHA1CONTEXT pCtx)
 {
-    uint32_t uA = pCtx->AltPrivate.uH0;
-    uint32_t uB = pCtx->AltPrivate.uH1;
-    uint32_t uC = pCtx->AltPrivate.uH2;
-    uint32_t uD = pCtx->AltPrivate.uH3;
-    uint32_t uE = pCtx->AltPrivate.uH4;
+    uint32_t uA = pCtx->AltPrivate.auH[0];
+    uint32_t uB = pCtx->AltPrivate.auH[1];
+    uint32_t uC = pCtx->AltPrivate.auH[2];
+    uint32_t uD = pCtx->AltPrivate.auH[3];
+    uint32_t uE = pCtx->AltPrivate.auH[4];
 
 #if 1
@@ -208 +199 @@
 #endif
 
-    pCtx->AltPrivate.uH0 += uA;
-    pCtx->AltPrivate.uH1 += uB;
-    pCtx->AltPrivate.uH2 += uC;
-    pCtx->AltPrivate.uH3 += uD;
-    pCtx->AltPrivate.uH4 += uE;
+    pCtx->AltPrivate.auH[0] += uA;
+    pCtx->AltPrivate.auH[1] += uB;
+    pCtx->AltPrivate.auH[2] += uC;
+    pCtx->AltPrivate.auH[3] += uD;
+    pCtx->AltPrivate.auH[4] += uE;
 }
 
@@ -324 +315 @@
      * Convert the byte order of the hash words and we're done.
      */
-    pCtx->AltPrivate.uH0 = RT_H2BE_U32(pCtx->AltPrivate.uH0);
-    pCtx->AltPrivate.uH1 = RT_H2BE_U32(pCtx->AltPrivate.uH1);
-    pCtx->AltPrivate.uH2 = RT_H2BE_U32(pCtx->AltPrivate.uH2);
-    pCtx->AltPrivate.uH3 = RT_H2BE_U32(pCtx->AltPrivate.uH3);
-    pCtx->AltPrivate.uH4 = RT_H2BE_U32(pCtx->AltPrivate.uH4);
-
-    memcpy(pabDigest, &pCtx->AltPrivate.uH0, RTSHA1_HASH_SIZE);
-
+    pCtx->AltPrivate.auH[0] = RT_H2BE_U32(pCtx->AltPrivate.auH[0]);
+    pCtx->AltPrivate.auH[1] = RT_H2BE_U32(pCtx->AltPrivate.auH[1]);
+    pCtx->AltPrivate.auH[2] = RT_H2BE_U32(pCtx->AltPrivate.auH[2]);
+    pCtx->AltPrivate.auH[3] = RT_H2BE_U32(pCtx->AltPrivate.auH[3]);
+    pCtx->AltPrivate.auH[4] = RT_H2BE_U32(pCtx->AltPrivate.auH[4]);
+
+    memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA1_HASH_SIZE);
+
+    RT_ZERO(pCtx->AltPrivate);
     pCtx->AltPrivate.cbMessage = UINT64_MAX;
 }

trunk/src/VBox/Runtime/common/checksum/alt-sha256.cpp

@@ -394 +394 @@
     pCtx->AltPrivate.auH[7] = RT_H2BE_U32(pCtx->AltPrivate.auH[7]);
 
+    RT_ZERO(pCtx->AltPrivate.auW);
     pCtx->AltPrivate.cbMessage = UINT64_MAX;
 }
@@ -403 +404 @@
     rtSha256FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA256_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha256Final);
@@ -448 +450 @@
     rtSha256FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA224_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha224Final);

trunk/src/VBox/Runtime/common/checksum/alt-sha512.cpp

@@ -412 +412 @@
     pCtx->AltPrivate.auH[7] = RT_H2BE_U64(pCtx->AltPrivate.auH[7]);
 
+    RT_ZERO(pCtx->AltPrivate.auW);
     pCtx->AltPrivate.cbMessage.s.Lo = UINT64_MAX;
     pCtx->AltPrivate.cbMessage.s.Hi = UINT64_MAX;
@@ -422 +423 @@
     rtSha512FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA512_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha512Final);
@@ -468 +470 @@
     rtSha512FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA384_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha384Final);
@@ -513 +516 @@
     rtSha512FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA512T224_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha512t224Final);
@@ -558 +562 @@
     rtSha512FinalInternal(pCtx);
     memcpy(pabDigest, &pCtx->AltPrivate.auH[0], RTSHA512T256_HASH_SIZE);
+    RT_ZERO(pCtx->AltPrivate.auH);
 }
 RT_EXPORT_SYMBOL(RTSha512t256Final);