Skip to content

Reject zero r or p in reference scrypt #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
achimala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reject zero r or p in reference scrypt #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FORMAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ offset length
0 6 "scrypt"
6 1 scrypt data file version number (== 0)
7 1 log2(N) (must be between 1 and 63 inclusive)
8 4 r (big-endian integer; must satisfy r * p < 2^30)
12 4 p (big-endian integer; must satisfy r * p < 2^30)
8 4 r (big-endian integer; must satisfy 0 < r * p < 2^30)
12 4 p (big-endian integer; must satisfy 0 < r * p < 2^30)
16 32 salt
48 16 first 16 bytes of SHA256(bytes 0 .. 47)
64 32 HMAC-SHA256(bytes 0 .. 63)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ https://en.wikipedia.org/wiki/Key_derivation_function) (KDF) with
* scrypt_kdf(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
* Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
* p, buflen) and write the result into buf. The parameters r, p, and buflen
* must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N
* must be a power of 2 greater than 1.
* must satisfy 0 < r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter
* N must be a power of 2 greater than 1.
*
* Return 0 on success; or -1 on error.
*/
Expand Down
8 changes: 6 additions & 2 deletions lib/crypto/crypto_scrypt-ref.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ smix(uint8_t * B, size_t r, uint64_t N, uint8_t * V, uint8_t * XY)
* crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
* Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
* p, buflen) and write the result into buf. The parameters r, p, and buflen
* must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N
* must be a power of 2.
* must satisfy 0 < r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter
* N must be a power of 2.
*
* Return 0 on success; or -1 on error.
*/
Expand All @@ -222,6 +222,10 @@ crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
uint32_t i;

/* Sanity-check parameters. */
if ((r == 0) || (p == 0)) {
errno = EINVAL;
goto err0;
}
#if SIZE_MAX > UINT32_MAX
if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
errno = EFBIG;
Expand Down
4 changes: 2 additions & 2 deletions libscrypt-kdf/scrypt-kdf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ extern "C" {
* scrypt_kdf(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen):
* Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
* p, buflen) and write the result into buf. The parameters r, p, and buflen
* must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N
* must be a power of 2 greater than 1.
* must satisfy 0 < r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter
* N must be a power of 2 greater than 1.
*
* Return 0 on success; or -1 on error.
*/
Expand Down
Loading