Merge pull request #138 from TrustNXT/bugfix/single-certificate-chain

COSE: Support single-certificate x5chain
TrustNXT · Oct 16, 2024 · 28dfeaa · 28dfeaa
2 parents dcced04 + 33e0541
commit 28dfeaa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/silly-candles-divide.md b/.changeset/silly-candles-divide.md
@@ -0,0 +1,5 @@
+---
+'@trustnxt/c2pa-ts': minor
+---
+
+Fix COSE deserilization failing for single-certificate chains
diff --git a/src/cose/Signature.ts b/src/cose/Signature.ts
@@ -71,7 +71,8 @@ export class Signature {
 
         if (x5chainCandidates.length !== 1) throw new MalformedContentError('Malformed credentials');
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-        const x5chain = x5chainCandidates[0]!;
+        let x5chain = x5chainCandidates[0]!;
+        if (!Array.isArray(x5chain)) x5chain = [x5chain];
 
         try {
             signature.certificate = new X509Certificate(x5chain[0]);

diff --git a/src/cose/types.ts b/src/cose/types.ts
@@ -1,8 +1,8 @@
 export interface HeaderBucket {
     [key: string]: unknown;
     '1'?: number; // alg
-    '33'?: Uint8Array[]; // x5chain
-    x5chain?: Uint8Array[]; // legacy named x5chain
+    '33'?: Uint8Array[] | Uint8Array; // x5chain
+    x5chain?: Uint8Array[] | Uint8Array; // legacy named x5chain
     sigTst?: {
         tstTokens: {
             val: Uint8Array;