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

Merge pull request #149 from jvarho/divide-by-zero-fix

Browse Source 
Check r and p against zero before dividing
This commit is contained in:
Frank Denis 2014-05-08 08:07:50 -07:00
commit 4722990ec3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libsodium/crypto_pwhash/scryptxsalsa208sha256/nosse/pwhash_scryptxsalsa208sha256.c
View File

@ -248,6 +248,10 @@ escrypt_kdf_nosse(escrypt_local_t * local,
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if (r == 0 || p == 0) {
errno = EINVAL;
return -1;
}
if ((r > SIZE_MAX / 128 / p) || if ((r > SIZE_MAX / 128 / p) ||
#if SIZE_MAX / 256 <= UINT32_MAX #if SIZE_MAX / 256 <= UINT32_MAX
(r > SIZE_MAX / 256) || (r > SIZE_MAX / 256) ||

4
src/libsodium/crypto_pwhash/scryptxsalsa208sha256/sse/pwhash_scryptxsalsa208sha256.c
View File

@ -334,6 +334,10 @@ escrypt_kdf_sse(escrypt_local_t * local,
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if (r == 0 || p == 0) {
errno = EINVAL;
return -1;
}
if ((r > SIZE_MAX / 128 / p) || if ((r > SIZE_MAX / 128 / p) ||
#if SIZE_MAX / 256 <= UINT32_MAX #if SIZE_MAX / 256 <= UINT32_MAX
(r > SIZE_MAX / 256) || (r > SIZE_MAX / 256) ||