PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-25 20:37:59 +01:00
Code Issues Releases Wiki Activity

KeyRingReader.readPublicKeyRingCollection: Handle secret keys as public keys

Browse source
This commit is contained in:
Paul Schaub 2023-07-06 13:08:56 +02:00
parent 16ec6bc5e4
commit 7a777ab914
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pgpainless-core/src/main/java/org/pgpainless/key/parsing/KeyRingReader.java
View file

@ -23,6 +23,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
import org.bouncycastle.util.io.Streams; import org.bouncycastle.util.io.Streams;
import org.pgpainless.PGPainless;
import org.pgpainless.implementation.ImplementationFactory; import org.pgpainless.implementation.ImplementationFactory;
import org.pgpainless.key.collection.PGPKeyRingCollection; import org.pgpainless.key.collection.PGPKeyRingCollection;
import org.pgpainless.util.ArmorUtils; import org.pgpainless.util.ArmorUtils;
@ -295,6 +296,12 @@ public class KeyRingReader {
} }
if (next instanceof PGPPublicKeyRing) { if (next instanceof PGPPublicKeyRing) {
rings.add((PGPPublicKeyRing) next); rings.add((PGPPublicKeyRing) next);
continue;
}
// Parse public keys from secret keys
if (next instanceof PGPSecretKeyRing) {
rings.add(PGPainless.extractCertificate((PGPSecretKeyRing) next));
continue;
} }
if (next instanceof PGPPublicKeyRingCollection) { if (next instanceof PGPPublicKeyRingCollection) {
PGPPublicKeyRingCollection collection = (PGPPublicKeyRingCollection) next; PGPPublicKeyRingCollection collection = (PGPPublicKeyRingCollection) next;