Changeset 102491 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Dec 6, 2023 12:48:47 AM (14 months ago)

Author:

vboxsync

Message:

IRPT/shacrypt: Minor cleanups, doxygen fix. bugref:10551

Location:

trunk/src/VBox/Runtime/common/crypto

Files:

• shacrypt-256.cpp.h (modified) (4 diffs)
• shacrypt-512.cpp.h (modified) (4 diffs)

trunk/src/VBox/Runtime/common/crypto/shacrypt-256.cpp.h

@@ -82 +82 @@
     RTSha256Final(&CtxB, abDigest);                                             /* Step 8. */
 
-    size_t i = cchPhrase;
-    for (; i > RTSHA256_HASH_SIZE; i -= RTSHA256_HASH_SIZE)                     /* Step 9. */
+    size_t cbLeft = cchPhrase;
+    while (cbLeft > RTSHA256_HASH_SIZE)                                         /* Step 9. */
+    {
         RTSha256Update(&CtxA, abDigest, sizeof(abDigest));
-    RTSha256Update(&CtxA, abDigest, i);                                         /* Step 10. */
+        cbLeft -= RTSHA256_HASH_SIZE;
+    }
+    RTSha256Update(&CtxA, abDigest, cbLeft);                                    /* Step 10. */
 
     size_t iPhraseBit = cchPhrase;
@@ -100 +103 @@
 
     RTSha256Init(&CtxB);                                                        /* Step 13. */
-    for (i = 0; i < cchPhrase; i++)                                             /* Step 14. */
+    for (size_t i = 0; i < cchPhrase; i++)                                      /* Step 14. */
         RTSha256Update(&CtxB, pszPhrase, cchPhrase);
 
@@ -109 +112 @@
      * Byte sequence P (= password).
      */
+    /* Step 16. */
     size_t const cbSeqP  = cchPhrase;
     uint8_t     *pabSeqP = (uint8_t *)RTMemTmpAllocZ(cbSeqP + 1);               /* +1 because the password may be empty */
     uint8_t     *pb       = pabSeqP;
     AssertPtrReturn(pabSeqP, VERR_NO_MEMORY);
-
-    for (i = cbSeqP; i > RTSHA256_HASH_SIZE; i -= RTSHA256_HASH_SIZE)           /* Step 16. */
+    cbLeft = cbSeqP;
+    while (cbLeft > RTSHA256_HASH_SIZE)
     {
         memcpy(pb, abDigestTemp, sizeof(abDigestTemp));                         /* a) */
-        pb += RTSHA256_HASH_SIZE;
-    }
-    memcpy(pb, abDigestTemp, i);                                                /* b) */
+        pb     += RTSHA256_HASH_SIZE;
+        cbLeft -= RTSHA256_HASH_SIZE;
+    }
+    memcpy(pb, abDigestTemp, cbLeft);                                           /* b) */
 
     RTSha256Init(&CtxB);                                                        /* Step 17. */
 
-    for (i = 0; i < 16 + (unsigned)abDigest[0]; i++)                            /* Step 18. */
+    for (size_t i = 0; i < 16 + (unsigned)abDigest[0]; i++)                     /* Step 18. */
         RTSha256Update(&CtxB, pszSalt, cchSalt);
 
@@ -141 +146 @@
     AssertPtrReturn(pabSeqS, VERR_NO_MEMORY);
 
-    pb = pabSeqS;
-    for (i = cbSeqS; i > RTSHA256_HASH_SIZE; i -= RTSHA256_HASH_SIZE)
+    pb     = pabSeqS;
+    cbLeft = cbSeqS;
+    while (cbLeft > RTSHA256_HASH_SIZE)
     {
         memcpy(pb, (void *)abDigestTemp, sizeof(abDigestTemp));                 /* a) */
-        pb += RTSHA256_HASH_SIZE;
-    }
-    memcpy(pb, abDigestTemp, i);                                                /* b) */
+        pb     += RTSHA256_HASH_SIZE;
+        cbLeft -= RTSHA256_HASH_SIZE
+    }
+    memcpy(pb, abDigestTemp, cbLeft);                                           /* b) */
 #else
     AssertCompile(RT_SHACRYPT_SALT_MAX_LEN < RTSHA256_HASH_SIZE);

trunk/src/VBox/Runtime/common/crypto/shacrypt-512.cpp.h

@@ -83 +83 @@
     RTSha512Final(&CtxB, abDigest);                                             /* Step 8. */
 
-    size_t i = cchPhrase;
-    for (; i > RTSHA512_HASH_SIZE; i -= RTSHA512_HASH_SIZE)                     /* Step 9. */
+    size_t cbLeft = cchPhrase;
+    while (cbLeft > RTSHA512_HASH_SIZE)                                         /* Step 9. */
+    {
         RTSha512Update(&CtxA, abDigest, sizeof(abDigest));
-    RTSha512Update(&CtxA, abDigest, i);                                         /* Step 10. */
+        cbLeft -= RTSHA512_HASH_SIZE;
+    }
+    RTSha512Update(&CtxA, abDigest, cbLeft);                                    /* Step 10. */
 
     size_t iPhraseBit = cchPhrase;
@@ -101 +104 @@
 
     RTSha512Init(&CtxB);                                                        /* Step 13. */
-    for (i = 0; i < cchPhrase; i++)                                             /* Step 14. */
+    for (size_t i = 0; i < cchPhrase; i++)                                      /* Step 14. */
         RTSha512Update(&CtxB, pszPhrase, cchPhrase);
 
@@ -110 +113 @@
      * Byte sequence P (= password).
      */
+    /* Step 16. */
     size_t const cbSeqP  = cchPhrase;
     uint8_t     *pabSeqP = (uint8_t *)RTMemTmpAllocZ(cbSeqP + 1);               /* +1 because the password may be empty */
     uint8_t     *pb       = pabSeqP;
     AssertPtrReturn(pabSeqP, VERR_NO_MEMORY);
-
-    for (i = cbSeqP; i > RTSHA512_HASH_SIZE; i -= RTSHA512_HASH_SIZE)           /* Step 16. */
+    cbLeft = cbSeqP;
+    while (cbLeft > RTSHA512_HASH_SIZE)
     {
         memcpy(pb, abDigestTemp, sizeof(abDigestTemp));                         /* a) */
-        pb += RTSHA512_HASH_SIZE;
-    }
-    memcpy(pb, abDigestTemp, i);                                                /* b) */
+        pb     += RTSHA512_HASH_SIZE;
+        cbLeft -= RTSHA512_HASH_SIZE;
+    }
+    memcpy(pb, abDigestTemp, cbLeft);                                           /* b) */
 
     RTSha512Init(&CtxB);                                                        /* Step 17. */
 
-    for (i = 0; i < 16 + (unsigned)abDigest[0]; i++)                            /* Step 18. */
+    for (size_t i = 0; i < 16 + (unsigned)abDigest[0]; i++)                     /* Step 18. */
         RTSha512Update(&CtxB, pszSalt, cchSalt);
 
@@ -142 +147 @@
     AssertPtrReturn(pabSeqS, VERR_NO_MEMORY);
 
-    pb = pabSeqS;
-    for (i = cbSeqS; i > RTSHA512_HASH_SIZE; i -= RTSHA512_HASH_SIZE)
+    pb     = pabSeqS;
+    cbLeft = cbSeqS;
+    while (cbLeft > RTSHA512_HASH_SIZE)
     {
         memcpy(pb, (void *)abDigestTemp, sizeof(abDigestTemp));                 /* a) */
-        pb += RTSHA512_HASH_SIZE;
-    }
-    memcpy(pb, abDigestTemp, i);                                                /* b) */
+        pb     += RTSHA512_HASH_SIZE;
+        cbLeft -= RTSHA512_HASH_SIZE
+    }
+    memcpy(pb, abDigestTemp, cbLeft);                                           /* b) */
 #else
     AssertCompile(RT_SHACRYPT_SALT_MAX_LEN < RTSHA512_HASH_SIZE);