Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
crypto: allow undefined for saltLength and padding
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>
  • Loading branch information
tniessen authored and Yann Stephan committed Mar 28, 2019
commit f04bc6ab5983bb6a469594969154d3410b9941de
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