1 files changed, 118 insertions, 0 deletions
diff --git a/ext/crypto/01_webidl.js b/ext/crypto/01_webidl.js
index 43bc5e822..e781e4334 100644
--- a/ext/crypto/01_webidl.js
+++ b/ext/crypto/01_webidl.js
@@ -9,6 +9,7 @@
 ((window) => {
   const webidl = window.__bootstrap.webidl;
   const { CryptoKey } = window.__bootstrap.crypto;
+  const { ArrayBufferIsView, ArrayBuffer } = window.__bootstrap.primordials;
 
   webidl.converters.AlgorithmIdentifier = (V, opts) => {
     // Union for (object or DOMString)
@@ -18,6 +19,14 @@
     return webidl.converters.DOMString(V, opts);
   };
 
+  webidl.converters["BufferSource or JsonWebKey"] = (V, opts) => {
+    // Union for (BufferSource or JsonWebKey)
+    if (ArrayBufferIsView(V) || V instanceof ArrayBuffer) {
+      return webidl.converters.BufferSource(V, opts);
+    }
+    return webidl.converters.JsonWebKey(V, opts);
+  };
+
   webidl.converters.KeyType = webidl.createEnumConverter("KeyType", [
     "public",
     "private",
@@ -178,6 +187,115 @@
   webidl.converters.HmacImportParams = webidl
     .createDictionaryConverter("HmacImportParams", dictHmacImportParams);
 
+  const dictRsaOtherPrimesInfo = [
+    {
+      key: "r",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "d",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "t",
+      converter: webidl.converters["DOMString"],
+    },
+  ];
+
+  webidl.converters.RsaOtherPrimesInfo = webidl.createDictionaryConverter(
+    "RsaOtherPrimesInfo",
+    dictRsaOtherPrimesInfo,
+  );
+  webidl.converters["sequence<RsaOtherPrimesInfo>"] = webidl
+    .createSequenceConverter(
+      webidl.converters.RsaOtherPrimesInfo,
+    );
+
+  const dictJsonWebKey = [
+    // Sections 4.2 and 4.3 of RFC7517.
+    // https://datatracker.ietf.org/doc/html/rfc7517#section-4
+    {
+      key: "kty",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "use",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "key_ops",
+      converter: webidl.converters["sequence<DOMString>"],
+    },
+    {
+      key: "alg",
+      converter: webidl.converters["DOMString"],
+    },
+    // JSON Web Key Parameters Registration
+    {
+      key: "ext",
+      converter: webidl.converters["boolean"],
+    },
+    // Section 6 of RFC7518 JSON Web Algorithms
+    // https://datatracker.ietf.org/doc/html/rfc7518#section-6
+    {
+      key: "crv",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "x",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "y",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "d",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "n",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "e",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "p",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "q",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "dp",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "dq",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "qi",
+      converter: webidl.converters["DOMString"],
+    },
+    {
+      key: "oth",
+      converter: webidl.converters["sequence<RsaOtherPrimesInfo>"],
+    },
+    {
+      key: "k",
+      converter: webidl.converters["DOMString"],
+    },
+  ];
+
+  webidl.converters.JsonWebKey = webidl.createDictionaryConverter(
+    "JsonWebKey",
+    dictJsonWebKey,
+  );
+
   const dictPbkdf2Params = [
     ...dictAlgorithm,
     {