WKD-Java 0.1.3-SNAPSHOT

Bump pgpainless-core to 1.5.6
Bump cert-d-pgpainless to 0.2.2
Bump cert-d-java to 0.2.2

CHANGELOG.md

@@ -6,10 +6,10 @@ SPDX-License-Identifier: Apache-2.0
 
 # Changelog
 
-## 0.1.2-SNAPSHOT
+## 0.1.2
-- Bump `pgpainless-core` to `1.13.2`
+- Bump `pgpainless-core` to `1.5.6`
-- Bump `cert-d-pgpainless` to `0.2.1`
+- Bump `cert-d-pgpainless` to `0.2.2`
-- Bump `cert-d-java` to `0.2.1`
+- Bump `cert-d-java` to `0.2.2`
 
 ## 0.1.1
 - Bump `pgpainless-core` to `1.2.1`

version.gradle

@@ -4,22 +4,22 @@
 
 allprojects {
     ext {
-        shortVersion = '0.1.2'
+        shortVersion = '0.1.3'
         isSnapshot = true
         minAndroidSdk = 10
         javaSourceCompatibility = 1.8
-        jacksonDataBindVersion = '2.13.2.2'
+        jacksonDataBindVersion = '2.15.2'
-        jacksonDataFormatXmlVersion = '2.13.2'
+        jacksonDataFormatXmlVersion = '2.15.2'
         junitVersion = '5.8.2'
         junitSysExitVersion = '1.1.2'
         jsrVersion = '3.0.2'
         slf4jVersion = '1.7.36'
         logbackVersion = '1.2.11'
         mockitoVersion = '4.5.1'
-        pgpainlessVersion = '1.3.12'
+        pgpainlessVersion = '1.5.6'
-        pgpainlessCertDVersion = '0.2.1'
+        pgpainlessCertDVersion = '0.2.2'
         picocliVersion = '4.6.3'
-        certDJavaVersion = '0.2.1'
+        certDJavaVersion = '0.2.2'
         zbase32Version = '1.0.0'
     }
 }

wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java

@@ -6,9 +6,9 @@ package pgp.wkd.cli;
 
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.pgpainless.PGPainless;
 import org.pgpainless.certificate_store.CertificateFactory;
+import org.pgpainless.key.collection.PGPKeyRingCollection;
 import org.pgpainless.key.info.KeyRingInfo;
 import pgp.certificate_store.certificate.Certificate;
 import pgp.wkd.CertificateAndUserIds;
@@ -24,8 +24,11 @@ public class PGPainlessCertificateParser implements CertificateParser {
     public List<CertificateAndUserIds> read(InputStream inputStream) throws IOException {
         List<CertificateAndUserIds> certificatesAndUserIds = new ArrayList<>();
         try {
-            PGPPublicKeyRingCollection certificates = PGPainless.readKeyRing().publicKeyRingCollection(inputStream);
+            PGPKeyRingCollection keyMaterial = PGPainless.readKeyRing().keyRingCollection(inputStream, true);
-            for (PGPPublicKeyRing certificate : certificates) {
+            if (keyMaterial.getPGPSecretKeyRingCollection().size() != 0) {
+                throw new PGPException("Secret key material encountered!");
+            }
+            for (PGPPublicKeyRing certificate : keyMaterial.getPgpPublicKeyRingCollection()) {
                 KeyRingInfo info = PGPainless.inspectKeyRing(certificate);
                 Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate, 0L);
                 List<String> userIds = info.getValidAndExpiredUserIds();