From d53501c9cd82007b5469359d16dfa0bb2538646b Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sun, 8 Jul 2018 18:17:24 +0200 Subject: [PATCH] Improve decryption API --- .../decryption_verification/DecryptionBuilder.java | 9 +++++++++ .../DecryptionBuilderInterface.java | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java index 1e065843..0c7a97bb 100644 --- a/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilder.java @@ -61,6 +61,15 @@ public class DecryptionBuilder implements DecryptionBuilderInterface { class VerifyWithImpl implements VerifyWith { + @Override + public HandleMissingPublicKeys verifyWith(PGPPublicKeyRingCollection publicKeyRingCollection) { + Set publicKeyRings = new HashSet<>(); + for (Iterator i = publicKeyRingCollection.getKeyRings(); i.hasNext(); ) { + publicKeyRings.add(i.next()); + } + return verifyWith(publicKeyRings); + } + @Override public HandleMissingPublicKeys verifyWith(Set trustedKeyIds, PGPPublicKeyRingCollection publicKeyRingCollection) { diff --git a/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java index 49e23e72..ec9b85d5 100644 --- a/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java +++ b/src/main/java/org/pgpainless/pgpainless/decryption_verification/DecryptionBuilderInterface.java @@ -40,6 +40,8 @@ public interface DecryptionBuilderInterface { interface VerifyWith { + HandleMissingPublicKeys verifyWith(PGPPublicKeyRingCollection publicKeyRings); + HandleMissingPublicKeys verifyWith(Set trustedFingerprints, PGPPublicKeyRingCollection publicKeyRings); HandleMissingPublicKeys verifyWith(Set publicKeyRings);