crypto: reuse enforceRange option object for WebIDL integer members

The inline `[EnforceRange] unsigned short/long/octet` wrappers spread
the per-member opts object into a new one solely to set
`enforceRange: true`. Replace the 18 inline wrappers with shared
helpers that mutate the caller-supplied opts in place.

Signed-off-by: Filip Skokan <panva.ip@gmail.com>

Author: panva

lib/internal/crypto/webidl.js

@@ -147,6 +147,23 @@ converters.octet = createIntegerConversion(8);
 converters['unsigned short'] = createIntegerConversion(16);
 converters['unsigned long'] = createIntegerConversion(32);
 
+// Shared helpers for `[EnforceRange] unsigned short/long/octet` dictionary
+// members. Dictionary converters always call members with a freshly allocated
+// `{ __proto__: null, prefix, context }` options object, so it is safe to
+// mutate it to set `enforceRange` instead of spreading it into a new object.
+const enforceRangeOctet = (V, opts) => {
+  opts.enforceRange = true;
+  return converters.octet(V, opts);
+};
+const enforceRangeUnsignedShort = (V, opts) => {
+  opts.enforceRange = true;
+  return converters['unsigned short'](V, opts);
+};
+const enforceRangeUnsignedLong = (V, opts) => {
+  opts.enforceRange = true;
+  return converters['unsigned long'](V, opts);
+};
+
 converters.DOMString = function(V, opts = kEmptyObject) {
   if (typeof V === 'string') {
     return V;
@@ -346,8 +363,7 @@ const dictRsaKeyGenParams = [
   ...new SafeArrayIterator(dictAlgorithm),
   {
     key: 'modulusLength',
-    converter: (V, opts) =>
-      converters['unsigned long'](V, { ...opts, enforceRange: true }),
+    converter: enforceRangeUnsignedLong,
     required: true,
   },
   {
@@ -411,8 +427,7 @@ converters.AesKeyGenParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'length',
-      converter: (V, opts) =>
-        converters['unsigned short'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedShort,
       validator: AESLengthValidator,
       required: true,
     },
@@ -432,8 +447,7 @@ converters.RsaPssParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'saltLength',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       required: true,
     },
   ]);
@@ -470,8 +484,7 @@ for (const { 0: name, 1: zeroError } of [['HmacKeyGenParams', 'OperationError'],
       },
       {
         key: 'length',
-        converter: (V, opts) =>
-          converters['unsigned long'](V, { ...opts, enforceRange: true }),
+        converter: enforceRangeUnsignedLong,
         validator: validateMacKeyLength(`${name}.length`, zeroError),
       },
     ]);
@@ -547,8 +560,7 @@ converters.CShakeParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'outputLength',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, opts) => {
         // The Web Crypto spec allows for SHAKE output length that are not multiples of
         // 8. We don't.
@@ -580,8 +592,7 @@ converters.Pbkdf2Params = createDictionaryConverter(
     },
     {
       key: 'iterations',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, dict) => {
         if (V === 0)
           throw lazyDOMException('iterations cannot be zero', 'OperationError');
@@ -600,8 +611,7 @@ converters.AesDerivedKeyParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'length',
-      converter: (V, opts) =>
-        converters['unsigned short'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedShort,
       validator: AESLengthValidator,
       required: true,
     },
@@ -645,8 +655,7 @@ converters.AeadParams = createDictionaryConverter(
     },
     {
       key: 'tagLength',
-      converter: (V, opts) =>
-        converters.octet(V, { ...opts, enforceRange: true }),
+      converter: enforceRangeOctet,
       validator: (V, dict) => {
         switch (StringPrototypeToLowerCase(dict.name)) {
           case 'chacha20-poly1305':
@@ -691,8 +700,7 @@ converters.AesCtrParams = createDictionaryConverter(
     },
     {
       key: 'length',
-      converter: (V, opts) =>
-        converters.octet(V, { ...opts, enforceRange: true }),
+      converter: enforceRangeOctet,
       validator: (V, dict) => {
         if (V === 0 || V > 128)
           throw lazyDOMException(
@@ -756,8 +764,7 @@ converters.Argon2Params = createDictionaryConverter(
     },
     {
       key: 'parallelism',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, dict) => {
         if (V === 0 || V > MathPow(2, 24) - 1) {
           throw lazyDOMException(
@@ -769,8 +776,7 @@ converters.Argon2Params = createDictionaryConverter(
     },
     {
       key: 'memory',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, dict) => {
         if (V < 8 * dict.parallelism) {
           throw lazyDOMException(
@@ -782,14 +788,12 @@ converters.Argon2Params = createDictionaryConverter(
     },
     {
       key: 'passes',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       required: true,
     },
     {
       key: 'version',
-      converter: (V, opts) =>
-        converters.octet(V, { ...opts, enforceRange: true }),
+      converter: enforceRangeOctet,
       validator: (V, dict) => {
         if (V !== 0x13) {
           throw lazyDOMException(
@@ -825,8 +829,7 @@ for (const { 0: name, 1: zeroError } of [['KmacKeyGenParams', 'OperationError'],
       ...new SafeArrayIterator(dictAlgorithm),
       {
         key: 'length',
-        converter: (V, opts) =>
-          converters['unsigned long'](V, { ...opts, enforceRange: true }),
+        converter: enforceRangeUnsignedLong,
         validator: validateMacKeyLength(`${name}.length`, zeroError),
       },
     ]);
@@ -837,8 +840,7 @@ converters.KmacParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'outputLength',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, opts) => {
         // The Web Crypto spec allows for KMAC output length that are not multiples of 8. We don't.
         if (V % 8)
@@ -857,8 +859,7 @@ converters.KangarooTwelveParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'outputLength',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, opts) => {
         if (V === 0 || V % 8)
           throw lazyDOMException('Invalid KangarooTwelveParams outputLength', 'OperationError');
@@ -876,8 +877,7 @@ converters.TurboShakeParams = createDictionaryConverter(
     ...new SafeArrayIterator(dictAlgorithm),
     {
       key: 'outputLength',
-      converter: (V, opts) =>
-        converters['unsigned long'](V, { ...opts, enforceRange: true }),
+      converter: enforceRangeUnsignedLong,
       validator: (V, opts) => {
         if (V === 0 || V % 8)
           throw lazyDOMException('Invalid TurboShakeParams outputLength', 'OperationError');
@@ -886,8 +886,7 @@ converters.TurboShakeParams = createDictionaryConverter(
     },
     {
       key: 'domainSeparation',
-      converter: (V, opts) =>
-        converters.octet(V, { ...opts, enforceRange: true }),
+      converter: enforceRangeOctet,
       validator: (V) => {
         if (V < 0x01 || V > 0x7F) {
           throw lazyDOMException(