CHANGELOG.md

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

version.gradle

@@ -16,10 +16,10 @@ allprojects {
         slf4jVersion = '1.7.36'
         logbackVersion = '1.2.11'
         mockitoVersion = '4.5.1'
-        pgpainlessVersion = '1.3.12'
-        pgpainlessCertDVersion = '0.2.1'
+        pgpainlessVersion = '1.2.1'
+        pgpainlessCertDVersion = '0.1.2'
         picocliVersion = '4.6.3'
-        certDJavaVersion = '0.2.1'
+        certDJavaVersion = '0.1.1'
         zbase32Version = '1.0.0'
     }
 }

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

@@ -10,7 +10,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.pgpainless.PGPainless;
 import org.pgpainless.certificate_store.CertificateFactory;
 import org.pgpainless.key.info.KeyRingInfo;
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 import pgp.wkd.CertificateAndUserIds;
 import pgp.wkd.discovery.CertificateParser;
 
@@ -27,7 +27,7 @@ public class PGPainlessCertificateParser implements CertificateParser {
             PGPPublicKeyRingCollection certificates = PGPainless.readKeyRing().publicKeyRingCollection(inputStream);
             for (PGPPublicKeyRing certificate : certificates) {
                 KeyRingInfo info = PGPainless.inspectKeyRing(certificate);
-                Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate, 0L);
+                Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate);
                 List<String> userIds = info.getValidAndExpiredUserIds();
                 certificatesAndUserIds.add(new CertificateAndUserIds(parsedCert, userIds));
             }

wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java

@@ -4,7 +4,7 @@
 
 package pgp.wkd;
 
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 
 import java.util.ArrayList;
 import java.util.List;

wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java

@@ -4,8 +4,7 @@
 
 package pgp.wkd;
 
-
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 
 /**
  * A rejected OpenPGP certificate.

wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java

@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 import pgp.wkd.RejectedCertificate;
 import pgp.wkd.WKDAddress;
 import pgp.wkd.exception.MissingPolicyFileException;

wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java

@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 import pgp.wkd.exception.CertNotFetchableException;
 
 import javax.annotation.Nonnull;

wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java

@@ -4,7 +4,7 @@
 
 package pgp.wkd.discovery;
 
-import pgp.certificate_store.certificate.Certificate;
+import pgp.certificate_store.Certificate;
 import pgp.wkd.CertificateAndUserIds;
 import pgp.wkd.exception.MissingPolicyFileException;
 import pgp.wkd.exception.RejectedCertificateException;

wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java

@@ -38,7 +38,7 @@ public class AbstractTestSuiteGenerator {
     }
 
     protected PGPSecretKeyRing secretKey(String userId) throws PGPException, InvalidAlgorithmParameterException, NoSuchAlgorithmException {
-        PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId);
+        PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId, null);
         return secretKeys;
     }