crypto: use DataError for CFRG webcrypto raw and jwk import key checks

panva · danielleadams · commit 621e3c9cd4b2 · 2023-01-03T08:39:03.000-05:00
PR-URL: #45569 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/lib/internal/crypto/cfrg.js b/lib/internal/crypto/cfrg.js
@@ -90,19 +90,19 @@ function createCFRGRawKey(name, keyData, isPublic) {
     case 'X25519':
       if (keyData.byteLength !== 32) {
         throw lazyDOMException(
-          `${name} raw keys must be exactly 32-bytes`);
+          `${name} raw keys must be exactly 32-bytes`, 'DataError');
       }
       break;
     case 'Ed448':
       if (keyData.byteLength !== 57) {
         throw lazyDOMException(
-          `${name} raw keys must be exactly 57-bytes`);
+          `${name} raw keys must be exactly 57-bytes`, 'DataError');
       }
       break;
     case 'X448':
       if (keyData.byteLength !== 56) {
         throw lazyDOMException(
-          `${name} raw keys must be exactly 56-bytes`);
+          `${name} raw keys must be exactly 56-bytes`, 'DataError');
       }
       break;
   }
diff --git a/test/wpt/status/WebCryptoAPI.json b/test/wpt/status/WebCryptoAPI.json
@@ -11,14 +11,6 @@
   "import_export/okp_importKey_failures_Ed25519.https.any.js": {
     "fail": {
       "expected": [
-        "Bad key length: importKey(jwk(private), {name: Ed25519}, true, [sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed25519}, false, [sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed25519}, false, [sign, sign])",
-        "Bad key length: importKey(jwk (public) , {name: Ed25519}, true, [verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed25519}, false, [verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed25519}, true, [verify, verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed25519}, false, [verify, verify])",
         "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign])",
         "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])"
       ]
@@ -27,14 +19,6 @@
   "import_export/okp_importKey_failures_Ed448.https.any.js": {
     "fail": {
       "expected": [
-        "Bad key length: importKey(jwk(private), {name: Ed448}, true, [sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed448}, false, [sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed448}, true, [sign, sign])",
-        "Bad key length: importKey(jwk(private), {name: Ed448}, false, [sign, sign])",
-        "Bad key length: importKey(jwk (public) , {name: Ed448}, true, [verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed448}, false, [verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed448}, true, [verify, verify])",
-        "Bad key length: importKey(jwk (public) , {name: Ed448}, false, [verify, verify])",
         "Invalid key pair: importKey(jwk(private), {name: Ed448}, true, [sign])",
         "Invalid key pair: importKey(jwk(private), {name: Ed448}, true, [sign, sign])"
       ]
@@ -43,16 +27,6 @@
   "import_export/okp_importKey_failures_X25519.https.any.js": {
     "fail": {
       "expected": [
-        "Bad key length: importKey(jwk (public) , {name: X25519}, true, [])",
-        "Bad key length: importKey(jwk (public) , {name: X25519}, false, [])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, true, [deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, false, [deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, true, [deriveBits, deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, false, [deriveBits, deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, true, [deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, false, [deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X25519}, false, [deriveKey, deriveBits, deriveKey, deriveBits])",
         "Invalid key pair: importKey(jwk(private), {name: X25519}, true, [deriveKey])",
         "Invalid key pair: importKey(jwk(private), {name: X25519}, true, [deriveBits, deriveKey])",
         "Invalid key pair: importKey(jwk(private), {name: X25519}, true, [deriveBits])",
@@ -63,16 +37,6 @@
   "import_export/okp_importKey_failures_X448.https.any.js": {
     "fail": {
       "expected": [
-        "Bad key length: importKey(jwk(private), {name: X448}, true, [deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X448}, false, [deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X448}, true, [deriveBits, deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X448}, false, [deriveBits, deriveKey])",
-        "Bad key length: importKey(jwk(private), {name: X448}, true, [deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X448}, false, [deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X448}, true, [deriveKey, deriveBits, deriveKey, deriveBits])",
-        "Bad key length: importKey(jwk(private), {name: X448}, false, [deriveKey, deriveBits, deriveKey, deriveBits])",
-        "Bad key length: importKey(jwk (public) , {name: X448}, true, [])",
-        "Bad key length: importKey(jwk (public) , {name: X448}, false, [])",
         "Invalid key pair: importKey(jwk(private), {name: X448}, true, [deriveKey])",
         "Invalid key pair: importKey(jwk(private), {name: X448}, true, [deriveBits, deriveKey])",
         "Invalid key pair: importKey(jwk(private), {name: X448}, true, [deriveBits])",

Original file line number	Diff line number	Diff line change
`@@ -90,19 +90,19 @@ function createCFRGRawKey(name, keyData, isPublic) {`
`90`	`90`	`case 'X25519':`
`91`	`91`	`if (keyData.byteLength !== 32) {`
`92`	`92`	`throw lazyDOMException(`
`93`		- `${name} raw keys must be exactly 32-bytes`);
	`93`	+ `${name} raw keys must be exactly 32-bytes`, 'DataError');
`94`	`94`	`}`
`95`	`95`	`break;`
`96`	`96`	`case 'Ed448':`
`97`	`97`	`if (keyData.byteLength !== 57) {`
`98`	`98`	`throw lazyDOMException(`
`99`		- `${name} raw keys must be exactly 57-bytes`);
	`99`	+ `${name} raw keys must be exactly 57-bytes`, 'DataError');
`100`	`100`	`}`
`101`	`101`	`break;`
`102`	`102`	`case 'X448':`
`103`	`103`	`if (keyData.byteLength !== 56) {`
`104`	`104`	`throw lazyDOMException(`
`105`		- `${name} raw keys must be exactly 56-bytes`);
	`105`	+ `${name} raw keys must be exactly 56-bytes`, 'DataError');
`106`	`106`	`}`
`107`	`107`	`break;`
`108`	`108`	`}`