Changeset 102335 in vbox

Timestamp:

Nov 27, 2023 5:01:59 PM (12 months ago)

Author:

vboxsync

Message:

IPRT/crypto/shacrypt: Added RTCrShaCryptGenerateSalt() to avoid code duplication. bugref:10551

Location:

trunk

Files:

• include/iprt/crypto/shacrypt.h (modified) (4 diffs)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Runtime/common/crypto/shacrypt.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTShaCrypt.cpp (modified) (1 diff)
• src/VBox/Runtime/tools/RTMkPasswd.cpp (modified) (1 diff)

trunk/include/iprt/crypto/shacrypt.h

@@ -59 +59 @@
 
 /**
+ * Creates a randomized salt for the RTCrShaCryptXXX functions.
+ *
+ * @returns IPRT status code.
+ * @param   szSalt      Where to store the generated salt.
+ * @param   cchSalt     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);
+
+
+/**
  * Calculates a SHAcrypt (SHA-256) digest.
  *
- * @returns VBox status code.
+ * @returns IPRT status code.
  * @param   pszKey              Key (password) to use.
  * @param   pszSalt             Salt to use.
@@ -76 +87 @@
  * Returns a SHAcrypt (SHA-256) digest as a printable scheme.
  *
- * @returns VBox status code.
+ * @returns IPRT status code.
  * @param   abHash              SHAcrypt (SHA-256) digest to return printable scheme for.
  * @param   pszSalt             Salt to use. Must match the salt used when generating \a pabHash via RTSha256Crypt().
@@ -92 +103 @@
  * Calculates a SHAcrypt (SHA-512) digest.
  *
- * @returns VBox status code.
+ * @returns IPRT status code.
  * @param   pszKey              Key (password) to use.
  * @param   pszSalt             Salt to use.
@@ -107 +118 @@
  * Returns a SHAcrypt (SHA-512) digest as a printable scheme.
  *
- * @returns VBox status code.
+ * @returns IPRT status code.
  * @param   abHash              SHAcrypt (SHA-512) digest to return printable scheme for.
  * @param   pszSalt             Salt to use. Must match the salt used when generating \a pabHash via RTSha512Crypt().

trunk/include/iprt/mangling.h

@@ -3734 +3734 @@
 # define RTCrPkixCanCertHandleDigestType                RT_MANGLER(RTCrPkixCanCertHandleDigestType)
 # define RTCrRandBytes                                  RT_MANGLER(RTCrRandBytes)
+# define RTCrShaCryptGenerateSalt                       RT_MANGLER(RTCrShaCryptGenerateSalt)
 # define RTCrShaCrypt256                                RT_MANGLER(RTCrShaCrypt256)
 # define RTCrShaCrypt256ToString                        RT_MANGLER(RTCrShaCrypt256ToString)

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

@@ -43 +43 @@
 #include <iprt/types.h>
 #include <iprt/mem.h>
+#include <iprt/rand.h>
 #include <iprt/sha.h>
 #include <iprt/string.h>
 
+
+
+RTR3DECL(int) RTCrShaCryptGenerateSalt(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt)
+{
+    AssertMsgReturn(cchSalt >= RT_SHACRYPT_MIN_SALT_LEN && cchSalt <= RT_SHACRYPT_MAX_SALT_LEN, ("len=%zu\n", cchSalt),
+                    VERR_INVALID_PARAMETER);
+
+    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';
+    return VINF_SUCCESS;
+}
 
 

trunk/src/VBox/Runtime/testcase/tstRTShaCrypt.cpp

@@ -191 +191 @@
         else
         {
-            static const char aRange[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!?+\"%&/()[]{}=#";
-            for (unsigned s = 0; s < RT_SHACRYPT_MAX_SALT_LEN; s++) /* Always go with a strong salt by default. */
-                szSalt[s] = aRange[RTRandU32Ex(0, sizeof(aRange) - 2)];
+            rc = RTCrShaCryptGenerateSalt(szSalt, RT_SHACRYPT_MAX_SALT_LEN);
+            RTTEST_CHECK_RC_OK(hTest, rc);
             pszSalt = szSalt;
         }

trunk/src/VBox/Runtime/tools/RTMkPasswd.cpp

@@ -164 +164 @@
     if (!pszSalt)
     {
-        static const char aRange[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890!?+\"%&/()[]{}=#";
-        for (unsigned i = 0; i < RT_SHACRYPT_MAX_SALT_LEN; i++) /* Always go with a strong salt by default. */
-            szSalt[i] = aRange[RTRandU32Ex(0, sizeof(aRange) - 2)];
+        int vrc2 = RTCrShaCryptGenerateSalt(szSalt, RT_SHACRYPT_MAX_SALT_LEN);
+        AssertRCReturn(vrc2, RTEXITCODE_FAILURE);
         pszSalt = szSalt;
     }