@sd-jwt/core 0.19.1-next.9 → 0.20.1-next.0

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [0.20.0](https://github.com/openwallet-foundation/sd-jwt-js/compare/v0.1.0...v0.20.0) (2026-06-29)
+
+
+### Features
+
+* version fixing to current 0.19.0 ([#382](https://github.com/openwallet-foundation/sd-jwt-js/issues/382)) ([d88c631](https://github.com/openwallet-foundation/sd-jwt-js/commit/d88c631fe4c3cefcbc96f268cb9d340296facbba))
+
+
+
+
+
+# [0.1.0](https://github.com/openwallet-foundation/sd-jwt-js/compare/v0.19.0...v0.1.0) (2026-06-29)
+
+
+### Bug Fixes
+
+* **core:** reject tampered/unreferenced disclosures and reserved claims ([#380](https://github.com/openwallet-foundation/sd-jwt-js/issues/380)) ([3d8a72a](https://github.com/openwallet-foundation/sd-jwt-js/commit/3d8a72a0a279d67439db038c9c2b52621568b866))
+* verify common jwt claims for kb-jwt ([#378](https://github.com/openwallet-foundation/sd-jwt-js/issues/378)) ([9e9bca1](https://github.com/openwallet-foundation/sd-jwt-js/commit/9e9bca10de3ad8574bfcbc875c85e37cee541505))
+
+
+### Features
+
+* allow disabling status verification ([#381](https://github.com/openwallet-foundation/sd-jwt-js/issues/381)) ([c9d73e4](https://github.com/openwallet-foundation/sd-jwt-js/commit/c9d73e4db2a925e5096988fffe7eded62db1b6a7))

package/dist/index.d.mts

@@ -336,6 +336,12 @@ type VerifierOptions = {
      * nonce used to verify the key binding jwt to prevent replay attacks.
      */
     keyBindingNonce?: string;
+    /**
+     * disable the verification of the status claim in the payload.
+     *
+     * @default false
+     */
+    disableStatusVerification?: boolean;
     /**
      * any other custom options
      */
@@ -376,6 +382,11 @@ declare class KBJwt<Header extends kbHeader = kbHeader, Payload extends kbPayloa
         verifier: KbVerifier;
         payload: Record<string, unknown>;
         nonce: string;
+        /**
+         * Options forwarded to the common JWT verification, e.g. currentDate and
+         * skewSeconds used to validate the iat, nbf and exp claims.
+         */
+        options?: VerifierOptions;
     }): Promise<{
         payload: Payload;
         header: Header;
@@ -537,11 +548,12 @@ declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload, T = unknown> {
         header?: object;
     }): Promise<SDJWTCompact>;
     /**
-     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-     * @param disclosureFrame
+     * Validates if the payload contains any reserved claim names. If so it will throw an error.
+     * @param payload
      * @returns
      */
-    protected validateReservedFields<T extends ExtendedPayload>(_disclosureFrame: DisclosureFrame<T>): void;
+    protected validateReservedFields<T extends ExtendedPayload>(payload: T): void;
+    protected validateDisclosureFrame<T extends ExtendedPayload>(_disclosureFrame?: DisclosureFrame<T>): void;
     present<T extends Record<string, unknown>>(encodedSDJwt: string, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
@@ -610,21 +622,22 @@ declare class SDJwtGeneralJSONInstance<ExtendedPayload extends SdJwtPayload> {
         }>;
     }): Promise<GeneralJSON>;
     /**
-     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-     * @param disclosureFrame
+     * Validates if the payload contains any reserved claim names. If so it will throw an error.
+     * @param payload
      * @returns
      */
-    protected validateReservedFields<T extends ExtendedPayload>(_disclosureFrame: DisclosureFrame<T>): void;
+    protected validateReservedFields<T extends ExtendedPayload>(payload: T): void;
+    protected validateDisclosureFrame<T extends ExtendedPayload>(_disclosureFrame?: DisclosureFrame<T>): void;
     present<T extends Record<string, unknown>>(generalJSON: GeneralJSON, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<GeneralJSON>;
     verify(generalJSON: GeneralJSON, options?: VerifierOptions): Promise<{
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
         kb?: undefined;
     } | {
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
         kb: {
             payload: kbPayload;
             header: kbHeader;
@@ -633,7 +646,7 @@ declare class SDJwtGeneralJSONInstance<ExtendedPayload extends SdJwtPayload> {
     private calculateSDHash;
     validate(generalJSON: GeneralJSON): Promise<{
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
     }>;
     config(newConfig: SDJWTConfig): void;
     encode(sdJwt: GeneralJSON, index: number): SDJWTCompact;

package/dist/index.d.ts

@@ -336,6 +336,12 @@ type VerifierOptions = {
      * nonce used to verify the key binding jwt to prevent replay attacks.
      */
     keyBindingNonce?: string;
+    /**
+     * disable the verification of the status claim in the payload.
+     *
+     * @default false
+     */
+    disableStatusVerification?: boolean;
     /**
      * any other custom options
      */
@@ -376,6 +382,11 @@ declare class KBJwt<Header extends kbHeader = kbHeader, Payload extends kbPayloa
         verifier: KbVerifier;
         payload: Record<string, unknown>;
         nonce: string;
+        /**
+         * Options forwarded to the common JWT verification, e.g. currentDate and
+         * skewSeconds used to validate the iat, nbf and exp claims.
+         */
+        options?: VerifierOptions;
     }): Promise<{
         payload: Payload;
         header: Header;
@@ -537,11 +548,12 @@ declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload, T = unknown> {
         header?: object;
     }): Promise<SDJWTCompact>;
     /**
-     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-     * @param disclosureFrame
+     * Validates if the payload contains any reserved claim names. If so it will throw an error.
+     * @param payload
      * @returns
      */
-    protected validateReservedFields<T extends ExtendedPayload>(_disclosureFrame: DisclosureFrame<T>): void;
+    protected validateReservedFields<T extends ExtendedPayload>(payload: T): void;
+    protected validateDisclosureFrame<T extends ExtendedPayload>(_disclosureFrame?: DisclosureFrame<T>): void;
     present<T extends Record<string, unknown>>(encodedSDJwt: string, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
@@ -610,21 +622,22 @@ declare class SDJwtGeneralJSONInstance<ExtendedPayload extends SdJwtPayload> {
         }>;
     }): Promise<GeneralJSON>;
     /**
-     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-     * @param disclosureFrame
+     * Validates if the payload contains any reserved claim names. If so it will throw an error.
+     * @param payload
      * @returns
      */
-    protected validateReservedFields<T extends ExtendedPayload>(_disclosureFrame: DisclosureFrame<T>): void;
+    protected validateReservedFields<T extends ExtendedPayload>(payload: T): void;
+    protected validateDisclosureFrame<T extends ExtendedPayload>(_disclosureFrame?: DisclosureFrame<T>): void;
     present<T extends Record<string, unknown>>(generalJSON: GeneralJSON, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<GeneralJSON>;
     verify(generalJSON: GeneralJSON, options?: VerifierOptions): Promise<{
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
         kb?: undefined;
     } | {
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
         kb: {
             payload: kbPayload;
             header: kbHeader;
@@ -633,7 +646,7 @@ declare class SDJwtGeneralJSONInstance<ExtendedPayload extends SdJwtPayload> {
     private calculateSDHash;
     validate(generalJSON: GeneralJSON): Promise<{
         payload: ExtendedPayload;
-        headers: any[];
+        headers: unknown[];
     }>;
     config(newConfig: SDJWTConfig): void;
     encode(sdJwt: GeneralJSON, index: number): SDJWTCompact;

package/dist/index.js

@@ -161,6 +161,18 @@ function ensureError(value) {
   return new Error(String(value));
 }
 
+// src/utils/strict-json.ts
+var utf8Decoder = new TextDecoder("utf-8", { fatal: true });
+var decodeBase64urlJsonStrict = (encoded, errorMessage) => {
+  try {
+    const bytes = (0, import_identity_common.base64UrlToUint8Array)(encoded);
+    const decoded = utf8Decoder.decode(bytes);
+    return JSON.parse(decoded);
+  } catch (e) {
+    throw new SDJWTException(errorMessage);
+  }
+};
+
 // src/utils/disclosure.ts
 var Disclosure = class _Disclosure {
   constructor(data, _meta) {
@@ -187,7 +199,10 @@ var Disclosure = class _Disclosure {
       const { hasher, alg } = hash;
       const digest = yield hasher(s, alg);
       const digestStr = (0, import_identity_common.uint8ArrayToBase64Url)(digest);
-      const item = JSON.parse((0, import_identity_common.base64urlDecode)(s));
+      const item = decodeBase64urlJsonStrict(
+        s,
+        "Invalid disclosure data"
+      );
       return _Disclosure.fromArray(item, { digest: digestStr, encoded: s });
     });
   }
@@ -195,7 +210,10 @@ var Disclosure = class _Disclosure {
     const { hasher, alg } = hash;
     const digest = hasher(s, alg);
     const digestStr = (0, import_identity_common.uint8ArrayToBase64Url)(digest);
-    const item = JSON.parse((0, import_identity_common.base64urlDecode)(s));
+    const item = decodeBase64urlJsonStrict(
+      s,
+      "Invalid disclosure data"
+    );
     return _Disclosure.fromArray(item, { digest: digestStr, encoded: s });
   }
   static fromArray(item, _meta) {
@@ -237,8 +255,8 @@ var decodeJwt = (jwt) => {
     throw new SDJWTException("Invalid JWT as input");
   }
   return {
-    header: JSON.parse((0, import_identity_common.base64urlDecode)(header)),
-    payload: JSON.parse((0, import_identity_common.base64urlDecode)(payload)),
+    header: decodeBase64urlJsonStrict(header, "Invalid JWT as input"),
+    payload: decodeBase64urlJsonStrict(payload, "Invalid JWT as input"),
     signature
   };
 };
@@ -431,6 +449,11 @@ var getSDAlgAndPayload = (SdJwtPayload) => {
   if (typeof _sd_alg !== "string") {
     return { _sd_alg: "sha-256", payload };
   }
+  if (!IANA_HASH_ALGORITHMS.includes(
+    _sd_alg
+  )) {
+    throw new SDJWTException(`Invalid _sd_alg: ${_sd_alg}`);
+  }
   return { _sd_alg, payload };
 };
 var unpack = (SdJwtPayload, disclosures, hasher) => __async(null, null, function* () {
@@ -730,18 +753,13 @@ var KBJwt = class _KBJwt extends Jwt {
       !(this.payload.sd_hash || "_sd_hash" in this.payload && this.payload._sd_hash)) {
         throw new SDJWTException("Invalid Key Binding Jwt");
       }
-      const data = this.getUnsignedToken();
-      const verified = yield values.verifier(
-        data,
-        this.signature,
-        values.payload
-      );
-      if (!verified) {
-        throw new SDJWTException("Verify Error: Invalid JWT Signature");
-      }
       if (this.payload.nonce !== values.nonce) {
         throw new SDJWTException("Verify Error: Invalid Nonce");
       }
+      yield this.verify(
+        (data, sig) => values.verifier(data, sig, values.payload),
+        values.options
+      );
       return { payload: this.payload, header: this.header };
     });
   }
@@ -1160,9 +1178,8 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!this.userConfig.signAlg) {
         throw new SDJWTException("sign alogrithm not specified");
       }
-      if (disclosureFrame) {
-        this.validateReservedFields(disclosureFrame);
-      }
+      this.validateReservedFields(payload);
+      this.validateDisclosureFrame(disclosureFrame);
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : _SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -1190,11 +1207,30 @@ var _SDJwtInstance = class _SDJwtInstance {
     });
   }
   /**
-   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-   * @param disclosureFrame
+   * Validates if the payload contains any reserved claim names. If so it will throw an error.
+   * @param payload
    * @returns
    */
-  validateReservedFields(_disclosureFrame) {
+  validateReservedFields(payload) {
+    const reservedFields = /* @__PURE__ */ new Set([SD_DIGEST, "_sd_alg", SD_DECOY]);
+    const visit = (node) => {
+      if (!node || typeof node !== "object") {
+        return;
+      }
+      for (const [key, value] of Object.entries(
+        node
+      )) {
+        if (reservedFields.has(key)) {
+          throw new SDJWTException(
+            `Reserved field name "${key}" is not allowed`
+          );
+        }
+        visit(value);
+      }
+    };
+    visit(payload);
+  }
+  validateDisclosureFrame(_disclosureFrame) {
     return;
   }
   present(encodedSDJwt, presentationFrame, options) {
@@ -1259,7 +1295,8 @@ var _SDJwtInstance = class _SDJwtInstance {
       const kb = yield sdjwt.kbJwt.verifyKB({
         verifier: this.userConfig.kbVerifier,
         payload,
-        nonce: options.keyBindingNonce
+        nonce: options.keyBindingNonce,
+        options
       });
       if (!kb) {
         throw new Error("signature is not valid");
@@ -1390,7 +1427,8 @@ var _SDJwtInstance = class _SDJwtInstance {
             const kbResult = yield sdjwt.kbJwt.verifyKB({
               verifier: this.userConfig.kbVerifier,
               payload,
-              nonce: options.keyBindingNonce
+              nonce: options.keyBindingNonce,
+              options
             });
             if (!kbResult) {
               addError(
@@ -1568,9 +1606,8 @@ var SDJwtGeneralJSONInstance = class {
       if (!this.userConfig.saltGenerator) {
         throw new SDJWTException("SaltGenerator not found");
       }
-      if (disclosureFrame) {
-        this.validateReservedFields(disclosureFrame);
-      }
+      this.validateReservedFields(payload);
+      this.validateDisclosureFrame(disclosureFrame);
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -1579,10 +1616,12 @@ var SDJwtGeneralJSONInstance = class {
         { hasher, alg: hashAlg },
         this.userConfig.saltGenerator
       );
-      const encodedDisclosures = disclosures.map((d) => d.encode());
       const encodedSDJwtPayload = this.encodeObj(__spreadProps(__spreadValues({}, packedClaims), {
         _sd_alg: disclosureFrame ? hashAlg : void 0
       }));
+      const encodedDisclosures = disclosures.map(
+        (disclosure) => disclosure.encode()
+      );
       const signatures = yield Promise.all(
         options.sigs.map((s) => __async(this, null, function* () {
           const { signer, alg, kid, header } = s;
@@ -1593,7 +1632,6 @@ var SDJwtGeneralJSONInstance = class {
           );
           return {
             protected: encodedProtectedHeader,
-            kid,
             signature
           };
         }))
@@ -1607,11 +1645,30 @@ var SDJwtGeneralJSONInstance = class {
     });
   }
   /**
-   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-   * @param disclosureFrame
+   * Validates if the payload contains any reserved claim names. If so it will throw an error.
+   * @param payload
    * @returns
    */
-  validateReservedFields(_disclosureFrame) {
+  validateReservedFields(payload) {
+    const reservedFields = /* @__PURE__ */ new Set([SD_DIGEST, "_sd_alg", SD_DECOY]);
+    const visit = (node) => {
+      if (!node || typeof node !== "object") {
+        return;
+      }
+      for (const [key, value] of Object.entries(
+        node
+      )) {
+        if (reservedFields.has(key)) {
+          throw new SDJWTException(
+            `Reserved field name "${key}" is not allowed`
+          );
+        }
+        visit(value);
+      }
+    };
+    visit(payload);
+  }
+  validateDisclosureFrame(_disclosureFrame) {
     return;
   }
   present(generalJSON, presentationFrame, options) {
@@ -1690,7 +1747,8 @@ var SDJwtGeneralJSONInstance = class {
       const kb = yield sdjwt.kbJwt.verifyKB({
         verifier: this.userConfig.kbVerifier,
         payload,
-        nonce: options.keyBindingNonce
+        nonce: options.keyBindingNonce,
+        options
       });
       if (!kb) {
         throw new Error("signature is not valid");
@@ -1743,7 +1801,7 @@ var SDJwtGeneralJSONInstance = class {
             `${encodedHeader}.${payload}`,
             signature
           );
-          const header = JSON.parse((0, import_identity_common.base64urlDecode)(encodedHeader));
+          const header = decodeBase64urlJsonStrict(encodedHeader, "Invalid JWT");
           return { verified: verified2, header };
         }))
       );

package/dist/index.mjs

@@ -102,6 +102,18 @@ function ensureError(value) {
   return new Error(String(value));
 }
 
+// src/utils/strict-json.ts
+var utf8Decoder = new TextDecoder("utf-8", { fatal: true });
+var decodeBase64urlJsonStrict = (encoded, errorMessage) => {
+  try {
+    const bytes = base64UrlToUint8Array(encoded);
+    const decoded = utf8Decoder.decode(bytes);
+    return JSON.parse(decoded);
+  } catch (e) {
+    throw new SDJWTException(errorMessage);
+  }
+};
+
 // src/utils/disclosure.ts
 var Disclosure = class _Disclosure {
   constructor(data, _meta) {
@@ -128,7 +140,10 @@ var Disclosure = class _Disclosure {
       const { hasher, alg } = hash;
       const digest = yield hasher(s, alg);
       const digestStr = uint8ArrayToBase64Url(digest);
-      const item = JSON.parse(base64urlDecode(s));
+      const item = decodeBase64urlJsonStrict(
+        s,
+        "Invalid disclosure data"
+      );
       return _Disclosure.fromArray(item, { digest: digestStr, encoded: s });
     });
   }
@@ -136,7 +151,10 @@ var Disclosure = class _Disclosure {
     const { hasher, alg } = hash;
     const digest = hasher(s, alg);
     const digestStr = uint8ArrayToBase64Url(digest);
-    const item = JSON.parse(base64urlDecode(s));
+    const item = decodeBase64urlJsonStrict(
+      s,
+      "Invalid disclosure data"
+    );
     return _Disclosure.fromArray(item, { digest: digestStr, encoded: s });
   }
   static fromArray(item, _meta) {
@@ -178,8 +196,8 @@ var decodeJwt = (jwt) => {
     throw new SDJWTException("Invalid JWT as input");
   }
   return {
-    header: JSON.parse(base64urlDecode(header)),
-    payload: JSON.parse(base64urlDecode(payload)),
+    header: decodeBase64urlJsonStrict(header, "Invalid JWT as input"),
+    payload: decodeBase64urlJsonStrict(payload, "Invalid JWT as input"),
     signature
   };
 };
@@ -372,6 +390,11 @@ var getSDAlgAndPayload = (SdJwtPayload) => {
   if (typeof _sd_alg !== "string") {
     return { _sd_alg: "sha-256", payload };
   }
+  if (!IANA_HASH_ALGORITHMS.includes(
+    _sd_alg
+  )) {
+    throw new SDJWTException(`Invalid _sd_alg: ${_sd_alg}`);
+  }
   return { _sd_alg, payload };
 };
 var unpack = (SdJwtPayload, disclosures, hasher) => __async(null, null, function* () {
@@ -671,18 +694,13 @@ var KBJwt = class _KBJwt extends Jwt {
       !(this.payload.sd_hash || "_sd_hash" in this.payload && this.payload._sd_hash)) {
         throw new SDJWTException("Invalid Key Binding Jwt");
       }
-      const data = this.getUnsignedToken();
-      const verified = yield values.verifier(
-        data,
-        this.signature,
-        values.payload
-      );
-      if (!verified) {
-        throw new SDJWTException("Verify Error: Invalid JWT Signature");
-      }
       if (this.payload.nonce !== values.nonce) {
         throw new SDJWTException("Verify Error: Invalid Nonce");
       }
+      yield this.verify(
+        (data, sig) => values.verifier(data, sig, values.payload),
+        values.options
+      );
       return { payload: this.payload, header: this.header };
     });
   }
@@ -1101,9 +1119,8 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!this.userConfig.signAlg) {
         throw new SDJWTException("sign alogrithm not specified");
       }
-      if (disclosureFrame) {
-        this.validateReservedFields(disclosureFrame);
-      }
+      this.validateReservedFields(payload);
+      this.validateDisclosureFrame(disclosureFrame);
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : _SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -1131,11 +1148,30 @@ var _SDJwtInstance = class _SDJwtInstance {
     });
   }
   /**
-   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-   * @param disclosureFrame
+   * Validates if the payload contains any reserved claim names. If so it will throw an error.
+   * @param payload
    * @returns
    */
-  validateReservedFields(_disclosureFrame) {
+  validateReservedFields(payload) {
+    const reservedFields = /* @__PURE__ */ new Set([SD_DIGEST, "_sd_alg", SD_DECOY]);
+    const visit = (node) => {
+      if (!node || typeof node !== "object") {
+        return;
+      }
+      for (const [key, value] of Object.entries(
+        node
+      )) {
+        if (reservedFields.has(key)) {
+          throw new SDJWTException(
+            `Reserved field name "${key}" is not allowed`
+          );
+        }
+        visit(value);
+      }
+    };
+    visit(payload);
+  }
+  validateDisclosureFrame(_disclosureFrame) {
     return;
   }
   present(encodedSDJwt, presentationFrame, options) {
@@ -1200,7 +1236,8 @@ var _SDJwtInstance = class _SDJwtInstance {
       const kb = yield sdjwt.kbJwt.verifyKB({
         verifier: this.userConfig.kbVerifier,
         payload,
-        nonce: options.keyBindingNonce
+        nonce: options.keyBindingNonce,
+        options
       });
       if (!kb) {
         throw new Error("signature is not valid");
@@ -1331,7 +1368,8 @@ var _SDJwtInstance = class _SDJwtInstance {
             const kbResult = yield sdjwt.kbJwt.verifyKB({
               verifier: this.userConfig.kbVerifier,
               payload,
-              nonce: options.keyBindingNonce
+              nonce: options.keyBindingNonce,
+              options
             });
             if (!kbResult) {
               addError(
@@ -1509,9 +1547,8 @@ var SDJwtGeneralJSONInstance = class {
       if (!this.userConfig.saltGenerator) {
         throw new SDJWTException("SaltGenerator not found");
       }
-      if (disclosureFrame) {
-        this.validateReservedFields(disclosureFrame);
-      }
+      this.validateReservedFields(payload);
+      this.validateDisclosureFrame(disclosureFrame);
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -1520,10 +1557,12 @@ var SDJwtGeneralJSONInstance = class {
         { hasher, alg: hashAlg },
         this.userConfig.saltGenerator
       );
-      const encodedDisclosures = disclosures.map((d) => d.encode());
       const encodedSDJwtPayload = this.encodeObj(__spreadProps(__spreadValues({}, packedClaims), {
         _sd_alg: disclosureFrame ? hashAlg : void 0
       }));
+      const encodedDisclosures = disclosures.map(
+        (disclosure) => disclosure.encode()
+      );
       const signatures = yield Promise.all(
         options.sigs.map((s) => __async(this, null, function* () {
           const { signer, alg, kid, header } = s;
@@ -1534,7 +1573,6 @@ var SDJwtGeneralJSONInstance = class {
           );
           return {
             protected: encodedProtectedHeader,
-            kid,
             signature
           };
         }))
@@ -1548,11 +1586,30 @@ var SDJwtGeneralJSONInstance = class {
     });
   }
   /**
-   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
-   * @param disclosureFrame
+   * Validates if the payload contains any reserved claim names. If so it will throw an error.
+   * @param payload
    * @returns
    */
-  validateReservedFields(_disclosureFrame) {
+  validateReservedFields(payload) {
+    const reservedFields = /* @__PURE__ */ new Set([SD_DIGEST, "_sd_alg", SD_DECOY]);
+    const visit = (node) => {
+      if (!node || typeof node !== "object") {
+        return;
+      }
+      for (const [key, value] of Object.entries(
+        node
+      )) {
+        if (reservedFields.has(key)) {
+          throw new SDJWTException(
+            `Reserved field name "${key}" is not allowed`
+          );
+        }
+        visit(value);
+      }
+    };
+    visit(payload);
+  }
+  validateDisclosureFrame(_disclosureFrame) {
     return;
   }
   present(generalJSON, presentationFrame, options) {
@@ -1631,7 +1688,8 @@ var SDJwtGeneralJSONInstance = class {
       const kb = yield sdjwt.kbJwt.verifyKB({
         verifier: this.userConfig.kbVerifier,
         payload,
-        nonce: options.keyBindingNonce
+        nonce: options.keyBindingNonce,
+        options
       });
       if (!kb) {
         throw new Error("signature is not valid");
@@ -1684,7 +1742,7 @@ var SDJwtGeneralJSONInstance = class {
             `${encodedHeader}.${payload}`,
             signature
           );
-          const header = JSON.parse(base64urlDecode(encodedHeader));
+          const header = decodeBase64urlJsonStrict(encodedHeader, "Invalid JWT");
           return { verified: verified2, header };
         }))
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/core",
-  "version": "0.19.1-next.9+d8ec21a",
+  "version": "0.20.1-next.0+af170ac",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -58,5 +58,5 @@
       "esm"
     ]
   },
-  "gitHead": "d8ec21aa144d1d3a0fb5eb9fe5c609696b2076aa"
+  "gitHead": "af170ace9b42984f8c6447caf23256fde6204b31"
 }