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

Always zero the argon2 output buffer prior to doing anything

Browse Source 
This is consistent with what we are doing with scrypt.
On error/misuse, the buffer is zeroed; this may prevent bugs with
reused/invalid buffers.
This commit is contained in:
Frank Denis 2017-02-19 12:40:28 +01:00
parent 2c6fb87708
commit e0150faf56
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ crypto_pwhash_argon2i(unsigned char * const out,
unsigned long long opslimit,
size_t memlimit, int alg)
{
memset(out, 0, outlen);
if (alg != crypto_pwhash_argon2i_ALG_ARGON2I13) {
return -1;
}

4
test/default/pwhash.c
View File

@ -166,9 +166,9 @@ static void tv2(void)
salt, 2, 1ULL << 12, crypto_pwhash_alg_default()) != -1) {
printf("[tv2] pwhash should have failed (3)\n");
}
if (crypto_pwhash(out, 0x100000000ULL, "password", strlen("password"),
if (crypto_pwhash(out, 15, "password", strlen("password"),
salt, 3, 1ULL << 12, crypto_pwhash_alg_default()) != -1) {
printf("[tv2] pwhash with a long output length should have failed\n");
printf("[tv2] pwhash with a short output length should have failed\n");
}
if (crypto_pwhash(out, sizeof out, "password", 0x100000000ULL,
salt, 3, 1ULL << 12, crypto_pwhash_alg_default()) != -1) {