Changeset 102356 in vbox

Timestamp:

Nov 28, 2023 10:33:34 AM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160492

Message:

IPRT/crypto: Added a RTCrShaCryptGenerateSaltWeak() version which can be overriden in other modules (e.g. testcases). bugref:10551

Location:

trunk

Files:

• include/iprt/crypto/shacrypt.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Main/src-server/UnattendedScript.cpp (modified) (1 diff)
• src/VBox/Main/testcase/tstUnattendedScript.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstRTShaCrypt.cpp (modified) (1 diff)

trunk/include/iprt/crypto/shacrypt.h

@@ -68 +68 @@
 RTR3DECL(int) RTCrShaCryptGenerateSalt(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt);
 
+/**
+ * Creates a randomized salt for the RTCrShaCryptXXX functions, weak version. Can be overriden in local modules.
+ *
+ * @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.
+ */
+#if defined(IN_RING3) && (defined(IN_RT_STATIC) || defined(IPRT_NO_CRT))
+RTR3DECL(int) RTCrShaCryptGenerateSaltWeak(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt);
+#else
+# undef  RTCrShaCryptGenerateSaltWeak /* in case of mangling */
+# define RTCrShaCryptGenerateSaltWeak RTCrShaCryptGenerateSalt
+#endif
 
 /**

trunk/include/iprt/mangling.h

@@ -3735 +3735 @@
 # define RTCrRandBytes                                  RT_MANGLER(RTCrRandBytes)
 # define RTCrShaCryptGenerateSalt                       RT_MANGLER(RTCrShaCryptGenerateSalt)
+# define RTCrShaCryptGenerateSaltWek                    RT_MANGLER(RTCrShaCryptGenerateSaltWeak)
 # define RTCrShaCrypt256                                RT_MANGLER(RTCrShaCrypt256)
 # define RTCrShaCrypt256ToString                        RT_MANGLER(RTCrShaCrypt256ToString)

trunk/src/VBox/Main/src-server/UnattendedScript.cpp

@@ -656 +656 @@
             uint8_t abHash[a_cbHashSize]; \
             char    szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1]; \
-            int vrc = RTCrShaCryptGenerateSalt(szSalt, RT_SHACRYPT_MAX_SALT_LEN); \
+            int vrc = RTCrShaCryptGenerateSaltWeak(szSalt, RT_SHACRYPT_MAX_SALT_LEN); \
             if (RT_SUCCESS(vrc)) \
             { \

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -665 +665 @@
 }
 
-/* Override RTCrShaCryptGenerateSalt() from IPRT to generate predictable salts to compare the script outputs. */
-DECL_HIDDEN_NOTHROW(int) RTCrShaCryptGenerateSalt(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt)
+/* Override RTCrShaCryptGenerateSaltWeak() from IPRT to generate predictable salts to compare the script outputs. */
+RTR3DECL(int) RTCrShaCryptGenerateSaltWeak(char szSalt[RT_SHACRYPT_MAX_SALT_LEN + 1], size_t cchSalt)
 {
     RT_NOREF(cchSalt);

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

@@ -191 +191 @@
         else
         {
-            rc = RTCrShaCryptGenerateSalt(szSalt, RT_SHACRYPT_MAX_SALT_LEN);
+            rc = RTCrShaCryptGenerateSaltWeak(szSalt, RT_SHACRYPT_MAX_SALT_LEN);
             RTTEST_CHECK_RC_OK(hTest, rc);
             pszSalt = szSalt;