crypto: fix randomInt range check

tniessen · richardlau · commit a12d92c97ba0 · 2020-09-07T12:29:51.000-04:00
Refs: #34600 PR-URL: #35052 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Denys Otrishko <shishugi@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
diff --git a/lib/internal/crypto/random.js b/lib/internal/crypto/random.js
@@ -149,8 +149,8 @@ function randomInt(min, max, callback) {
   if (!NumberIsSafeInteger(max)) {
     throw new ERR_INVALID_ARG_TYPE('max', 'safe integer', max);
   }
-  if (!(max >= min)) {
-    throw new ERR_OUT_OF_RANGE('max', `>= ${min}`, max);
+  if (max <= min) {
+    throw new ERR_OUT_OF_RANGE('max', `> ${min}`, max);
   }
 
   // First we generate a random int between [0..range)
diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js
@@ -456,13 +456,16 @@ assert.throws(
     }
   );
 
-  crypto.randomInt(0, common.mustCall());
-  crypto.randomInt(0, 0, common.mustCall());
-  assert.throws(() => crypto.randomInt(-1, common.mustNotCall()), {
-    code: 'ERR_OUT_OF_RANGE',
-    name: 'RangeError',
-    message: 'The value of "max" is out of range. It must be >= 0. Received -1'
-  });
+  crypto.randomInt(1, common.mustCall());
+  crypto.randomInt(0, 1, common.mustCall());
+  for (const arg of [[0], [1, 1], [3, 2], [-5, -5], [11, -10]]) {
+    assert.throws(() => crypto.randomInt(...arg, common.mustNotCall()), {
+      code: 'ERR_OUT_OF_RANGE',
+      name: 'RangeError',
+      message: 'The value of "max" is out of range. It must be > ' +
+               `${arg[arg.length - 2] || 0}. Received ${arg[arg.length - 1]}`
+    });
+  }
 
   const MAX_RANGE = 0xFFFF_FFFF_FFFF;
   crypto.randomInt(MAX_RANGE, common.mustCall());

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,8 @@ function randomInt(min, max, callback) {`
`149`	`149`	`if (!NumberIsSafeInteger(max)) {`
`150`	`150`	`throw new ERR_INVALID_ARG_TYPE('max', 'safe integer', max);`
`151`	`151`	`}`
`152`		`- if (!(max >= min)) {`
`153`		- throw new ERR_OUT_OF_RANGE('max', `>= ${min}`, max);
	`152`	`+ if (max <= min) {`
	`153`	+ throw new ERR_OUT_OF_RANGE('max', `> ${min}`, max);
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`// First we generate a random int between [0..range)`