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>
nodejs · Mar 28, 2019 · b922e77 · b922e77
1 parent 4650436
commit b922e77
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/internal/crypto/sig.js b/lib/internal/crypto/sig.js
@@ -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 {

diff --git a/test/parallel/test-crypto-sign-verify.js b/test/parallel/test-crypto-sign-verify.js
@@ -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
@@ -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')