From 47e9f5f08abe88e115d85c7495af72bd0d7fd3c0 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 1 Sep 2022 11:29:47 +0200 Subject: [PATCH] Print out fingerprints when inserting|importing keys --- .../src/main/java/pgp/cert_d/cli/commands/Import.java | 3 +++ .../src/main/java/pgp/cert_d/cli/commands/Insert.java | 3 +++ .../src/main/java/pgp/cert_d/cli/commands/Setup.java | 7 ++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java index 3dfcfb4..5306d24 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java @@ -33,6 +33,9 @@ public class Import implements Runnable { ByteArrayInputStream certIn = new ByteArrayInputStream(cert.getEncoded()); Certificate certificate = PGPCertDCli.getCertificateDirectory() .insert(certIn, MergeCallbacks.mergeWithExisting()); + // CHECKSTYLE:OFF + System.out.println(certificate.getFingerprint()); + // CHECKSTYLE:ON } } catch (IOException e) { LOGGER.error("IO-Error.", e); diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java index 25987d0..cf62fd8 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java @@ -25,6 +25,9 @@ public class Insert implements Runnable { try { Certificate certificate = PGPCertDCli.getCertificateDirectory() .insert(System.in, MergeCallbacks.mergeWithExisting()); + // CHECKSTYLE:OFF + System.out.println(certificate.getFingerprint()); + // CHECKSTYLE:ON } catch (IOException e) { LOGGER.error("IO-Error.", e); System.exit(-1); diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java index 2cdc5c4..070c284 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java @@ -17,6 +17,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.pgpainless.certificate_store.MergeCallbacks; import pgp.cert_d.cli.PGPCertDCli; +import pgp.certificate_store.certificate.KeyMaterial; import pgp.certificate_store.exception.BadDataException; import picocli.CommandLine; @@ -61,7 +62,11 @@ public class Setup implements Runnable { try { InputStream inputStream = new ByteArrayInputStream(trustRoot.getEncoded()); - PGPCertDCli.getCertificateDirectory().insertTrustRoot(inputStream, MergeCallbacks.overrideExisting()); + KeyMaterial inserted = PGPCertDCli.getCertificateDirectory() + .insertTrustRoot(inputStream, MergeCallbacks.overrideExisting()); + // CHECKSTYLE:OFF + System.out.println(inserted.getFingerprint()); + // CHECKSTYLE:ON } catch (BadDataException e) { throw new RuntimeException(e);