From 7e7c3149635b6d985a7e3b3c0b3e3c8707d15aba Mon Sep 17 00:00:00 2001
From: larabr <7375870+larabr@users.noreply.github.com>
Date: Tue, 14 May 2024 13:20:58 +0200
Subject: [PATCH] `readPrivateKeys`: support parsing key block with mix of
 private and public keys

Previously, parsing a key block where a public key followed a private one would fail.
---
 src/key/factory.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/key/factory.js b/src/key/factory.js
index 37ee2a77..36e39a46 100644
--- a/src/key/factory.js
+++ b/src/key/factory.js
@@ -456,14 +456,17 @@ export async function readPrivateKeys({ armoredKeys, binaryKeys, config }) {
   }
   const keys = [];
   const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config);
-  const keyIndex = packetlist.indexOfTag(enums.packet.secretKey);
-  if (keyIndex.length === 0) {
-    throw new Error('No secret key packet found');
-  }
+  const keyIndex = packetlist.indexOfTag(enums.packet.publicKey, enums.packet.secretKey);
   for (let i = 0; i < keyIndex.length; i++) {
+    if (packetlist[keyIndex[i]].constructor.tag === enums.packet.publicKey) {
+      continue;
+    }
     const oneKeyList = packetlist.slice(keyIndex[i], keyIndex[i + 1]);
     const newKey = new PrivateKey(oneKeyList);
     keys.push(newKey);
   }
+  if (keys.length === 0) {
+    throw new Error('No secret key packet found');
+  }
   return keys;
 }