@thurinlabs/identity-kit 1.0.2 → 1.0.3

package/dist/index.cjs

@@ -1339,7 +1339,9 @@ function keyIdToBytes(keyId) {
 }
 
 // src/core/pgp.ts
-var PGP_CONFIG = { rejectCurves: /* @__PURE__ */ new Set() };
+function pgpConfig(openpgp) {
+  return { ...openpgp.config, rejectCurves: /* @__PURE__ */ new Set() };
+}
 function algorithmName(keyOrSubkey) {
   try {
     const info = keyOrSubkey.getAlgorithmInfo();
@@ -1361,7 +1363,9 @@ function algorithmName(keyOrSubkey) {
 }
 async function parsePgpKey(armoredKey) {
   try {
-    const { readKey } = await Promise.resolve().then(() => _interopRequireWildcard(require("openpgp")));
+    const openpgp = await Promise.resolve().then(() => _interopRequireWildcard(require("openpgp")));
+    const { readKey } = openpgp;
+    const config = pgpConfig(openpgp);
     const key = await readKey({ armoredKey });
     const fingerprint = key.getFingerprint().toUpperCase();
     const algorithm = algorithmName(key);
@@ -1382,7 +1386,10 @@ async function parsePgpKey(armoredKey) {
             cert.signatureType,
             { userID: user.userID, key: key.keyPacket },
             void 0,
-            PGP_CONFIG
+            // date: now
+            void 0,
+            // detached
+            config
           );
         } catch (e3) {
           continue;
@@ -1426,15 +1433,28 @@ async function verifyAttestation({
     if (!pgpPublicKey || !pgpSignature) {
       return { verified: false, reason: "Missing PGP data" };
     }
-    const { readKey, readCleartextMessage, verify } = await Promise.resolve().then(() => _interopRequireWildcard(require("openpgp")));
+    const openpgp = await Promise.resolve().then(() => _interopRequireWildcard(require("openpgp")));
+    const { readKey, readCleartextMessage, LiteralDataPacket } = openpgp;
+    const config = pgpConfig(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 { signatures } = await verify({ message, verificationKeys: publicKey, config: PGP_CONFIG });
-    await signatures[0].verified;
+    const msg = message;
+    const now = /* @__PURE__ */ new Date();
+    let signed = 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(_nullishCoalesce(msg.text, () => ( message.getText().replace(/\r?\n/g, "\r\n"))));
+      await sig.verify(signingKey.keyPacket, sig.signatureType, literal, now, true, config);
+      signed = true;
+      break;
+    }
+    if (!signed) return { verified: false, reason: "Message is not signed by this key" };
     const signedText = message.getText();
     if (!signedText.toLowerCase().includes(ethAddress.toLowerCase())) {
       return { verified: false, reason: "Signed message does not contain ETH address" };