Changeset 102335 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

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

160471

Message:

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

Location:

trunk/include/iprt

Files:

• crypto/shacrypt.h (modified) (4 diffs)
• mangling.h (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)