Skip to content

Commit 2e62e1d

Browse files
committed
crypto: fix Argon2 validation errors
Report the correct parameter name for invalid optional inputs. Signed-off-by: Filip Skokan <panva.ip@gmail.com>
1 parent e7904d4 commit 2e62e1d

2 files changed

Lines changed: 14 additions & 2 deletions

File tree

lib/internal/crypto/argon2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ function check(algorithm, parameters) {
169169
if (parameters.secret === undefined) {
170170
secret = new Uint8Array(0);
171171
} else {
172-
secret = getArrayBufferOrView(parameters.secret);
172+
secret = getArrayBufferOrView(parameters.secret, 'parameters.secret');
173173
validateInteger(secret.byteLength, 'parameters.secret.byteLength', 0, MAX_POSITIVE_UINT_32);
174174
}
175175

176176
let associatedData;
177177
if (parameters.associatedData === undefined) {
178178
associatedData = new Uint8Array(0);
179179
} else {
180-
associatedData = getArrayBufferOrView(parameters.associatedData);
180+
associatedData = getArrayBufferOrView(parameters.associatedData, 'parameters.associatedData');
181181
validateInteger(associatedData.byteLength, 'parameters.associatedData.byteLength', 0, MAX_POSITIVE_UINT_32);
182182
}
183183

test/parallel/test-crypto-argon2.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,18 @@ for (const key of Object.keys(defaults)) {
140140
assert.throws(() => crypto.argon2Sync('argon2id', parameters), expected);
141141
}
142142

143+
for (const key of ['secret', 'associatedData']) {
144+
const expected = {
145+
code: 'ERR_INVALID_ARG_TYPE',
146+
message: new RegExp(`"parameters\\.${key}"`),
147+
};
148+
for (const value of [123, null, true, {}, []]) {
149+
const parameters = { ...defaults, [key]: value };
150+
assert.throws(() => crypto.argon2('argon2id', parameters, () => {}), expected);
151+
assert.throws(() => crypto.argon2Sync('argon2id', parameters), expected);
152+
}
153+
}
154+
143155
{
144156
const expected = { code: 'ERR_INVALID_ARG_TYPE' };
145157
assert.throws(() => crypto.argon2(), expected);

0 commit comments

Comments
 (0)