Changeset 102361 in vbox

Timestamp:

Nov 28, 2023 12:53:33 PM (12 months ago)

Author:

vboxsync

Message:

IPRT/crypto: Changed the signature of RTCrShaCryptGenerateSalt(). bugref:10551

Location:

trunk

Files:

• include/iprt/crypto/shacrypt.h (modified) (1 diff)
• src/VBox/Runtime/common/crypto/shacrypt.cpp (modified) (2 diffs)

trunk/include/iprt/crypto/shacrypt.h

@@ -62 +62 @@
  *
  * @returns IPRT status code.
- * @param   szSalt      Where to store the generated salt.
- * @param   cchSalt     Number of characters the generated salt should use.
+ * @param   pszSalt     Where to store the generated salt.
+ * @param   cchSalt     Size of \a pszSalt.
+ *                      Also marks the number of characters the generated salt should use.
  *                      Must be >= RT_SHACRYPT_MIN_SALT_LEN and <= RT_SHACRYPT_MAX_SALT_LEN.
  */
-RTR3DECL(int) RTCrShaCryptGenerateSalt(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt);
+RTR3DECL(int) RTCrShaCryptGenerateSalt(char *pszSalt, size_t cchSalt);
 
 

trunk/src/VBox/Runtime/common/crypto/shacrypt.cpp

@@ -49 +49 @@
 
 
-RTR3DECL(int) RTCrShaCryptGenerateSalt(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt)
+RTR3DECL(int) RTCrShaCryptGenerateSalt(char *pszSalt, size_t cchSalt)
 {
     AssertMsgReturn(cchSalt >= RT_SHACRYPT_MIN_SALT_LEN && cchSalt <= RT_SHACRYPT_MAX_SALT_LEN, ("len=%zu\n", cchSalt),
@@ -56 +56 @@
     static const char aRange[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890./";
     for (size_t i = 0; i < cchSalt; i++)
-        szSalt[i] = aRange[RTRandU32Ex(0, sizeof(aRange) - 2)];
-
-    szSalt[RT_SHACRYPT_MAX_SALT_LEN] = '\0';
+        pszSalt[i] = aRange[RTRandU32Ex(0, sizeof(aRange) - 2)];
+
+    pszSalt[cchSalt] = '\0';
     return VINF_SUCCESS;
 }