VirtualBox

Changeset 102296 in vbox


Ignore:
Timestamp:
Nov 24, 2023 3:49:29 PM (16 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
160430
Message:

IPRT/crypto/shacrypt: Renaming (RTShaCryptXXX -> RTCrShaCryptXXX) + docs groups. bugref:10551

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/iprt/crypto/shacrypt.h

    r102294 r102296  
    4343
    4444
     45RT_C_DECLS_BEGIN
     46
     47/** @defgroup grp_rt_crshacrypt   RTCrShaCrypt - SHAcrypt functions
     48 * @ingroup grp_rt
     49 * @{
     50 */
     51
    4552/** Default number of rounds for SHA-crypt 256/512. */
    4653#define RT_SHACRYPT_DEFAULT_ROUNDS 5000
    … …  
    5057#define RT_SHACRYPT_MAX_SALT_LEN   16
    5158
    52 RT_C_DECLS_BEGIN
    5359
    5460/**
    … …  
    6470 * @note    This implements SHA-crypt.txt Version: 0.6 2016-8-31.
    6571 */
    66 RTR3DECL(int) RTShaCrypt256(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA256_HASH_SIZE]);
     72RTR3DECL(int) RTCrShaCrypt256(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA256_HASH_SIZE]);
     73
    6774
    6875/**
    … …  
    7885 * @note    This implements step 22 of SHA-crypt.txt Version: 0.6 2016-8-31.
    7986 */
    80 RTR3DECL(int) RTShaCrypt256ToString(uint8_t abHash[RTSHA256_HASH_SIZE], const char *pszSalt, uint32_t cRounds, char *pszString, size_t cbString);
     87RTR3DECL(int) RTCrShaCrypt256ToString(uint8_t abHash[RTSHA256_HASH_SIZE], const char *pszSalt, uint32_t cRounds, char *pszString, size_t cbString);
    8188
    8289
    … …  
    93100 * @note    This implements SHA-crypt.txt Version: 0.6 2016-8-31.
    94101 */
    95 RTR3DECL(int) RTShaCrypt512(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA512_HASH_SIZE]);
     102RTR3DECL(int) RTCrShaCrypt512(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA512_HASH_SIZE]);
    96103
    97104
    … …  
    108115 * @note    This implements step 22 of SHA-crypt.txt Version: 0.6 2016-8-31.
    109116 */
    110 RTR3DECL(int) RTShaCrypt512ToString(uint8_t abHash[RTSHA512_HASH_SIZE], const char *pszSalt, uint32_t cRounds, char *pszString, size_t cbString);
     117RTR3DECL(int) RTCrShaCrypt512ToString(uint8_t abHash[RTSHA512_HASH_SIZE], const char *pszSalt, uint32_t cRounds, char *pszString, size_t cbString);
     118
     119/** @} */
    111120
    112121RT_C_DECLS_END

  • trunk/include/iprt/mangling.h

    r102289 r102296  
    22002200# define RTSha3t512ToString                             RT_MANGLER(RTSha3t512ToString)
    22012201# define RTSha3t512Update                               RT_MANGLER(RTSha3t512Update)
    2202 # define RTShaCrypt256                                  RT_MANGLER(RTShaCrypt256)
    2203 # define RTShaCrypt256ToString                          RT_MANGLER(RTShaCrypt256ToString)
    2204 # define RTShaCrypt512                                  RT_MANGLER(RTShaCrypt512)
    2205 # define RTShaCrypt512ToString                          RT_MANGLER(RTShaCrypt512ToString)
    22062202# define RTShMemClose                                   RT_MANGLER(RTShMemClose)
    22072203# define RTShMemDelete                                  RT_MANGLER(RTShMemDelete)
    … …  
    37383734# define RTCrPkixCanCertHandleDigestType                RT_MANGLER(RTCrPkixCanCertHandleDigestType)
    37393735# define RTCrRandBytes                                  RT_MANGLER(RTCrRandBytes)
     3736# define RTCrShaCrypt256                                RT_MANGLER(RTCrShaCrypt256)
     3737# define RTCrShaCrypt256ToString                        RT_MANGLER(RTCrShaCrypt256ToString)
     3738# define RTCrShaCrypt512                                RT_MANGLER(RTCrShaCrypt512)
     3739# define RTCrShaCrypt512ToString                        RT_MANGLER(RTCrShaCrypt512ToString)
    37403740# define RTCrSpcAttributeTypeAndOptionalValue_SetPeImage RT_MANGLER(RTCrSpcAttributeTypeAndOptionalValue_SetPeImage)
    37413741# define RTCrSpcAttributeTypeAndOptionalValue_DecodeAsn1 RT_MANGLER(RTCrSpcAttributeTypeAndOptionalValue_DecodeAsn1)

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

    r102294 r102296  
    4848
    4949
    50 RTR3DECL(int) RTShaCrypt256(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA256_HASH_SIZE])
     50RTR3DECL(int) RTCrShaCrypt256(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA256_HASH_SIZE])
    5151{
    5252    AssertPtrReturn(pszKey,   VERR_INVALID_POINTER);
    … …  
    172172
    173173
    174 RTR3DECL(int) RTShaCrypt256ToString(uint8_t abHash[RTSHA256_HASH_SIZE], const char *pszSalt, uint32_t cRounds,
    175                                     char *pszString, size_t cbString)
     174RTR3DECL(int) RTCrShaCrypt256ToString(uint8_t abHash[RTSHA256_HASH_SIZE], const char *pszSalt, uint32_t cRounds,
     175                                      char *pszString, size_t cbString)
    176176{
    177177    AssertPtrReturn(pszSalt,   VERR_INVALID_POINTER);
    … …  
    222222
    223223
    224 RTR3DECL(int) RTShaCrypt512(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA512_HASH_SIZE])
     224RTR3DECL(int) RTCrShaCrypt512(const char *pszKey, const char *pszSalt, uint32_t cRounds, uint8_t abHash[RTSHA512_HASH_SIZE])
    225225{
    226226    AssertPtrReturn(pszKey,   VERR_INVALID_POINTER);
    … …  
    346346
    347347
    348 RTR3DECL(int) RTShaCrypt512ToString(uint8_t abHash[RTSHA512_HASH_SIZE], const char *pszSalt, uint32_t cRounds,
    349                                     char *pszString, size_t cbString)
     348RTR3DECL(int) RTCrShaCrypt512ToString(uint8_t abHash[RTSHA512_HASH_SIZE], const char *pszSalt, uint32_t cRounds,
     349                                      char *pszString, size_t cbString)
    350350{
    351351    AssertPtrReturn(pszSalt,   VERR_INVALID_POINTER);

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

    r102289 r102296  
    212212        {
    213213            case TST_DIGESTTYPE_SHA256:
    214                 rc = RTShaCrypt256(g_aTests[i].pszPassword, pszSalt, cRounds, abDigest);
     214                rc = RTCrShaCrypt256(g_aTests[i].pszPassword, pszSalt, cRounds, abDigest);
    215215                break;
    216216
    217217            case TST_DIGESTTYPE_SHA512:
    218                 rc = RTShaCrypt512(g_aTests[i].pszPassword, pszSalt, cRounds, abDigest);
     218                rc = RTCrShaCrypt512(g_aTests[i].pszPassword, pszSalt, cRounds, abDigest);
    219219                break;
    220220
    … …  
    232232            {
    233233                case TST_DIGESTTYPE_SHA256:
    234                     rc = RTShaCrypt256ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
     234                    rc = RTCrShaCrypt256ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
    235235                    break;
    236236
    237237                case TST_DIGESTTYPE_SHA512:
    238                     rc = RTShaCrypt512ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
     238                    rc = RTCrShaCrypt512ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
    239239                    break;
    240240

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

    r102291 r102296  
    183183        case RTMKPASSWORD_METHODTYPE_SHA256:
    184184        {
    185             rc = RTShaCrypt256(pszKey, pszSalt, cRounds, abDigest);
     185            rc = RTCrShaCrypt256(pszKey, pszSalt, cRounds, abDigest);
    186186            if (RT_SUCCESS(rc))
    187                 rc = RTShaCrypt256ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
     187                rc = RTCrShaCrypt256ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
    188188            break;
    189189        }
    … …  
    191191        case RTMKPASSWORD_METHODTYPE_SHA512:
    192192        {
    193             rc = RTShaCrypt512(pszKey, pszSalt, cRounds, abDigest);
     193            rc = RTCrShaCrypt512(pszKey, pszSalt, cRounds, abDigest);
    194194            if (RT_SUCCESS(rc))
    195                 rc = RTShaCrypt512ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
     195                rc = RTCrShaCrypt512ToString(abDigest, pszSalt, cRounds, szResult, sizeof(szResult));
    196196            break;
    197197        }
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette