Fix SPKI parsing (#35)

guardtime · Mar 6, 2024 · cccb0c2 · cccb0c2
1 parent be6d092
commit cccb0c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/crypto/pkcs7/BrowserPublicKey.ts b/src/crypto/pkcs7/BrowserPublicKey.ts
@@ -1,4 +1,4 @@
-import crypto from "node:crypto";
+const { subtle } = globalThis.crypto;
 import { SubjectPublicKeyInfo } from "./SubjectPublicKeyInfo.js";
 import { PublicKey } from "./PublicKey.js";
 import { DigestAlgorithm } from "./DigestAlgorithm.js";
@@ -15,20 +15,15 @@ export class BrowserPublicKey implements PublicKey {
     data: Uint8Array,
     signature: Uint8Array,
   ): Promise<boolean> {
-    const publicKey = await crypto.subtle.importKey(
+    const publicKey = await subtle.importKey(
       "spki",
       this.publicKeyInfo.getBytes(),
       this.getSpkiAlgorithmParams(this.publicKeyInfo.algorithm, algorithm),
       false,
       ["verify"],
     );
 
-    return crypto.subtle.verify(
-      publicKey.algorithm.name,
-      publicKey,
-      signature,
-      data,
-    );
+    return subtle.verify(publicKey.algorithm.name, publicKey, signature, data);
   }
 
   private getSpkiAlgorithmParams(

diff --git a/src/crypto/pkcs7/SubjectPublicKeyInfo.ts b/src/crypto/pkcs7/SubjectPublicKeyInfo.ts
@@ -11,7 +11,11 @@ export class SubjectPublicKeyInfo {
 
   public constructor(obj: Asn1Object) {
     const children = obj.parseValueAsChildren();
-    this.algorithm = children.at(0)?.parseValueAsObjectIdentifier() as string;
+    this.algorithm = children
+      .at(0)
+      ?.parseValueAsChildren()
+      .at(0)
+      ?.parseValueAsObjectIdentifier() as string;
     this.publicKey = children.at(1)?.parseValueBitStringAsBytes() as Uint8Array;
     this.bytes = obj.getBytes();
   }