crypto: fix DiffieHellman generator validation

PR-URL: #38311 Fixes: #38302 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Minwoo Jung <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
nodejs · Apr 29, 2021 · 7354479 · 7354479
1 parent 5b393d9
commit 7354479
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/internal/crypto/diffiehellman.js b/lib/internal/crypto/diffiehellman.js
@@ -122,9 +122,9 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) {
     generator = DH_GENERATOR;
   } else if (typeof generator === 'number') {
     validateInt32(generator, 'generator');
-  } else if (generator !== true) {
+  } else if (typeof generator === 'string') {
     generator = toBuf(generator, genEncoding);
-  } else {
+  } else if (!isArrayBufferView(generator) && !isAnyArrayBuffer(generator)) {
     throw new ERR_INVALID_ARG_TYPE(
       'generator',
       ['number', 'string', 'ArrayBuffer', 'Buffer', 'TypedArray', 'DataView'],

diff --git a/test/parallel/test-crypto-dh.js b/test/parallel/test-crypto-dh.js
@@ -495,3 +495,7 @@ assert.throws(
     code: 'ERR_INVALID_ARG_TYPE'
   }
 );
+[true, Symbol(), {}, () => {}, []].forEach((generator) => assert.throws(
+  () => crypto.createDiffieHellman('', 'base64', generator),
+  { code: 'ERR_INVALID_ARG_TYPE' }
+));