[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  bae39163409ac3b8a1c579c2bcfbdae35370a133 (commit)
      from  70f23648827c2c8e6386e483c557e6e935b3103f (commit)


- Log -----------------------------------------------------------------
commit bae39163409ac3b8a1c579c2bcfbdae35370a133
Author: Disconnect3d <dominik.b.czarnota at gmail.com>
Date:   Thu Feb 11 20:00:40 2021 +0100

    passwd.c: use the actual ROUNDS_DEFAULT macro
    
    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 at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14156)

-----------------------------------------------------------------------

Summary of changes:
 apps/passwd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/passwd.c b/apps/passwd.c
index 08b94622da..6e58112363 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -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;