PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-23 12:52:07 +01:00
Code Issues Releases Wiki Activity

Properly ignore marker packets when reading keys/sigs

Browse source
This commit is contained in:
Paul Schaub 2021-07-31 22:25:12 +02:00
parent fb16db5db4
commit e7ed0f76a3
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pgpainless-core/src/main/java/org/pgpainless/key/collection/PGPKeyRingCollection.java
View file

@ -15,9 +15,17 @@
*/ */
package org.pgpainless.key.collection; package org.pgpainless.key.collection;
import org.bouncycastle.bcpg.MarkerPacket; import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.annotation.Nonnull;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPKeyRing; import org.bouncycastle.openpgp.PGPKeyRing;
import org.bouncycastle.openpgp.PGPMarker;
import org.bouncycastle.openpgp.PGPObjectFactory; import org.bouncycastle.openpgp.PGPObjectFactory;
import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRing;
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
@ -26,14 +34,6 @@ import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.PGPUtil;
import org.pgpainless.implementation.ImplementationFactory; import org.pgpainless.implementation.ImplementationFactory;
import javax.annotation.Nonnull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
/** /**
* This class describes a logic of handling a collection of different {@link PGPKeyRing}. The logic was inspired by * This class describes a logic of handling a collection of different {@link PGPKeyRing}. The logic was inspired by
* {@link PGPSecretKeyRingCollection} and {@link PGPPublicKeyRingCollection}. * {@link PGPSecretKeyRingCollection} and {@link PGPPublicKeyRingCollection}.
@ -65,7 +65,7 @@ public class PGPKeyRingCollection {
List<PGPPublicKeyRing> publicKeyRings = new ArrayList<>(); List<PGPPublicKeyRing> publicKeyRings = new ArrayList<>();
while ((obj = pgpFact.nextObject()) != null) { while ((obj = pgpFact.nextObject()) != null) {
if (obj instanceof MarkerPacket) { if (obj instanceof PGPMarker) {
// Skip marker packets // Skip marker packets
continue; continue;
} }

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

@ -26,8 +26,8 @@ import java.util.List;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import org.bouncycastle.bcpg.ArmoredInputStream; import org.bouncycastle.bcpg.ArmoredInputStream;
import org.bouncycastle.bcpg.MarkerPacket;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPMarker;
import org.bouncycastle.openpgp.PGPObjectFactory; import org.bouncycastle.openpgp.PGPObjectFactory;
import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRing;
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
@ -117,7 +117,7 @@ public class KeyRingReader {
if (next == null) { if (next == null) {
break; break;
} }
if (next instanceof MarkerPacket) { if (next instanceof PGPMarker) {
continue; continue;
} }
if (next instanceof PGPPublicKeyRing) { if (next instanceof PGPPublicKeyRing) {
@ -142,7 +142,7 @@ public class KeyRingReader {
if (next == null) { if (next == null) {
break; break;
} }
if (next instanceof MarkerPacket) { if (next instanceof PGPMarker) {
continue; continue;
} }
if (next instanceof PGPPublicKeyRing) { if (next instanceof PGPPublicKeyRing) {
@ -172,7 +172,7 @@ public class KeyRingReader {
if (next == null) { if (next == null) {
break; break;
} }
if (next instanceof MarkerPacket) { if (next instanceof PGPMarker) {
continue; continue;
} }
if (next instanceof PGPSecretKeyRing) { if (next instanceof PGPSecretKeyRing) {
@ -198,7 +198,7 @@ public class KeyRingReader {
if (next == null) { if (next == null) {
break; break;
} }
if (next instanceof MarkerPacket) { if (next instanceof PGPMarker) {
continue; continue;
} }
if (next instanceof PGPSecretKeyRing) { if (next instanceof PGPSecretKeyRing) {

4
pgpainless-core/src/main/java/org/pgpainless/signature/SignatureUtils.java
View file

@ -24,12 +24,12 @@ import java.util.Date;
import java.util.List; import java.util.List;
import org.bouncycastle.bcpg.sig.IssuerKeyID; import org.bouncycastle.bcpg.sig.IssuerKeyID;
import org.bouncycastle.bcpg.MarkerPacket;
import org.bouncycastle.bcpg.sig.KeyExpirationTime; import org.bouncycastle.bcpg.sig.KeyExpirationTime;
import org.bouncycastle.bcpg.sig.RevocationReason; import org.bouncycastle.bcpg.sig.RevocationReason;
import org.bouncycastle.bcpg.sig.SignatureExpirationTime; import org.bouncycastle.bcpg.sig.SignatureExpirationTime;
import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPCompressedData;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPMarker;
import org.bouncycastle.openpgp.PGPObjectFactory; import org.bouncycastle.openpgp.PGPObjectFactory;
import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPPublicKey;
import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.PGPSecretKey;
@ -202,7 +202,7 @@ public class SignatureUtils {
Object nextObject = objectFactory.nextObject(); Object nextObject = objectFactory.nextObject();
while (nextObject != null) { while (nextObject != null) {
if (nextObject instanceof MarkerPacket) { if (nextObject instanceof PGPMarker) {
nextObject = objectFactory.nextObject(); nextObject = objectFactory.nextObject();
continue; continue;
} }