wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apps/passwd.c: 32 bits are sufficient to hold ROUNDS_MAX.

Browse source 
Even though C standard defines 'z' modifier, recent mingw compilers break
the contract by defining __STDC_VERSION__ with non-compliant MSVCRT.DLL.
In other words we can't use %zu with mingw, but insteadl of cooking

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2017-03-26 22:38:05 +02:00
parent 165f1c3ef3
commit a4c74e88e4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/passwd.c
View file

@ -502,7 +502,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;
size_t rounds = 5000; /* Default */
unsigned int rounds = 5000; /* Default */
char rounds_custom = 0;
char *p_bytes = NULL;
char *s_bytes = NULL;
@ -539,7 +539,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
else if (srounds < ROUNDS_MIN)
rounds = ROUNDS_MIN;
else
rounds = srounds;
rounds = (unsigned int)srounds;
rounds_custom = 1;
} else {
return NULL;
@ -556,7 +556,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
if (rounds_custom) {
char tmp_buf[80]; /* "rounds=999999999" */
sprintf(tmp_buf, "rounds=%"OSSLzu, rounds);
sprintf(tmp_buf, "rounds=%u", rounds);
OPENSSL_strlcat(out_buf, tmp_buf, sizeof out_buf);
OPENSSL_strlcat(out_buf, "$", sizeof out_buf);
}