From 0e1d6cb5a16af9d33bba68c83ee86e042e9dd424 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Sun, 3 Oct 2021 13:47:20 +0200 Subject: [PATCH] Rename DetachedSignature -> DetachedSignatureCheck --- .../DecryptionStreamFactory.java | 6 +++--- .../SignatureInputStream.java | 12 ++++++------ ...hedSignature.java => DetachedSignatureCheck.java} | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) rename pgpainless-core/src/main/java/org/pgpainless/signature/{DetachedSignature.java => DetachedSignatureCheck.java} (91%) diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java index 65c2146f..eedfb302 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java +++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStreamFactory.java @@ -63,7 +63,7 @@ import org.pgpainless.key.SubkeyIdentifier; import org.pgpainless.key.info.KeyRingInfo; import org.pgpainless.key.protection.SecretKeyRingProtector; import org.pgpainless.key.protection.UnlockSecretKey; -import org.pgpainless.signature.DetachedSignature; +import org.pgpainless.signature.DetachedSignatureCheck; import org.pgpainless.signature.OnePassSignatureCheck; import org.pgpainless.signature.SignatureUtils; import org.pgpainless.util.CRCingArmoredInputStreamWrapper; @@ -81,7 +81,7 @@ public final class DecryptionStreamFactory { private final ConsumerOptions options; private final OpenPgpMetadata.Builder resultBuilder = OpenPgpMetadata.getBuilder(); private final List onePassSignatureChecks = new ArrayList<>(); - private final List detachedSignatureChecks = new ArrayList<>(); + private final List detachedSignatureChecks = new ArrayList<>(); private static final PGPContentVerifierBuilderProvider verifierBuilderProvider = ImplementationFactory.getInstance().getPGPContentVerifierBuilderProvider(); @@ -113,7 +113,7 @@ public final class DecryptionStreamFactory { SubkeyIdentifier signingKeyIdentifier = new SubkeyIdentifier(signingKeyRing, signingKey.getKeyID()); try { signature.init(verifierBuilderProvider, signingKey); - DetachedSignature detachedSignature = new DetachedSignature(signature, signingKeyRing, signingKeyIdentifier); + DetachedSignatureCheck detachedSignature = new DetachedSignatureCheck(signature, signingKeyRing, signingKeyIdentifier); detachedSignatureChecks.add(detachedSignature); } catch (PGPException e) { LOGGER.warn("Cannot verify detached signature made by {}. Reason: {}", signingKeyIdentifier, e.getMessage(), e); diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureInputStream.java index f6a0b2c1..b316734f 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureInputStream.java +++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureInputStream.java @@ -29,7 +29,7 @@ import org.pgpainless.PGPainless; import org.pgpainless.exception.SignatureValidationException; import org.pgpainless.policy.Policy; import org.pgpainless.signature.CertificateValidator; -import org.pgpainless.signature.DetachedSignature; +import org.pgpainless.signature.DetachedSignatureCheck; import org.pgpainless.signature.OnePassSignatureCheck; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,14 +45,14 @@ public abstract class SignatureInputStream extends FilterInputStream { private static final Logger LOGGER = LoggerFactory.getLogger(VerifySignatures.class); private final List opSignatures; - private final List detachedSignatures; + private final List detachedSignatures; private final ConsumerOptions options; private final OpenPgpMetadata.Builder resultBuilder; public VerifySignatures( InputStream literalDataStream, List opSignatures, - List detachedSignatures, + List detachedSignatures, ConsumerOptions options, OpenPgpMetadata.Builder resultBuilder) { super(literalDataStream); @@ -114,7 +114,7 @@ public abstract class SignatureInputStream extends FilterInputStream { private void verifyDetachedSignatures() { Policy policy = PGPainless.getPolicy(); - for (DetachedSignature s : detachedSignatures) { + for (DetachedSignatureCheck s : detachedSignatures) { try { signatureWasCreatedInBounds(options.getVerifyNotBefore(), options.getVerifyNotAfter()).verify(s.getSignature()); CertificateValidator.validateCertificateAndVerifyInitializedSignature(s.getSignature(), (PGPPublicKeyRing) s.getSigningKeyRing(), policy); @@ -140,13 +140,13 @@ public abstract class SignatureInputStream extends FilterInputStream { } private void updateDetachedSignatures(byte b) { - for (DetachedSignature detachedSignature : detachedSignatures) { + for (DetachedSignatureCheck detachedSignature : detachedSignatures) { detachedSignature.getSignature().update(b); } } private void updateDetachedSignatures(byte[] b, int off, int read) { - for (DetachedSignature detachedSignature : detachedSignatures) { + for (DetachedSignatureCheck detachedSignature : detachedSignatures) { detachedSignature.getSignature().update(b, off, read); } } diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignature.java b/pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignatureCheck.java similarity index 91% rename from pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignature.java rename to pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignatureCheck.java index d2400aec..d816d2fe 100644 --- a/pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignature.java +++ b/pgpainless-core/src/main/java/org/pgpainless/signature/DetachedSignatureCheck.java @@ -24,19 +24,19 @@ import org.pgpainless.key.SubkeyIdentifier; * Tuple-class which bundles together a signature, the signing key that created the signature, * an identifier of the signing key and a record of whether or not the signature was verified. */ -public class DetachedSignature { +public class DetachedSignatureCheck { private final PGPSignature signature; private final PGPKeyRing signingKeyRing; private final SubkeyIdentifier signingKeyIdentifier; /** - * Create a new {@link DetachedSignature} object. + * Create a new {@link DetachedSignatureCheck} object. * * @param signature signature * @param signingKeyRing signing key that created the signature * @param signingKeyIdentifier identifier of the used signing key */ - public DetachedSignature(PGPSignature signature, PGPKeyRing signingKeyRing, SubkeyIdentifier signingKeyIdentifier) { + public DetachedSignatureCheck(PGPSignature signature, PGPKeyRing signingKeyRing, SubkeyIdentifier signingKeyIdentifier) { this.signature = signature; this.signingKeyRing = signingKeyRing; this.signingKeyIdentifier = signingKeyIdentifier;