From 03efb5e14c786f00f1bf8f51993a13f16e504c06 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 18 Aug 2021 14:50:01 +0200
Subject: [PATCH] Rename verifySignatureCreationTimeIsInBounds method

---
 .../pgpainless/decryption_verification/DecryptionStream.java  | 4 ++--
 .../SignatureVerifyingInputStream.java                        | 4 ++--
 .../java/org/pgpainless/signature/SignatureValidator.java     | 2 +-
 .../main/java/org/pgpainless/signature/SignatureVerifier.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
index 3313e069..5a216027 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/DecryptionStream.java
@@ -15,7 +15,7 @@
  */
 package org.pgpainless.decryption_verification;
 
-import static org.pgpainless.signature.SignatureValidator.verifySignatureCreationTimeIsInBounds;
+import static org.pgpainless.signature.SignatureValidator.signatureWasCreatedInBounds;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -104,7 +104,7 @@ public class DecryptionStream extends InputStream {
     private void maybeVerifyDetachedSignatures() {
         for (DetachedSignature s : resultBuilder.getDetachedSignatures()) {
             try {
-                verifySignatureCreationTimeIsInBounds(options.getVerifyNotBefore(), options.getVerifyNotAfter()).verify(s.getSignature());
+                signatureWasCreatedInBounds(options.getVerifyNotBefore(), options.getVerifyNotAfter()).verify(s.getSignature());
                 boolean verified = CertificateValidator.validateCertificateAndVerifyInitializedSignature(s.getSignature(), (PGPPublicKeyRing) s.getSigningKeyRing(), PGPainless.getPolicy());
                 s.setVerified(verified);
             } catch (SignatureValidationException e) {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
index fbbd8b21..76e7ba98 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/SignatureVerifyingInputStream.java
@@ -15,7 +15,7 @@
  */
 package org.pgpainless.decryption_verification;
 
-import static org.pgpainless.signature.SignatureValidator.verifySignatureCreationTimeIsInBounds;
+import static org.pgpainless.signature.SignatureValidator.signatureWasCreatedInBounds;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
@@ -112,7 +112,7 @@ public class SignatureVerifyingInputStream extends FilterInputStream {
     private void verifySignatureOrThrowSignatureException(PGPSignature signature, OnePassSignature onePassSignature)
             throws SignatureValidationException {
         Policy policy = PGPainless.getPolicy();
-        verifySignatureCreationTimeIsInBounds(options.getVerifyNotBefore(), options.getVerifyNotAfter()).verify(signature);
+        signatureWasCreatedInBounds(options.getVerifyNotBefore(), options.getVerifyNotAfter()).verify(signature);
         CertificateValidator.validateCertificateAndVerifyOnePassSignature(signature, onePassSignature, policy);
     }
 
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureValidator.java b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureValidator.java
index f6c8dec1..cff9bea0 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureValidator.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureValidator.java
@@ -619,7 +619,7 @@ public abstract class SignatureValidator {
         };
     }
 
-    public static SignatureValidator verifySignatureCreationTimeIsInBounds(Date notBefore, Date notAfter) {
+    public static SignatureValidator signatureWasCreatedInBounds(Date notBefore, Date notAfter) {
         return new SignatureValidator() {
             @Override
             public void verify(PGPSignature signature) throws SignatureValidationException {
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureVerifier.java b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureVerifier.java
index 8f6f79c2..06d98dfb 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureVerifier.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/SignatureVerifier.java
@@ -30,7 +30,7 @@ import org.pgpainless.policy.Policy;
 
 /**
  * Collection of static methods for signature verification.
- * Signature verification entails validation of certain criteria (see {@link SignatureValidator}, as well as
+ * Signature verification entails validation of certain criteria (see {@link SignatureValidator}), as well as
  * cryptographic verification of signature correctness.
  */
 public final class SignatureVerifier {