crypto: fix DiffieHellman argument validation

Fixes: #37808
nodejs · Mar 19, 2021 · 5aa7b2c · 5aa7b2c
1 parent 52f9aaf
commit 5aa7b2c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
@@ -122,8 +122,15 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) {
     generator = DH_GENERATOR;
   else if (typeof generator === 'number')
     validateInt32(generator, 'generator');
-  else
+  else if (generator !== true)
     generator = toBuf(generator, genEncoding);
+  else
+    throw new ERR_INVALID_ARG_TYPE(
+      'generator',
+      ['number', 'string', 'ArrayBuffer', 'Buffer', 'TypedArray', 'DataView'],
+      generator
+    );
+
 
   this[kHandle] = new _DiffieHellman(sizeOrKey, generator);
   ObjectDefineProperty(this, 'verifyError', {

diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
@@ -489,3 +489,9 @@ assert.throws(
   'crypto.getDiffieHellman(\'modp1\').setPublicKey(\'\') ' +
   'failed to throw the expected error.'
 );
+assert.throws(
+  () => crypto.createDiffieHellman('', true),
+  {
+    code: 'ERR_INVALID_ARG_TYPE'
+  }
+);