crypto: fix webcrypto EC key namedCurve validation errors

panva · panva · commit 878bd13878c0 · 2022-09-30T14:03:45.000+02:00
PR-URL: nodejs#44172 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Backport-PR-URL: nodejs#44837
diff --git a/lib/internal/crypto/ec.js b/lib/internal/crypto/ec.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const {
+  ArrayPrototypeIncludes,
   ObjectKeys,
   Promise,
   SafeSet,
@@ -17,11 +18,6 @@ const {
   kSigEncP1363,
 } = internalBinding('crypto');
 
-const {
-  validateOneOf,
-  validateString,
-} = require('internal/validators');
-
 const {
   codes: {
     ERR_MISSING_OPTION,
@@ -88,11 +84,12 @@ function createECPublicKeyRaw(namedCurve, keyData) {
 
 async function ecGenerateKey(algorithm, extractable, keyUsages) {
   const { name, namedCurve } = algorithm;
-  validateString(namedCurve, 'algorithm.namedCurve');
-  validateOneOf(
-    namedCurve,
-    'algorithm.namedCurve',
-    ObjectKeys(kNamedCurveAliases));
+
+  if (!ArrayPrototypeIncludes(ObjectKeys(kNamedCurveAliases), namedCurve)) {
+    throw lazyDOMException(
+      'Unrecognized namedCurve',
+      'NotSupportedError');
+  }
 
   const usageSet = new SafeSet(keyUsages);
   switch (name) {
@@ -168,11 +165,13 @@ async function ecImportKey(
   keyUsages) {
 
   const { name, namedCurve } = algorithm;
-  validateString(namedCurve, 'algorithm.namedCurve');
-  validateOneOf(
-    namedCurve,
-    'algorithm.namedCurve',
-    ObjectKeys(kNamedCurveAliases));
+
+  if (!ArrayPrototypeIncludes(ObjectKeys(kNamedCurveAliases), namedCurve)) {
+    throw lazyDOMException(
+      'Unrecognized namedCurve',
+      'NotSupportedError');
+  }
+
   let keyObject;
   const usagesSet = new SafeSet(keyUsages);
   switch (format) {
diff --git a/test/parallel/test-webcrypto-keygen.js b/test/parallel/test-webcrypto-keygen.js
@@ -452,7 +452,7 @@ const vectors = {
     [1, true, {}, [], undefined, null].forEach(async (namedCurve) => {
       await assert.rejects(
         subtle.generateKey({ name, namedCurve }, true, privateUsages), {
-          code: 'ERR_INVALID_ARG_TYPE'
+          name: 'NotSupportedError'
         });
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ const vectors = {`
`452`	`452`	`[1, true, {}, [], undefined, null].forEach(async (namedCurve) => {`
`453`	`453`	`await assert.rejects(`
`454`	`454`	`subtle.generateKey({ name, namedCurve }, true, privateUsages), {`
`455`		`- code: 'ERR_INVALID_ARG_TYPE'`
	`455`	`+ name: 'NotSupportedError'`
`456`	`456`	`});`
`457`	`457`	`});`
`458`	`458`	`}`