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

Revert "scrypt: reject r == 0 and p == 0"

Browse Source 
This reverts commit 00c8ecd1c492cf5c6599ff5b8c28ed35d54cf2a1.
This commit is contained in:
Frank Denis 2019-06-01 15:33:51 +02:00
parent 6e4c496171
commit c322b1a63c
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
View File

@ -305,10 +305,6 @@ escrypt_kdf_nosse(escrypt_local_t *local, const uint8_t *passwd,
uint32_t i;
/* Sanity-check parameters. */
if (r == 0 || p == 0) {
errno = EINVAL;
return -1;
}
#if SIZE_MAX > UINT32_MAX
if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
errno = EFBIG;

4
src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
View File

@ -317,10 +317,6 @@ escrypt_kdf_sse(escrypt_local_t *local, const uint8_t *passwd, size_t passwdlen,
uint32_t i;
/* Sanity-check parameters. */
if (r == 0 || p == 0) {
errno = EINVAL;
return -1;
}
# if SIZE_MAX > UINT32_MAX
/* LCOV_EXCL_START */
if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {