Commit 7354479
crypto: fix DiffieHellman generator validation
PR-URL: #38311
Fixes: #38302
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>1 parent 5b393d9 commit 7354479
2 files changed
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -122,9 +122,9 @@ function DiffieHellman(sizeOrKey, keyEncoding, generator, genEncoding) { | |||
| 122 | 122 | generator = DH_GENERATOR; | |
| 123 | 123 | } else if (typeof generator === 'number') { | |
| 124 | 124 | validateInt32(generator, 'generator'); | |
| 125 | - } else if (generator !== true) { | ||
| 125 | + } else if (typeof generator === 'string') { | ||
| 126 | 126 | generator = toBuf(generator, genEncoding); | |
| 127 | - } else { | ||
| 127 | + } else if (!isArrayBufferView(generator) && !isAnyArrayBuffer(generator)) { | ||
| 128 | 128 | throw new ERR_INVALID_ARG_TYPE( | |
| 129 | 129 | 'generator', | |
| 130 | 130 | ['number', 'string', 'ArrayBuffer', 'Buffer', 'TypedArray', 'DataView'], | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -495,3 +495,7 @@ assert.throws( | |||
| 495 | 495 | code: 'ERR_INVALID_ARG_TYPE' | |
| 496 | 496 | } | |
| 497 | 497 | ); | |
| 498 | + [true, Symbol(), {}, () => {}, []].forEach((generator) => assert.throws( | ||
| 499 | + () => crypto.createDiffieHellman('', 'base64', generator), | ||
| 500 | + { code: 'ERR_INVALID_ARG_TYPE' } | ||
| 501 | + )); | ||
0 commit comments