Skip to content

Commit

Permalink
crypto: allow undefined for saltLength and padding
Browse files Browse the repository at this point in the history
PR-URL: #26921
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Signed-off-by: Beth Griggs <Bethany.Griggs@uk.ibm.com>
  • Loading branch information
tniessen authored and BethGriggs committed Apr 8, 2019
1 parent a821a96 commit 98552f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions lib/internal/crypto/sig.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ function getSaltLength(options) {
}

function getIntOption(name, defaultValue, options) {
if (options.hasOwnProperty(name)) {
const value = options[name];
const value = options[name];
if (value !== undefined) {
if (value === value >> 0) {
return value;
} else {
Expand Down
10 changes: 5 additions & 5 deletions test/parallel/test-crypto-sign-verify.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,23 @@ const modSize = 1024;
common.expectsError(
() => crypto.createVerify('SHA256').verify({
key: certPem,
padding: undefined,
padding: null,
}, ''),
{
code: 'ERR_INVALID_OPT_VALUE',
type: TypeError,
message: 'The value "undefined" is invalid for option "padding"'
message: 'The value "null" is invalid for option "padding"'
});

common.expectsError(
() => crypto.createVerify('SHA256').verify({
key: certPem,
saltLength: undefined,
saltLength: null,
}, ''),
{
code: 'ERR_INVALID_OPT_VALUE',
type: TypeError,
message: 'The value "undefined" is invalid for option "saltLength"'
message: 'The value "null" is invalid for option "saltLength"'
});

// Test signing and verifying
Expand Down Expand Up @@ -233,7 +233,7 @@ common.expectsError(

// Test exceptions for invalid `padding` and `saltLength` values
{
[null, undefined, NaN, 'boom', {}, [], true, false]
[null, NaN, 'boom', {}, [], true, false]
.forEach((invalidValue) => {
common.expectsError(() => {
crypto.createSign('SHA256')
Expand Down

0 comments on commit 98552f3

Please sign in to comment.