jose 4.5.0 → 4.5.3

package/README.md

@@ -136,16 +136,16 @@ install size should not be a cause for concern.
 
 [documentation]: /docs/README.md
 [node-jose]: https://github.com/cisco/node-jose
-[spec-b64]: https://tools.ietf.org/html/rfc7797
-[spec-cookbook]: https://tools.ietf.org/html/rfc7520
-[spec-jwa]: https://tools.ietf.org/html/rfc7518
-[spec-jwe]: https://tools.ietf.org/html/rfc7516
-[spec-jwk]: https://tools.ietf.org/html/rfc7517
-[spec-jws]: https://tools.ietf.org/html/rfc7515
-[spec-jwt]: https://tools.ietf.org/html/rfc7519
-[spec-okp]: https://tools.ietf.org/html/rfc8037
-[spec-secp256k1]: https://tools.ietf.org/html/rfc8812
-[spec-thumbprint]: https://tools.ietf.org/html/rfc7638
+[spec-b64]: https://www.rfc-editor.org/rfc/rfc7797
+[spec-cookbook]: https://www.rfc-editor.org/rfc/rfc7520
+[spec-jwa]: https://www.rfc-editor.org/rfc/rfc7518
+[spec-jwe]: https://www.rfc-editor.org/rfc/rfc7516
+[spec-jwk]: https://www.rfc-editor.org/rfc/rfc7517
+[spec-jws]: https://www.rfc-editor.org/rfc/rfc7515
+[spec-jwt]: https://www.rfc-editor.org/rfc/rfc7519
+[spec-okp]: https://www.rfc-editor.org/rfc/rfc8037
+[spec-secp256k1]: https://www.rfc-editor.org/rfc/rfc8812
+[spec-thumbprint]: https://www.rfc-editor.org/rfc/rfc7638
 [support-sponsor]: https://github.com/sponsors/panva
 [conditional-exports]: https://nodejs.org/api/packages.html#packages_conditional_exports
 [webcrypto]: https://www.w3.org/TR/WebCryptoAPI/

package/dist/browser/jwe/compact/decrypt.js

@@ -13,7 +13,7 @@ export async function compactDecrypt(jwe, key, options) {
         throw new JWEInvalid('Invalid Compact JWE');
     }
     const decrypted = await flattenedDecrypt({
-        ciphertext: (ciphertext || undefined),
+        ciphertext,
         iv: (iv || undefined),
         protected: protectedHeader || undefined,
         tag: (tag || undefined),

package/dist/browser/jwk/thumbprint.js

@@ -12,6 +12,11 @@ export async function calculateJwkThumbprint(jwk, digestAlgorithm = 'sha256') {
     if (!isObject(jwk)) {
         throw new TypeError('JWK must be an object');
     }
+    if (digestAlgorithm !== 'sha256' &&
+        digestAlgorithm !== 'sha384' &&
+        digestAlgorithm !== 'sha512') {
+        throw new TypeError('digestAlgorithm must one of "sha256", "sha384", or "sha512"');
+    }
     let components;
     switch (jwk.kty) {
         case 'EC':

package/dist/browser/lib/buffer_utils.js

@@ -1,3 +1,4 @@
+import digest from '../runtime/digest.js';
 export const encoder = new TextEncoder();
 export const decoder = new TextDecoder();
 const MAX_INT32 = 2 ** 32;
@@ -36,7 +37,7 @@ export function uint32be(value) {
 export function lengthAndInput(input) {
     return concat(uint32be(input.length), input);
 }
-export async function concatKdf(digest, secret, bits, value) {
+export async function concatKdf(secret, bits, value) {
     const iterations = Math.ceil((bits >> 3) / 32);
     let res;
     for (let iter = 1; iter <= iterations; iter++) {

package/dist/browser/runtime/ecdhes.js

@@ -1,7 +1,6 @@
 import { encoder, concat, uint32be, lengthAndInput, concatKdf } from '../lib/buffer_utils.js';
 import crypto, { isCryptoKey } from './webcrypto.js';
 import { checkEncCryptoKey } from '../lib/crypto_key.js';
-import digest from './digest.js';
 import invalidKeyInput from '../lib/invalid_key_input.js';
 import { types } from './is_key_like.js';
 export async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu = new Uint8Array(0), apv = new Uint8Array(0)) {
@@ -21,7 +20,7 @@ export async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu
         name: 'ECDH',
         public: publicKey,
     }, privateKey, Math.ceil(parseInt(privateKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3));
-    return concatKdf(digest, sharedSecret, keyLength, value);
+    return concatKdf(sharedSecret, keyLength, value);
 }
 export async function generateEpk(key) {
     if (!isCryptoKey(key)) {

package/dist/browser/runtime/fetch_jwks.js

@@ -1,5 +1,4 @@
 import { JOSEError, JWKSTimeout } from '../util/errors.js';
-import { isCloudflareWorkers } from './env.js';
 const fetchJwks = async (url, timeout) => {
     let controller;
     let id;
@@ -14,14 +13,6 @@ const fetchJwks = async (url, timeout) => {
     const response = await fetch(url.href, {
         signal: controller ? controller.signal : undefined,
         redirect: 'manual',
-        method: 'GET',
-        ...(!isCloudflareWorkers()
-            ? {
-                referrerPolicy: 'no-referrer',
-                credentials: 'omit',
-                mode: 'cors',
-            }
-            : undefined),
     }).catch((err) => {
         if (timedOut)
             throw new JWKSTimeout();

package/dist/node/cjs/jwe/compact/decrypt.js

@@ -16,7 +16,7 @@ async function compactDecrypt(jwe, key, options) {
         throw new errors_js_1.JWEInvalid('Invalid Compact JWE');
     }
     const decrypted = await (0, decrypt_js_1.flattenedDecrypt)({
-        ciphertext: (ciphertext || undefined),
+        ciphertext,
         iv: (iv || undefined),
         protected: protectedHeader || undefined,
         tag: (tag || undefined),

package/dist/node/cjs/jwk/thumbprint.js

@@ -15,6 +15,11 @@ async function calculateJwkThumbprint(jwk, digestAlgorithm = 'sha256') {
     if (!(0, is_object_js_1.default)(jwk)) {
         throw new TypeError('JWK must be an object');
     }
+    if (digestAlgorithm !== 'sha256' &&
+        digestAlgorithm !== 'sha384' &&
+        digestAlgorithm !== 'sha512') {
+        throw new TypeError('digestAlgorithm must one of "sha256", "sha384", or "sha512"');
+    }
     let components;
     switch (jwk.kty) {
         case 'EC':

package/dist/node/cjs/lib/buffer_utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.concatKdf = exports.lengthAndInput = exports.uint32be = exports.uint64be = exports.p2s = exports.concat = exports.decoder = exports.encoder = void 0;
+const digest_js_1 = require("../runtime/digest.js");
 exports.encoder = new TextEncoder();
 exports.decoder = new TextDecoder();
 const MAX_INT32 = 2 ** 32;
@@ -44,7 +45,7 @@ function lengthAndInput(input) {
     return concat(uint32be(input.length), input);
 }
 exports.lengthAndInput = lengthAndInput;
-async function concatKdf(digest, secret, bits, value) {
+async function concatKdf(secret, bits, value) {
     const iterations = Math.ceil((bits >> 3) / 32);
     let res;
     for (let iter = 1; iter <= iterations; iter++) {
@@ -53,10 +54,10 @@ async function concatKdf(digest, secret, bits, value) {
         buf.set(secret, 4);
         buf.set(value, 4 + secret.length);
         if (!res) {
-            res = await digest('sha256', buf);
+            res = await (0, digest_js_1.default)('sha256', buf);
         }
         else {
-            res = concat(res, await digest('sha256', buf));
+            res = concat(res, await (0, digest_js_1.default)('sha256', buf));
         }
     }
     res = res.slice(0, bits >> 3);

package/dist/node/cjs/runtime/ecdhes.js

@@ -5,7 +5,6 @@ const crypto_1 = require("crypto");
 const util_1 = require("util");
 const get_named_curve_js_1 = require("./get_named_curve.js");
 const buffer_utils_js_1 = require("../lib/buffer_utils.js");
-const digest_js_1 = require("./digest.js");
 const errors_js_1 = require("../util/errors.js");
 const webcrypto_js_1 = require("./webcrypto.js");
 const crypto_key_js_1 = require("../lib/crypto_key.js");
@@ -38,7 +37,7 @@ async function deriveKey(publicKee, privateKee, algorithm, keyLength, apu = new
     }
     const value = (0, buffer_utils_js_1.concat)((0, buffer_utils_js_1.lengthAndInput)(buffer_utils_js_1.encoder.encode(algorithm)), (0, buffer_utils_js_1.lengthAndInput)(apu), (0, buffer_utils_js_1.lengthAndInput)(apv), (0, buffer_utils_js_1.uint32be)(keyLength));
     const sharedSecret = (0, crypto_1.diffieHellman)({ privateKey, publicKey });
-    return (0, buffer_utils_js_1.concatKdf)(digest_js_1.default, sharedSecret, keyLength, value);
+    return (0, buffer_utils_js_1.concatKdf)(sharedSecret, keyLength, value);
 }
 exports.deriveKey = deriveKey;
 async function generateEpk(kee) {

package/dist/node/esm/jwe/compact/decrypt.js

@@ -13,7 +13,7 @@ export async function compactDecrypt(jwe, key, options) {
         throw new JWEInvalid('Invalid Compact JWE');
     }
     const decrypted = await flattenedDecrypt({
-        ciphertext: (ciphertext || undefined),
+        ciphertext,
         iv: (iv || undefined),
         protected: protectedHeader || undefined,
         tag: (tag || undefined),

package/dist/node/esm/jwk/thumbprint.js

@@ -12,6 +12,11 @@ export async function calculateJwkThumbprint(jwk, digestAlgorithm = 'sha256') {
     if (!isObject(jwk)) {
         throw new TypeError('JWK must be an object');
     }
+    if (digestAlgorithm !== 'sha256' &&
+        digestAlgorithm !== 'sha384' &&
+        digestAlgorithm !== 'sha512') {
+        throw new TypeError('digestAlgorithm must one of "sha256", "sha384", or "sha512"');
+    }
     let components;
     switch (jwk.kty) {
         case 'EC':

package/dist/node/esm/lib/buffer_utils.js

@@ -1,3 +1,4 @@
+import digest from '../runtime/digest.js';
 export const encoder = new TextEncoder();
 export const decoder = new TextDecoder();
 const MAX_INT32 = 2 ** 32;
@@ -36,7 +37,7 @@ export function uint32be(value) {
 export function lengthAndInput(input) {
     return concat(uint32be(input.length), input);
 }
-export async function concatKdf(digest, secret, bits, value) {
+export async function concatKdf(secret, bits, value) {
     const iterations = Math.ceil((bits >> 3) / 32);
     let res;
     for (let iter = 1; iter <= iterations; iter++) {

package/dist/node/esm/runtime/ecdhes.js

@@ -2,7 +2,6 @@ import { diffieHellman, generateKeyPair as generateKeyPairCb, KeyObject } from '
 import { promisify } from 'util';
 import getNamedCurve from './get_named_curve.js';
 import { encoder, concat, uint32be, lengthAndInput, concatKdf } from '../lib/buffer_utils.js';
-import digest from './digest.js';
 import { JOSENotSupported } from '../util/errors.js';
 import { isCryptoKey } from './webcrypto.js';
 import { checkEncCryptoKey } from '../lib/crypto_key.js';
@@ -35,7 +34,7 @@ export async function deriveKey(publicKee, privateKee, algorithm, keyLength, apu
     }
     const value = concat(lengthAndInput(encoder.encode(algorithm)), lengthAndInput(apu), lengthAndInput(apv), uint32be(keyLength));
     const sharedSecret = diffieHellman({ privateKey, publicKey });
-    return concatKdf(digest, sharedSecret, keyLength, value);
+    return concatKdf(sharedSecret, keyLength, value);
 }
 export async function generateEpk(kee) {
     let key;

package/dist/types/types.d.ts

@@ -118,7 +118,7 @@ export interface JWK {
   [propName: string]: unknown
 }
 export interface GetKeyFunction<T, T2> {
-  (protectedHeader: T, token: T2): Promise<KeyLike | Uint8Array>
+  (protectedHeader: T, token: T2): Promise<KeyLike | Uint8Array> | KeyLike | Uint8Array
 }
 export interface FlattenedJWSInput {
   header?: JWSHeaderParameters

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jose",
-  "version": "4.5.0",
+  "version": "4.5.3",
   "description": "'JSON Web Almost Everything' - JWA, JWS, JWE, JWT, JWK, JWKS with no dependencies using runtime's native crypto",
   "keywords": [
     "browser",