@thurinlabs/identity-kit 1.2.1 → 1.3.1

package/dist/embed.global.js

@@ -31233,6 +31233,28 @@ ${prettyStateOverride(stateOverride)}`;
       return null;
     }
   }
+  async function verifyClearsigned({ armoredKey, clearsigned }) {
+    try {
+      const openpgp = await Promise.resolve().then(() => (init_openpgp_min(), openpgp_min_exports));
+      const { readKey, readCleartextMessage, LiteralDataPacket } = openpgp;
+      const config = pgpConfig(openpgp);
+      const publicKey = await readKey({ armoredKey });
+      const message = await readCleartextMessage({ cleartextMessage: clearsigned });
+      const msg = message;
+      const now = /* @__PURE__ */ new Date();
+      for (const sig of msg.signature.packets) {
+        if (!publicKey.getKeys(sig.issuerKeyID).length) continue;
+        const signingKey = await publicKey.getSigningKey(sig.issuerKeyID, now, void 0, config);
+        const literal = new LiteralDataPacket();
+        literal.setText(msg.text ?? message.getText().replace(/\r?\n/g, "\r\n"));
+        await sig.verify(signingKey.keyPacket, sig.signatureType, literal, now, true, config);
+        return { verified: true, text: message.getText() };
+      }
+      return { verified: false, reason: "Message is not signed by this key", text: message.getText() };
+    } catch (err) {
+      return { verified: false, reason: err instanceof Error ? err.message : "Verification failed", text: "" };
+    }
+  }
   async function verifyAttestation({
     pgpPublicKey,
     pgpSignature,
@@ -31244,28 +31266,15 @@ ${prettyStateOverride(stateOverride)}`;
         return { verified: false, reason: "Missing PGP data" };
       }
       const openpgp = await Promise.resolve().then(() => (init_openpgp_min(), openpgp_min_exports));
-      const { readKey, readCleartextMessage, LiteralDataPacket } = openpgp;
-      const config = pgpConfig(openpgp);
+      const { readKey } = openpgp;
       const publicKey = await readKey({ armoredKey: pgpPublicKey });
       const keyFingerprint = publicKey.getFingerprint().toUpperCase();
       if (keyFingerprint !== fingerprint.toUpperCase()) {
         return { verified: false, reason: "Key fingerprint mismatch" };
       }
-      const message = await readCleartextMessage({ cleartextMessage: pgpSignature });
-      const msg = message;
-      const now = /* @__PURE__ */ new Date();
-      let signed2 = false;
-      for (const sig of msg.signature.packets) {
-        if (!publicKey.getKeys(sig.issuerKeyID).length) continue;
-        const signingKey = await publicKey.getSigningKey(sig.issuerKeyID, now, void 0, config);
-        const literal = new LiteralDataPacket();
-        literal.setText(msg.text ?? message.getText().replace(/\r?\n/g, "\r\n"));
-        await sig.verify(signingKey.keyPacket, sig.signatureType, literal, now, true, config);
-        signed2 = true;
-        break;
-      }
-      if (!signed2) return { verified: false, reason: "Message is not signed by this key" };
-      const signedText = message.getText();
+      const v2 = await verifyClearsigned({ armoredKey: pgpPublicKey, clearsigned: pgpSignature });
+      if (!v2.verified) return { verified: false, reason: v2.reason };
+      const signedText = v2.text;
       if (!signedText.toLowerCase().includes(ethAddress.toLowerCase())) {
         return { verified: false, reason: "Signed message does not contain ETH address" };
       }