Skip to content
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

Jump to bottom

crypto: restrict PBKDF2 args to signed int #44575

Merged
merged 1 commit into from Sep 10, 2022
Merged

crypto: restrict PBKDF2 args to signed int #44575

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/internal/crypto/pbkdf2.js
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ const {

const {
validateFunction,
validateInt32,
validateInteger,
validateString,
validateUint32,
Expand Down Expand Up @@ -91,8 +92,10 @@ function check(password, salt, iterations, keylen, digest) {

password = getArrayBufferOrView(password, 'password');
salt = getArrayBufferOrView(salt, 'salt');
validateUint32(iterations, 'iterations', true);
validateUint32(keylen, 'keylen');
// OpenSSL uses a signed int to represent these values, so we are restricted
// to the 31-bit range here (which is plenty).
validateInt32(iterations, 'iterations', 1);
validateInt32(keylen, 'keylen', 0);

return { password, salt, iterations, keylen, digest };
}
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-crypto-pbkdf2.js
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ assert.throws(
}
);

for (const iterations of [-1, 0]) {
for (const iterations of [-1, 0, 2147483648]) {
assert.throws(
() => crypto.pbkdf2Sync('password', 'salt', iterations, 20, 'sha1'),
{
Expand Down Expand Up @@ -98,7 +98,7 @@ for (const iterations of [-1, 0]) {
});
});

[-1, 4294967297].forEach((input) => {
[-1, 2147483648, 4294967296].forEach((input) => {
assert.throws(
() => {
crypto.pbkdf2('password', 'salt', 1, input, 'sha256',
Expand Down