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

pwhash never supported "in-place" operation - return EINVAL

Browse Source
This commit is contained in:
Frank Denis 2020-11-24 22:50:15 +01:00
parent 96c65593bc
commit df83ed9235
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,10 @@ crypto_pwhash_argon2i(unsigned char *const out, unsigned long long outlen,
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if ((const void *) out == (const void *) passwd) {
errno = EINVAL;
return -1;
}
switch (alg) { switch (alg) {
case crypto_pwhash_argon2i_ALG_ARGON2I13: case crypto_pwhash_argon2i_ALG_ARGON2I13:
if (argon2i_hash_raw((uint32_t) opslimit, (uint32_t) (memlimit / 1024U), if (argon2i_hash_raw((uint32_t) opslimit, (uint32_t) (memlimit / 1024U),

4
src/libsodium/crypto_pwhash/argon2/pwhash_argon2id.c
View File

@ -159,6 +159,10 @@ crypto_pwhash_argon2id(unsigned char *const out, unsigned long long outlen,
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if ((const void *) out == (const void *) passwd) {
errno = EINVAL;
return -1;
}
switch (alg) { switch (alg) {
case crypto_pwhash_argon2id_ALG_ARGON2ID13: case crypto_pwhash_argon2id_ALG_ARGON2ID13:
if (argon2id_hash_raw((uint32_t) opslimit, (uint32_t) (memlimit / 1024U), if (argon2id_hash_raw((uint32_t) opslimit, (uint32_t) (memlimit / 1024U),

4
src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
View File

@ -176,6 +176,10 @@ crypto_pwhash_scryptsalsa208sha256(unsigned char *const out,
errno = EINVAL; /* LCOV_EXCL_LINE */ errno = EINVAL; /* LCOV_EXCL_LINE */
return -1; /* LCOV_EXCL_LINE */ return -1; /* LCOV_EXCL_LINE */
} }
if ((const void *) out == (const void *) passwd) {
errno = EINVAL;
return -1;
}
return crypto_pwhash_scryptsalsa208sha256_ll( return crypto_pwhash_scryptsalsa208sha256_ll(
(const uint8_t *) passwd, (size_t) passwdlen, (const uint8_t *) salt, (const uint8_t *) passwd, (size_t) passwdlen, (const uint8_t *) salt,
crypto_pwhash_scryptsalsa208sha256_SALTBYTES, (uint64_t)(1) << N_log2, crypto_pwhash_scryptsalsa208sha256_SALTBYTES, (uint64_t)(1) << N_log2,