cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid duplicate initializations; reorder for consistency w/ decl

Browse Source
This commit is contained in:
Frank Denis 2017-09-10 22:19:51 +02:00
parent 81cf1ff6d1
commit 1aae564da3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c
View File

@ -236,10 +236,10 @@ _needs_rehash(const char *str, unsigned long long opslimit, size_t memlimit,
if ((fodder = (unsigned char *) calloc(fodder_len, 1U)) == NULL) { if ((fodder = (unsigned char *) calloc(fodder_len, 1U)) == NULL) {
return -1; return -1;
} }
ctx.salt = ctx.pwd = ctx.salt = ctx.out = fodder; ctx.out = ctx.pwd = ctx.salt = fodder;
ctx.saltlen = ctx.pwdlen = ctx.saltlen = ctx.outlen = (uint32_t) fodder_len; ctx.outlen = ctx.pwdlen = ctx.saltlen = (uint32_t) fodder_len;
ctx.ad = ctx.secret = NULL; ctx.ad = ctx.secret = NULL;
ctx.adlen = ctx.secretlen = 0U; ctx.adlen = ctx.secretlen = 0U;
if (decode_string(&ctx, str, type) != 0) { if (decode_string(&ctx, str, type) != 0) {
errno = EINVAL; errno = EINVAL;
ret = -1; ret = -1;