]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
passwd.c: use the actual ROUNDS_DEFAULT macro
authorDisconnect3d <dominik.b.czarnota@gmail.com>
Thu, 11 Feb 2021 19:00:40 +0000 (20:00 +0100)
committerPauli <ppzgs1@gmail.com>
Sat, 13 Feb 2021 03:45:26 +0000 (13:45 +1000)
Before this commit, the `ROUNDS_DEFAULT` macro was not used at all, while defined in the source code.
Instead, a `unsigned int rounds = 5000;` was set, which uses the same value.

This commit changes the `5000` to `ROUNDS_DEFAULT`.

CLA: trivial

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14156)

apps/passwd.c

index 08b94622da204a03cc9d6c4e770122a401ea3139..6e5811236311b214b91407e7cdfcb055b129ece5 100644 (file)
@@ -516,7 +516,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
     EVP_MD_CTX *md = NULL, *md2 = NULL;
     const EVP_MD *sha = NULL;
     size_t passwd_len, salt_len, magic_len;
-    unsigned int rounds = 5000;        /* Default */
+    unsigned int rounds = ROUNDS_DEFAULT;        /* Default */
     char rounds_custom = 0;
     char *p_bytes = NULL;
     char *s_bytes = NULL;