PGPainless
/
wkd-java
mirror of https://codeberg.org/PGPainless/wkd-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump pgpainless-core to 1.3.12, pgpainless-cert-d to 0.2.1, cert-d-java to 0.2.1

This commit is contained in:
Paul Schaub 2022-11-25 16:17:24 +01:00
parent f9543cddae
commit e9f2efd15a
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
8 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
version.gradle
View File

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

4
wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java
View File

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

2
wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java
View File

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

3
wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java
View File

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

2
wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java
View File

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

2
wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java
View File

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

2
wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java
View File

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

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

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