PGPainless/cert-d-pgpainless
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-pgpainless.git synced 2024-12-22 05:17:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Once again adopt changes from cert-d-java

Browse source
This commit is contained in:
Paul Schaub 2022-08-11 22:12:52 +02:00
parent 8b853267ff
commit cd0150c4d9
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
8 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/PGPCertDCli.java
View file

@ -6,7 +6,7 @@ package pgp.cert_d.cli;
import org.pgpainless.certificate_store.PGPainlessCertD; import org.pgpainless.certificate_store.PGPainlessCertD;
import pgp.cert_d.BaseDirectoryProvider; import pgp.cert_d.BaseDirectoryProvider;
import pgp.cert_d.NotAStoreException; import pgp.cert_d.exception.NotAStoreException;
import pgp.cert_d.cli.commands.Export; import pgp.cert_d.cli.commands.Export;
import pgp.cert_d.cli.commands.Get; import pgp.cert_d.cli.commands.Get;
import pgp.cert_d.cli.commands.Insert; import pgp.cert_d.cli.commands.Insert;

4
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Get.java
View file

@ -7,8 +7,8 @@ package pgp.cert_d.cli.commands;
import org.bouncycastle.util.io.Streams; import org.bouncycastle.util.io.Streams;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.cert_d.BadNameException; import pgp.cert_d.exception.BadNameException;
import pgp.cert_d.SpecialNames; import pgp.cert_d.SpecialNames;
import pgp.cert_d.cli.PGPCertDCli; import pgp.cert_d.cli.PGPCertDCli;
import pgp.certificate.KeyMaterial; import pgp.certificate.KeyMaterial;

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java
View file

@ -10,7 +10,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
import org.pgpainless.PGPainless; import org.pgpainless.PGPainless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.MergeCallbacks;
import pgp.cert_d.cli.PGPCertDCli; import pgp.cert_d.cli.PGPCertDCli;
import pgp.certificate.Certificate; import pgp.certificate.Certificate;

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java
View file

@ -6,7 +6,7 @@ package pgp.cert_d.cli.commands;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.MergeCallbacks;
import pgp.cert_d.cli.PGPCertDCli; import pgp.cert_d.cli.PGPCertDCli;
import pgp.certificate.Certificate; import pgp.certificate.Certificate;

2
pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java
View file

@ -15,7 +15,7 @@ import org.pgpainless.key.generation.type.eddsa.EdDSACurve;
import org.pgpainless.util.Passphrase; import org.pgpainless.util.Passphrase;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.MergeCallbacks;
import pgp.cert_d.cli.PGPCertDCli; import pgp.cert_d.cli.PGPCertDCli;
import picocli.CommandLine; import picocli.CommandLine;

2
pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java
View file

@ -8,7 +8,7 @@ import org.bouncycastle.openpgp.PGPKeyRing;
import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRing;
import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing;
import org.pgpainless.PGPainless; import org.pgpainless.PGPainless;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.certificate.KeyMaterial; import pgp.certificate.KeyMaterial;
import pgp.certificate.KeyMaterialReaderBackend; import pgp.certificate.KeyMaterialReaderBackend;

6
pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/PGPainlessCertD.java
View file

@ -5,9 +5,9 @@
package org.pgpainless.certificate_store; package org.pgpainless.certificate_store;
import pgp.cert_d.BaseDirectoryProvider; import pgp.cert_d.BaseDirectoryProvider;
import pgp.cert_d.FileBasedCertificateDirectoryBackend; import pgp.cert_d.backend.FileBasedCertificateDirectoryBackend;
import pgp.cert_d.InMemoryCertificateDirectoryBackend; import pgp.cert_d.backend.InMemoryCertificateDirectoryBackend;
import pgp.cert_d.NotAStoreException; import pgp.cert_d.exception.NotAStoreException;
import pgp.cert_d.PGPCertificateDirectory; import pgp.cert_d.PGPCertificateDirectory;
import java.io.File; import java.io.File;

6
pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryTest.java
View file

@ -36,9 +36,9 @@ import org.pgpainless.key.OpenPgpFingerprint;
import org.pgpainless.key.generation.KeySpec; import org.pgpainless.key.generation.KeySpec;
import org.pgpainless.key.generation.type.KeyType; import org.pgpainless.key.generation.type.KeyType;
import org.pgpainless.key.generation.type.eddsa.EdDSACurve; import org.pgpainless.key.generation.type.eddsa.EdDSACurve;
import pgp.cert_d.BadDataException; import pgp.cert_d.exception.BadDataException;
import pgp.cert_d.BadNameException; import pgp.cert_d.exception.BadNameException;
import pgp.cert_d.NotAStoreException; import pgp.cert_d.exception.NotAStoreException;
import pgp.certificate.Certificate; import pgp.certificate.Certificate;
import pgp.certificate.KeyMaterial; import pgp.certificate.KeyMaterial;
import pgp.certificate.KeyMaterialMerger; import pgp.certificate.KeyMaterialMerger;