inray 0.0.8 → 0.0.10

package/dist/jose/src/key/export.js

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -10,44 +10,15 @@
  * Cryptographic key export functions
  *
  * @module
+ *
+ * @see {@link https://www.rfc-editor.org/info/rfc7468/#section-10 RFC 7468, Section 10: PKCS #8}
+ * @see {@link https://www.rfc-editor.org/info/rfc7468/#section-13 RFC 7468, Section 13: SubjectPublicKeyInfo}
  */
 import { toSPKI as exportPublic, toPKCS8 as exportPrivate } from '../lib/asn1.js';
-import { invalidKeyInput } from '../lib/invalid_key_input.js';
+import { invalidKeyInput, isCryptoKey, isKeyObject } from '../lib/key.js';
 import { encode as b64u } from '../util/base64url.js';
-import { isCryptoKey, isKeyObject } from '../lib/is_key_like.js';
-function omitUndefinedProperties(jwk) {
-    return Object.fromEntries(Object.entries(jwk).filter(([, value]) => value !== undefined));
-}
-async function keyToJWK(key) {
-    if (isKeyObject(key)) {
-        if (key.type === 'secret') {
-            key = key.export();
-        }
-        else {
-            return key.export({ format: 'jwk' });
-        }
-    }
-    if (key instanceof Uint8Array) {
-        return {
-            kty: 'oct',
-            k: b64u(key),
-        };
-    }
-    if (!isCryptoKey(key)) {
-        throw new TypeError(invalidKeyInput(key, 'CryptoKey', 'KeyObject', 'Uint8Array'));
-    }
-    if (!key.extractable) {
-        throw new TypeError('non-extractable CryptoKey cannot be exported as a JWK');
-    }
-    const { ext, key_ops, alg, use, ...jwk } = omitUndefinedProperties(await crypto.subtle.exportKey('jwk', key));
-    if (jwk.kty === 'AKP') {
-        ;
-        jwk.alg = alg;
-    }
-    return jwk;
-}
 /**
- * Exports a public {@link !CryptoKey} or {@link !KeyObject} to a PEM-encoded SPKI string format.
+ * Exports a public key to PEM-encoded SPKI. CryptoKey inputs must be extractable.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/export'`.
@@ -60,13 +31,13 @@ async function keyToJWK(key) {
  * console.log(spkiPem)
  * ```
  *
- * @param key Key to export to a PEM-encoded SPKI string format.
+ * @param key Key to export.
  */
 export function exportSPKI(key) {
     return exportPublic(key);
 }
 /**
- * Exports a private {@link !CryptoKey} or {@link !KeyObject} to a PEM-encoded PKCS8 string format.
+ * Exports a private key to PEM-encoded PKCS #8. CryptoKey inputs must be extractable.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/export'`.
@@ -79,13 +50,13 @@ export function exportSPKI(key) {
  * console.log(pkcs8Pem)
  * ```
  *
- * @param key Key to export to a PEM-encoded PKCS8 string format.
+ * @param key Key to export.
  */
 export function exportPKCS8(key) {
     return exportPrivate(key);
 }
 /**
- * Exports a {@link !CryptoKey}, {@link !KeyObject}, or {@link !Uint8Array} to a JWK.
+ * Exports a key to JWK. CryptoKey inputs must be extractable.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/export'`.
@@ -100,9 +71,42 @@ export function exportPKCS8(key) {
  * console.log(publicJwk)
  * ```
  *
- * @param key Key to export as JWK.
+ * @param key Key to export.
  */
-export function exportJWK(key) {
-    return keyToJWK(key);
+export async function exportJWK(key) {
+    if (isKeyObject(key)) {
+        if (key.type === 'secret') {
+            key = key.export();
+        }
+        else {
+            return key.export({ format: 'jwk' });
+        }
+    }
+    // RFC 7518, Section 6.4.1: k is the base64url encoding of the symmetric key octets.
+    if (key instanceof Uint8Array) {
+        return {
+            kty: 'oct',
+            k: b64u(key)
+        };
+    }
+    if (!isCryptoKey(key)) {
+        throw new TypeError(invalidKeyInput(key, 'CryptoKey', 'KeyObject', 'Uint8Array'));
+    }
+    if (!key.extractable) {
+        throw new TypeError('non-extractable CryptoKey cannot be exported as a JWK');
+    }
+    const jwk = (await crypto.subtle.exportKey('jwk', key));
+    // Export policy omits usage/extractability metadata. AKP retains its required alg
+    // Parameter (RFC 9964, Section 3). Other key parameters are exported by Web Crypto.
+    delete jwk.ext;
+    delete jwk.key_ops;
+    delete jwk.use;
+    if (jwk.kty !== 'AKP')
+        delete jwk.alg;
+    for (const parameter of Object.keys(jwk)) {
+        if (jwk[parameter] === undefined)
+            delete jwk[parameter];
+    }
+    return jwk;
 }
 //# sourceMappingURL=export.js.map

package/dist/jose/src/key/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../src/jose/src/key/export.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;GAIG;AAEH,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAGjF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAC7D,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAWhE,SAAS,uBAAuB,CAAC,GAAe;IAC9C,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAA;AAC3F,CAAC;AAED,KAAK,UAAU,QAAQ,CAAC,GAAY;IAClC,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,GAAI,GAA4B,CAAC,MAAM,EAAE,CAAA;QAC9C,CAAC;aAAM,CAAC;YACN,OAAQ,GAA4B,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IACD,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,EAAE,KAAK;YACV,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC;SACb,CAAA;IACH,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;IACnF,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,MAAM,IAAI,SAAS,CAAC,uDAAuD,CAAC,CAAA;IAC9E,CAAC;IACD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,GAAG,uBAAuB,CAChE,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAC1C,CAAA;IAED,IAAI,GAAG,CAAC,GAAG,KAAK,KAAK,EAAE,CAAC;QACtB,CAAC;QAAC,GAAiB,CAAC,GAAG,GAAG,GAAG,CAAA;IAC/B,CAAC;IAED,OAAO,GAAgB,CAAA;AACzB,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,UAAU,CAAC,GAAsC;IAC/D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,WAAW,CAAC,GAAsC;IAChE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,SAAS,CAAC,GAAmD;IAC3E,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;AACtB,CAAC"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../../../../src/jose/src/key/export.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC1E,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAStD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,UAAU,CAAC,GAAsC;IAC/D,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,WAAW,CAAC,GAAsC;IAChE,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,GAAmD;IACjF,IAAI,WAAW,CAAuB,GAAG,CAAC,EAAE,CAAC;QAC3C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;QACrB,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IACD,oFAAoF;IACpF,IAAI,GAAG,YAAY,UAAU,EAAE,CAAC;QAC9B,OAAO;YACL,GAAG,EAAE,KAAK;YACV,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC;SACb,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IACpF,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QACrB,MAAM,IAAI,SAAS,CAAC,uDAAuD,CAAC,CAAC;IAC/E,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAc,CAAC;IACrE,kFAAkF;IAClF,oFAAoF;IACpF,OAAO,GAAG,CAAC,GAAG,CAAC;IACf,OAAO,GAAG,CAAC,OAAO,CAAC;IACnB,OAAO,GAAG,CAAC,GAAG,CAAC;IACf,IAAI,GAAG,CAAC,GAAG,KAAK,KAAK;QAAE,OAAO,GAAG,CAAC,GAAG,CAAC;IACtC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAwB,EAAE,CAAC;QAChE,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}

package/dist/jose/src/key/generate_key_pair.d.ts

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -8,33 +8,28 @@
 /***/
 import type * as types from '../types.d.ts';
 /**
- * JWA Algorithm Identifiers that {@link generateKeyPair} is able to generate a key pair for, subject
- * to runtime support.
+ * Algorithms supported by {@link generateKeyPair}, subject to runtime support.
  *
  * @ignore
  */
 export type GenerateKeyPairAlgorithm = 'PS256' | 'PS384' | 'PS512' | 'RS256' | 'RS384' | 'RS512' | 'RSA-OAEP' | 'RSA-OAEP-256' | 'RSA-OAEP-384' | 'RSA-OAEP-512' | 'ES256' | 'ES384' | 'ES512' | 'Ed25519' | 'EdDSA' | 'ML-DSA-44' | 'ML-DSA-65' | 'ML-DSA-87' | 'ECDH-ES' | 'ECDH-ES+A128KW' | 'ECDH-ES+A192KW' | 'ECDH-ES+A256KW' | (string & {});
-/** Asymmetric key pair generation function result. */
+/** Generated asymmetric key pair. */
 export interface GenerateKeyPairResult {
-    /** The generated Private Key. */
     privateKey: types.CryptoKey;
-    /** Public Key corresponding to the generated Private Key. */
     publicKey: types.CryptoKey;
 }
-/** Asymmetric key pair generation function options. */
+/** Asymmetric key pair generation options. */
 export interface GenerateKeyPairOptions {
     /**
-     * The EC "crv" (Curve) or OKP "crv" (Subtype of Key Pair) value to generate. The curve must be
-     * both supported on the runtime as well as applicable for the given JWA algorithm identifier.
+     * EC curve or OKP key subtype. Must be supported by the algorithm and runtime. ECDH-ES defaults
+     * to P-256.
      */
     crv?: string;
-    /**
-     * A hint for RSA algorithms to generate an RSA key of a given `modulusLength` (Key size in bits).
-     * JOSE requires 2048 bits or larger. Default is 2048.
-     */
+    /** RSA modulus length in bits. Must be an integer of at least 2048; defaults to 2048. */
     modulusLength?: number;
     /**
-     * The value to use as {@link !SubtleCrypto.generateKey} `extractable` argument. Default is false.
+     * Whether the private key is extractable. Defaults to false; the public key is always
+     * extractable.
      *
      * @example
      *
@@ -49,12 +44,13 @@ export interface GenerateKeyPairOptions {
     extractable?: boolean;
 }
 /**
- * Generates a private and a public key for a given JWA algorithm identifier. This can only generate
- * asymmetric key pairs. For symmetric secrets use the `generateSecret` function.
+ * Generates an asymmetric key pair for a JWA algorithm identifier.
+ *
+ * For symmetric secrets use the {@link key/generate_secret.generateSecret generateSecret} function.
  *
  * > [!NOTE]\
- * > The `privateKey` is generated with `extractable` set to `false` by default. See
- * > {@link GenerateKeyPairOptions.extractable} to generate an extractable `privateKey`.
+ * > Private keys are not extractable by default. Set {@link GenerateKeyPairOptions.extractable} to
+ * > export them; public keys are always extractable.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/generate/keypair'`.

package/dist/jose/src/key/generate_key_pair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate_key_pair.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_key_pair.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAWL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAA;AAE3C;;;;;GAKG;AACH,MAAM,MAAM,wBAAwB,GAChC,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,UAAU,GACV,cAAc,GACd,cAAc,GACd,cAAc,GACd,OAAO,GACP,OAAO,GACP,OAAO,GACP,SAAS,GACT,OAAO,GACP,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEjB,sDAAsD;AACtD,MAAM,WAAW,qBAAqB;IACpC,iCAAiC;IACjC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAA;IAE3B,6DAA6D;IAC7D,SAAS,EAAE,KAAK,CAAC,SAAS,CAAA;CAC3B;AAED,uDAAuD;AACvD,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAA;IAEZ;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IAEtB;;;;;;;;;;;;OAYG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAYD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,wBAAwB,EAC7B,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CA+ChC"}
+{"version":3,"file":"generate_key_pair.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_key_pair.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAYL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAChC,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,UAAU,GACV,cAAc,GACd,cAAc,GACd,cAAc,GACd,OAAO,GACP,OAAO,GACP,OAAO,GACP,SAAS,GACT,OAAO,GACP,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB,qCAAqC;AACrC,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAE5B,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B;AAED,8CAA8C;AAC9C,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,yFAAyF;IACzF,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAcD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,wBAAwB,EAC7B,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,qBAAqB,CAAC,CAwChC"}

package/dist/jose/src/key/generate_key_pair.js

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -12,21 +12,25 @@
  * @module
  */
 import { JOSENotSupported } from '../util/errors.js';
+import { validateExtractableOption } from '../lib/key.js';
 import { keyAlgorithm, unsupportedAlg, algArgument } from '../lib/key_algorithm.js';
+// RFC 7518, Sections 3.3, 3.5, and 4.3: RSA keys must be at least 2048 bits.
+// Using 2048 bits by default is library policy.
 function getModulusLengthOption(options) {
     const modulusLength = options?.modulusLength ?? 2048;
-    if (typeof modulusLength !== 'number' || modulusLength < 2048) {
+    if (typeof modulusLength !== 'number' || !Number.isInteger(modulusLength) || modulusLength < 2048) {
         throw new JOSENotSupported('Invalid or unsupported modulusLength option provided, 2048 bits or larger keys must be used');
     }
     return modulusLength;
 }
 /**
- * Generates a private and a public key for a given JWA algorithm identifier. This can only generate
- * asymmetric key pairs. For symmetric secrets use the `generateSecret` function.
+ * Generates an asymmetric key pair for a JWA algorithm identifier.
+ *
+ * For symmetric secrets use the {@link key/generate_secret.generateSecret generateSecret} function.
  *
  * > [!NOTE]\
- * > The `privateKey` is generated with `extractable` set to `false` by default. See
- * > {@link GenerateKeyPairOptions.extractable} to generate an extractable `privateKey`.
+ * > Private keys are not extractable by default. Set {@link GenerateKeyPairOptions.extractable} to
+ * > export them; public keys are always extractable.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/generate/keypair'`.
@@ -44,6 +48,7 @@ function getModulusLengthOption(options) {
  * @param options Additional options passed down to the key pair generation.
  */
 export async function generateKeyPair(alg, options) {
+    const extractable = validateExtractableOption(options?.extractable);
     const entry = keyAlgorithm(alg, algArgument);
     if (entry.secret) {
         unsupportedAlg(algArgument);
@@ -52,18 +57,10 @@ export async function generateKeyPair(alg, options) {
     if (entry.resolve) {
         // ECDH-ES takes its curve from the option rather than from the identifier.
         const crv = options?.crv ?? 'P-256';
-        switch (crv) {
-            case 'P-256':
-            case 'P-384':
-            case 'P-521':
-                algorithm = { name: 'ECDH', namedCurve: crv };
-                break;
-            case 'X25519':
-                algorithm = { name: 'X25519' };
-                break;
-            default:
-                throw new JOSENotSupported('Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, and X25519');
+        if (!['P-256', 'P-384', 'P-521', 'X25519'].includes(crv)) {
+            throw new JOSENotSupported('Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, and X25519');
         }
+        algorithm = entry.resolve({ crv });
     }
     else {
         if (entry.crv !== undefined && options?.crv !== undefined && options.crv !== entry.crv) {
@@ -74,13 +71,13 @@ export async function generateKeyPair(alg, options) {
                 ? {
                     ...entry.subtle,
                     publicExponent: Uint8Array.of(0x01, 0x00, 0x01),
-                    modulusLength: getModulusLengthOption(options),
+                    modulusLength: getModulusLengthOption(options)
                 }
                 : entry.subtle;
     }
-    return crypto.subtle.generateKey(algorithm, options?.extractable ?? false, [
+    return crypto.subtle.generateKey(algorithm, extractable ?? false, [
         ...entry.usages[1],
-        ...entry.usages[0],
+        ...entry.usages[0]
     ]);
 }
 //# sourceMappingURL=generate_key_pair.js.map

package/dist/jose/src/key/generate_key_pair.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate_key_pair.js","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_key_pair.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AA0EnF,SAAS,sBAAsB,CAAC,OAAgC;IAC9D,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAA;IACpD,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,GAAG,IAAI,EAAE,CAAC;QAC9D,MAAM,IAAI,gBAAgB,CACxB,6FAA6F,CAC9F,CAAA;IACH,CAAC;IACD,OAAO,aAAa,CAAA;AACtB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAA6B,EAC7B,OAAgC;IAEhC,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;IAE5C,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,cAAc,CAAC,WAAW,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,SAAgE,CAAA;IAEpE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,2EAA2E;QAC3E,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAA;QACnC,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,OAAO,CAAC;YACb,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACV,SAAS,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,CAAA;gBAC7C,MAAK;YACP,KAAK,QAAQ;gBACX,SAAS,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;gBAC9B,MAAK;YACP;gBACE,MAAM,IAAI,gBAAgB,CACxB,kGAAkG,CACnG,CAAA;QACL,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,OAAO,EAAE,GAAG,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;YACvF,MAAM,IAAI,gBAAgB,CACxB,4EAA4E,GAAG,OAAO,KAAK,CAAC,GAAG,EAAE,CAClG,CAAA;QACH,CAAC;QAED,SAAS;YACP,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK;gBACpB,CAAC,CAAC;oBACE,GAAI,KAAK,CAAC,MAAgC;oBAC1C,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;oBAC/C,aAAa,EAAE,sBAAsB,CAAC,OAAO,CAAC;iBAC/C;gBACH,CAAC,CAAC,KAAK,CAAC,MAAM,CAAA;IACpB,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE;QACzE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAClB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;KACnB,CAAmC,CAAA;AACtC,CAAC"}
+{"version":3,"file":"generate_key_pair.js","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_key_pair.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAqEpF,6EAA6E;AAC7E,gDAAgD;AAChD,SAAS,sBAAsB,CAAC,OAAgC;IAC9D,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,IAAI,IAAI,CAAC;IACrD,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,aAAa,GAAG,IAAI,EAAE,CAAC;QAClG,MAAM,IAAI,gBAAgB,CACxB,6FAA6F,CAC9F,CAAC;IACJ,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,GAA6B,EAC7B,OAAgC;IAEhC,MAAM,WAAW,GAAG,yBAAyB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAE7C,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,cAAc,CAAC,WAAW,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,SAAgE,CAAC;IAErE,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,2EAA2E;QAC3E,MAAM,GAAG,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC;QACpC,IAAI,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,gBAAgB,CACxB,kGAAkG,CACnG,CAAC;QACJ,CAAC;QACD,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,IAAI,OAAO,EAAE,GAAG,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;YACvF,MAAM,IAAI,gBAAgB,CACxB,4EAA4E,GAAG,OAAO,KAAK,CAAC,GAAG,EAAE,CAClG,CAAC;QACJ,CAAC;QAED,SAAS;YACP,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK;gBACpB,CAAC,CAAC;oBACE,GAAI,KAAK,CAAC,MAAgC;oBAC1C,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;oBAC/C,aAAa,EAAE,sBAAsB,CAAC,OAAO,CAAC;iBAC/C;gBACH,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,IAAI,KAAK,EAAE;QAChE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAClB,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;KACnB,CAAmC,CAAC;AACvC,CAAC"}

package/dist/jose/src/key/generate_secret.d.ts

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -8,28 +8,23 @@
 /***/
 import type * as types from '../types.d.ts';
 /**
- * JWA Algorithm Identifiers that {@link generateSecret} is able to generate a secret for, subject to
- * runtime support.
+ * Algorithms supported by {@link generateSecret}, subject to runtime support.
  *
  * @ignore
  */
 export type GenerateSecretAlgorithm = 'HS256' | 'HS384' | 'HS512' | 'A128CBC-HS256' | 'A192CBC-HS384' | 'A256CBC-HS512' | 'A128KW' | 'A192KW' | 'A256KW' | 'A128GCMKW' | 'A192GCMKW' | 'A256GCMKW' | 'A128GCM' | 'A192GCM' | 'A256GCM' | (string & {});
 /**
- * Resolves what {@link generateSecret} returns for a given JWA Algorithm Identifier. The
- * AES_CBC_HMAC_SHA2 content encryption algorithms have no {@link !CryptoKey} representation, so they
- * yield a {@link !Uint8Array}; every other supported identifier yields a
- * {@link types.CryptoKey CryptoKey}. When the identifier is not statically known this resolves to
- * their union.
+ * Maps a JWA algorithm identifier to the value returned by {@link generateSecret}. AES_CBC_HMAC_SHA2
+ * algorithms return {@link !Uint8Array}; other supported algorithms return
+ * {@link types.CryptoKey CryptoKey}. When the algorithm is not statically known, the result is their
+ * union.
  */
 export type GeneratedSecret<Alg extends string> = Alg extends 'A128CBC-HS256' | 'A192CBC-HS384' | 'A256CBC-HS512' ? Uint8Array : string extends Alg ? types.CryptoKey | Uint8Array : types.CryptoKey;
-/** Secret generation function options. */
+/** Secret generation options. */
 export interface GenerateSecretOptions {
     /**
-     * The value to use as {@link !SubtleCrypto.generateKey} `extractable` argument. Default is false.
-     *
-     * > [!NOTE]\
-     * > Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
-     * > {@link !CryptoKey} this option has no effect for them.
+     * Whether the generated CryptoKey is extractable. Defaults to false; has no effect for
+     * A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512, which return raw bytes.
      */
     extractable?: boolean;
 }
@@ -40,8 +35,8 @@ export interface GenerateSecretOptions {
  * > The secret key is generated with `extractable` set to `false` by default.
  *
  * > [!NOTE]\
- * > Because A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 secrets cannot be represented as
- * > {@link !CryptoKey} this method yields a {@link !Uint8Array} for them instead.
+ * > A128CBC-HS256, A192CBC-HS384, and A256CBC-HS512 return {@link !Uint8Array} because these secrets
+ * > have no CryptoKey representation.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/generate/secret'`.

package/dist/jose/src/key/generate_secret.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate_secret.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_secret.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAUL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAA;AAE3C;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAC/B,OAAO,GACP,OAAO,GACP,OAAO,GACP,eAAe,GACf,eAAe,GACf,eAAe,GACf,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,GACT,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAA;AAEjB;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,CAAC,GAAG,SAAS,MAAM,IAAI,GAAG,SACnD,eAAe,GAAG,eAAe,GAAG,eAAe,GACjD,UAAU,GACV,MAAM,SAAS,GAAG,GAChB,KAAK,CAAC,SAAS,GAAG,UAAU,GAC5B,KAAK,CAAC,SAAS,CAAA;AAErB,0CAA0C;AAC1C,MAAM,WAAW,qBAAqB;IACpC;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,cAAc,CAAC,GAAG,SAAS,uBAAuB,EAChE,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAA"}
+{"version":3,"file":"generate_secret.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_secret.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAWL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,uBAAuB,GAC/B,OAAO,GACP,OAAO,GACP,OAAO,GACP,eAAe,GACf,eAAe,GACf,eAAe,GACf,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,GACT,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;;;;GAKG;AACH,MAAM,MAAM,eAAe,CAAC,GAAG,SAAS,MAAM,IAAI,GAAG,SAAS,eAAe,GAAG,eAAe,GAAG,eAAe,GAC7G,UAAU,GACV,MAAM,SAAS,GAAG,GAChB,KAAK,CAAC,SAAS,GAAG,UAAU,GAC5B,KAAK,CAAC,SAAS,CAAC;AAEtB,iCAAiC;AACjC,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,cAAc,CAAC,GAAG,SAAS,uBAAuB,EAChE,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC"}

package/dist/jose/src/key/generate_secret.js

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -12,43 +12,48 @@
  * @module
  */
 import { unsupportedAlg, algArgument } from '../lib/key_algorithm.js';
+import { validateExtractableOption } from '../lib/key.js';
 export async function generateSecret(alg, options) {
-    let length;
+    const extractable = validateExtractableOption(options?.extractable);
+    let keyLengthBits;
     let algorithm;
     let keyUsages;
     switch (alg) {
+        // RFC 7518, Section 3.2: generate a key as long as the hash output.
         case 'HS256':
         case 'HS384':
         case 'HS512':
-            length = parseInt(alg.slice(-3), 10);
-            algorithm = { name: 'HMAC', hash: `SHA-${length}`, length };
+            keyLengthBits = +alg.slice(-3);
+            algorithm = { name: 'HMAC', hash: `SHA-${keyLengthBits}`, length: keyLengthBits };
             keyUsages = ['sign', 'verify'];
             break;
+        // RFC 7518, Sections 5.2.3-5.2.5: combined MAC_KEY and ENC_KEY lengths.
         case 'A128CBC-HS256':
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
-            length = parseInt(alg.slice(-3), 10);
-            return crypto.getRandomValues(new Uint8Array(length >> 3));
+            return crypto.getRandomValues(new Uint8Array(+alg.slice(-3) >> 3));
+        // RFC 7518, Section 4.4: AES Key Wrap key sizes.
         case 'A128KW':
         case 'A192KW':
         case 'A256KW':
-            length = parseInt(alg.slice(1, 4), 10);
-            algorithm = { name: 'AES-KW', length };
+            keyLengthBits = +alg.slice(1, 4);
+            algorithm = { name: 'AES-KW', length: keyLengthBits };
             keyUsages = ['wrapKey', 'unwrapKey'];
             break;
+        // RFC 7518, Sections 4.7 and 5.3: AES-GCM key sizes.
         case 'A128GCMKW':
         case 'A192GCMKW':
         case 'A256GCMKW':
         case 'A128GCM':
         case 'A192GCM':
         case 'A256GCM':
-            length = parseInt(alg.slice(1, 4), 10);
-            algorithm = { name: 'AES-GCM', length };
+            keyLengthBits = +alg.slice(1, 4);
+            algorithm = { name: 'AES-GCM', length: keyLengthBits };
             keyUsages = ['encrypt', 'decrypt'];
             break;
         default:
             unsupportedAlg(algArgument);
     }
-    return crypto.subtle.generateKey(algorithm, options?.extractable ?? false, keyUsages);
+    return crypto.subtle.generateKey(algorithm, extractable ?? false, keyUsages);
 }
 //# sourceMappingURL=generate_secret.js.map

package/dist/jose/src/key/generate_secret.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate_secret.js","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_secret.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAkFrE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,OAA+B;IAE/B,IAAI,MAAc,CAAA;IAClB,IAAI,SAA6C,CAAA;IACjD,IAAI,SAAqB,CAAA;IACzB,QAAQ,GAAG,EAAE,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,OAAO;YACV,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACpC,SAAS,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,MAAM,EAAE,EAAE,MAAM,EAAE,CAAA;YAC3D,SAAS,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YAC9B,MAAK;QACP,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACpC,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAA;QAC5D,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACtC,SAAS,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;YACtC,SAAS,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;YACpC,MAAK;QACP,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACtC,SAAS,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAA;YACvC,SAAS,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA;YAClC,MAAK;QACP;YACE,cAAc,CAAC,WAAW,CAAC,CAAA;IAC/B,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,SAAS,CAAC,CAAA;AACvF,CAAC"}
+{"version":3,"file":"generate_secret.js","sourceRoot":"","sources":["../../../../src/jose/src/key/generate_secret.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAEL;;;;GAIG;AAEH,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AA4E1D,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAW,EACX,OAA+B;IAE/B,MAAM,WAAW,GAAG,yBAAyB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACpE,IAAI,aAAqB,CAAC;IAC1B,IAAI,SAA6C,CAAC;IAClD,IAAI,SAAqB,CAAC;IAC1B,QAAQ,GAAG,EAAE,CAAC;QACZ,oEAAoE;QACpE,KAAK,OAAO,CAAC;QACb,KAAK,OAAO,CAAC;QACb,KAAK,OAAO;YACV,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,SAAS,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,aAAa,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;YAClF,SAAS,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC/B,MAAM;QACR,wEAAwE;QACxE,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe,CAAC;QACrB,KAAK,eAAe;YAClB,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrE,iDAAiD;QACjD,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ;YACX,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,SAAS,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;YACtD,SAAS,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACrC,MAAM;QACR,qDAAqD;QACrD,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,aAAa,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,SAAS,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;YACvD,SAAS,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACnC,MAAM;QACR;YACE,cAAc,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,EAAE,WAAW,IAAI,KAAK,EAAE,SAAS,CAAC,CAAC;AAC/E,CAAC"}

package/dist/jose/src/key/import.d.ts

@@ -1,5 +1,5 @@
 /**
- * Original library: jose (v6.2.8)
+ * Original library: jose (v6.2.15)
  * - Copyright (c) 2018 Filip Skokan
  *
  * Modified and integrated in "Inray":
@@ -8,22 +8,20 @@
 /***/
 import type * as types from '../types.d.ts';
 /**
- * Resolves what {@link importJWK} returns for a given JWK type. The "kty" (Key Type) Parameter fully
- * determines the outcome at runtime: `"oct"` yields a {@link !Uint8Array} secret, every other
- * supported key type yields a {@link types.CryptoKey CryptoKey}. When "kty" is not statically known
- * — the usual case for a JWK parsed from JSON, or for a value typed as {@link types.JWK JWK} — this
- * resolves to their union.
+ * Maps a JWK key type to the value returned by {@link importJWK}. An "oct" JWK returns
+ * {@link !Uint8Array}; other supported key types return {@link types.CryptoKey CryptoKey}. A JWK
+ * whose "kty" is not statically known resolves to their union.
  */
 export type ImportedJWK<JWKType extends types.JWK> = JWKType extends {
     kty: 'oct';
 } ? Uint8Array : JWKType extends {
     kty: 'AKP' | 'EC' | 'OKP' | 'RSA';
 } ? types.CryptoKey : types.CryptoKey | Uint8Array;
-/** Key Import Function options. */
+/** Key import options. */
 export interface KeyImportOptions {
     /**
-     * The value to use as {@link !SubtleCrypto.importKey} `extractable` argument. Default is false for
-     * private keys, true otherwise.
+     * Whether the imported CryptoKey is extractable. Overrides JWK "ext" when set. Without either,
+     * defaults to false for private keys, true otherwise.
      */
     extractable?: boolean;
 }
@@ -31,9 +29,8 @@ export interface KeyImportOptions {
  * Imports a PEM-encoded SPKI string as a {@link !CryptoKey}.
  *
  * > [!NOTE]\
- * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > For RSA keys, use the rsaEncryption OID (1.2.840.113549.1.1.1). The id-RSASSA-PSS OID
+ * > (1.2.840.113549.1.1.10) is not supported by the Web Cryptography API.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -55,12 +52,11 @@ export interface KeyImportOptions {
  */
 export declare function importSPKI(spki: string, alg: string, options?: KeyImportOptions): Promise<types.CryptoKey>;
 /**
- * Imports the SPKI from an X.509 string certificate as a {@link !CryptoKey}.
+ * Imports a PEM-encoded X.509 certificate's public key as a {@link !CryptoKey}.
  *
  * > [!NOTE]\
- * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > For RSA keys, use the rsaEncryption OID (1.2.840.113549.1.1.1). The id-RSASSA-PSS OID
+ * > (1.2.840.113549.1.1.10) is not supported by the Web Cryptography API.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -88,12 +84,11 @@ export declare function importSPKI(spki: string, alg: string, options?: KeyImpor
  */
 export declare function importX509(x509: string, alg: string, options?: KeyImportOptions): Promise<types.CryptoKey>;
 /**
- * Imports a PEM-encoded PKCS#8 string as a {@link !CryptoKey}.
+ * Imports a PEM-encoded PKCS #8 string as a {@link !CryptoKey}.
  *
  * > [!NOTE]\
- * > The OID id-RSASSA-PSS (1.2.840.113549.1.1.10) is not supported in
- * > {@link https://w3c.github.io/webcrypto/ Web Cryptography API}, use the OID rsaEncryption
- * > (1.2.840.113549.1.1.1) instead for all RSA algorithms.
+ * > For RSA keys, use the rsaEncryption OID (1.2.840.113549.1.1.1). The id-RSASSA-PSS OID
+ * > (1.2.840.113549.1.1.10) is not supported by the Web Cryptography API.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.
@@ -110,22 +105,21 @@ export declare function importX509(x509: string, alg: string, options?: KeyImpor
  * const ecPrivateKey = await jose.importPKCS8(pkcs8, algorithm)
  * ```
  *
- * @param pkcs8 PEM-encoded PKCS#8 string
+ * @param pkcs8 PEM-encoded PKCS #8 string
  * @param alg JSON Web Algorithm identifier to be used with the imported key. See
  *   {@link https://github.com/panva/jose/issues/210 Algorithm Key Requirements}.
  */
 export declare function importPKCS8(pkcs8: string, alg: string, options?: KeyImportOptions): Promise<types.CryptoKey>;
 /**
- * Imports a JWK to a {@link !CryptoKey}. Either the JWK "alg" (Algorithm) Parameter, or the optional
- * "alg" argument, must be present for asymmetric JSON Web Key imports.
+ * Imports a JWK as a {@link !CryptoKey} or {@link !Uint8Array}. Asymmetric imports require either the
+ * "alg" argument or JWK "alg" parameter. For AKP keys, the JWK "alg" parameter is required and must
+ * match the argument when provided.
  *
  * > [!NOTE]\
- * > The JSON Web Key parameters "key_ops" and "ext" are also used in the {@link !CryptoKey} import
- * > process.
+ * > CryptoKey imports honor the JWK "key_ops" and "ext" parameters.
  *
  * > [!NOTE]\
- * > Symmetric JSON Web Keys (i.e. `kty: "oct"`) yield back an {@link !Uint8Array} instead of a
- * > {@link !CryptoKey}.
+ * > Symmetric JWKs (`kty: "oct"`) return {@link !Uint8Array} instead of CryptoKey.
  *
  * This function is exported (as a named export) from the main `'jose'` module entry point as well
  * as from its subpath export `'jose/key/import'`.

package/dist/jose/src/key/import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/import.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAeL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,KAAK,CAAC,GAAG,IAAI,OAAO,SAAS;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,GAC/E,UAAU,GACV,OAAO,SAAS;IAAE,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,CAAA;CAAE,GACnD,KAAK,CAAC,SAAS,GACf,KAAK,CAAC,SAAS,GAAG,UAAU,CAAA;AAElC,mCAAmC;AACnC,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;CACtB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAK1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAK1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,WAAW,CAC/B,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAK1B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,SAAS,CAAC,OAAO,SAAS,KAAK,CAAC,GAAG,EACjD,GAAG,EAAE,OAAO,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA"}
+{"version":3,"file":"import.d.ts","sourceRoot":"","sources":["../../../../src/jose/src/key/import.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,KAAK;AAkBL,OAAO,KAAK,KAAK,KAAK,MAAM,eAAe,CAAC;AAE5C;;;;GAIG;AACH,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,KAAK,CAAC,GAAG,IAAI,OAAO,SAAS;IAAE,GAAG,EAAE,KAAK,CAAA;CAAE,GAC/E,UAAU,GACV,OAAO,SAAS;IAAE,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,KAAK,CAAA;CAAE,GACnD,KAAK,CAAC,SAAS,GACf,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC;AAEnC,0BAA0B;AAC1B,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAKhH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAKhH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAKlH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,SAAS,CAAC,OAAO,SAAS,KAAK,CAAC,GAAG,EACjD,GAAG,EAAE,OAAO,EACZ,GAAG,CAAC,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC"}