fix(ext/crypto): fix JWK import of Ed25519 (#19279)

Fixes: #18049

---------

Co-authored-by: Bartek Iwańczuk <biwanczuk@gmail.com>

1 files changed, 76 insertions, 4 deletions

diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 57b8ba75a..ed29c43e4 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -1159,12 +1159,84 @@
         "Good parameters: X448 bits (pkcs8, buffer(72), {name: X448}, false, [deriveBits])",
         "Good parameters: X448 bits (jwk, object(crv, d, x, kty), {name: X448}, false, [deriveBits])"
       ],
-      "okp_importKey_failures_Ed25519.https.any.html": false,
-      "okp_importKey_failures_Ed25519.https.any.worker.html": false,
+      "okp_importKey_failures_Ed25519.https.any.html": [
+        "Bad key length: importKey(raw, {name: Ed25519}, true, [verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, false, [verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, true, [verify, verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, false, [verify, verify])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign, sign])",
+        "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign])",
+        "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])"
+      ],
+      "okp_importKey_failures_Ed25519.https.any.worker.html": [
+        "Bad key length: importKey(raw, {name: Ed25519}, true, [verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, false, [verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, true, [verify, verify])",
+        "Bad key length: importKey(raw, {name: Ed25519}, false, [verify, verify])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: Ed25519}, false, [sign, sign])",
+        "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign])",
+        "Invalid key pair: importKey(jwk(private), {name: Ed25519}, true, [sign, sign])"
+      ],
       "okp_importKey_failures_Ed448.https.any.html": false,
       "okp_importKey_failures_Ed448.https.any.worker.html": false,
-      "okp_importKey_failures_X25519.https.any.html": false,
-      "okp_importKey_failures_X25519.https.any.worker.html": false,
+      "okp_importKey_failures_X25519.https.any.html": [
+        "Bad key length: importKey(raw, {name: X25519}, true, [])",
+        "Bad key length: importKey(raw, {name: X25519}, false, [])",
+        "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])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveBits, deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveBits, deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveBits])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveBits])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits])",
+        "Missing JWK 'x' parameter: 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])",
+        "Invalid key pair: importKey(jwk(private), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits])"
+      ],
+      "okp_importKey_failures_X25519.https.any.worker.html": [
+        "Bad key length: importKey(raw, {name: X25519}, true, [])",
+        "Bad key length: importKey(raw, {name: X25519}, false, [])",
+        "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])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveBits, deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveBits, deriveKey])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveBits])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, false, [deriveBits])",
+        "Missing JWK 'x' parameter: importKey(jwk(private), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits])",
+        "Missing JWK 'x' parameter: 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])",
+        "Invalid key pair: importKey(jwk(private), {name: X25519}, true, [deriveKey, deriveBits, deriveKey, deriveBits])"
+      ],
       "okp_importKey_failures_X448.https.any.html": false,
       "okp_importKey_failures_X448.https.any.worker.html": false
     },