Further integration of OpenPGPImplementation class

vanitasvitae · vanitasvitae · commit 0716d028d896 · 2024-11-16T02:08:04.000+01:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java
@@ -61,7 +61,7 @@
  */
 public class OpenPGPCertificate
 {
-    private final PGPContentVerifierBuilderProvider contentVerifierBuilderProvider;
+    private final OpenPGPImplementation implementation;
 
     private final PGPKeyRing rawCert;
     private final OpenPGPPrimaryKey primaryKey;
@@ -76,21 +76,15 @@ public OpenPGPCertificate(PGPKeyRing rawCert)
         this(rawCert, new BcOpenPGPImplementation());
     }
 
-    public OpenPGPCertificate(PGPKeyRing rawCert, OpenPGPImplementation implementation)
-    {
-        this(rawCert, implementation.pgpContentVerifierBuilderProvider());
-    }
-
     /**
      * Instantiate an {@link OpenPGPCertificate} from a parsed {@link PGPPublicKeyRing}.
      *
      * @param rawCert public key ring
-     * @param contentVerifierBuilderProvider provider for signature verifiers
+     * @param implementation OpenPGP implementation
      */
-    public OpenPGPCertificate(PGPKeyRing rawCert,
-                              PGPContentVerifierBuilderProvider contentVerifierBuilderProvider)
+    public OpenPGPCertificate(PGPKeyRing rawCert, OpenPGPImplementation implementation)
     {
-        this.contentVerifierBuilderProvider = contentVerifierBuilderProvider;
+        this.implementation = implementation;
 
         this.rawCert = rawCert;
         this.subkeys = new HashMap<>();
@@ -459,7 +453,7 @@ private boolean isBoundBy(OpenPGPCertificateComponent component,
             }
 
             // Chain needs to be valid (signatures correct)
-            if (chain.isValid(contentVerifierBuilderProvider))
+            if (chain.isValid(implementation.pgpContentVerifierBuilderProvider()))
             {
                 // Chain needs to not contain a revocation signature, otherwise the component is considered revoked
                 return !chain.isRevocation();
@@ -1727,7 +1721,7 @@ public boolean isEffectiveAt(Date evaluationDate)
         public boolean isValid()
                 throws PGPSignatureException
         {
-            return isValid(getRootKey().getCertificate().contentVerifierBuilderProvider);
+            return isValid(getRootKey().getCertificate().implementation.pgpContentVerifierBuilderProvider());
         }
 
         public boolean isValid(PGPContentVerifierBuilderProvider contentVerifierBuilderProvider)
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java
@@ -14,7 +14,6 @@
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptorBuilderProvider;
-import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -36,17 +35,7 @@ public OpenPGPKey(PGPSecretKeyRing rawKey)
 
     public OpenPGPKey(PGPSecretKeyRing rawKey, OpenPGPImplementation implementation)
     {
-        this(
-                rawKey,
-                implementation.pgpContentVerifierBuilderProvider(),
-                implementation.pbeSecretKeyDecryptorBuilderProvider());
-    }
-
-    public OpenPGPKey(PGPSecretKeyRing rawKey,
-                      PGPContentVerifierBuilderProvider contentVerifierBuilderProvider,
-                      PBESecretKeyDecryptorBuilderProvider decryptorBuilderProvider)
-    {
-        super(rawKey, contentVerifierBuilderProvider);
+        super(rawKey, implementation);
 
         this.secretKeys = new HashMap<>();
         for (OpenPGPComponentKey key : getKeys())
@@ -58,7 +47,7 @@ public OpenPGPKey(PGPSecretKeyRing rawKey,
                 continue;
             }
 
-            secretKeys.put(identifier, new OpenPGPSecretKey(key, secretKey, decryptorBuilderProvider));
+            secretKeys.put(identifier, new OpenPGPSecretKey(key, secretKey, implementation.pbeSecretKeyDecryptorBuilderProvider()));
         }
     }
 
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageGenerator.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPMessageGenerator.java
@@ -601,7 +601,7 @@ static class Recipient
          */
         public Recipient(PGPPublicKeyRing certificate, SubkeySelector subkeySelector, OpenPGPImplementation implementation)
         {
-            this(new OpenPGPCertificate(certificate, implementation.pgpContentVerifierBuilderProvider()), subkeySelector);
+            this(new OpenPGPCertificate(certificate, implementation), subkeySelector);
         }
 
         public Recipient(OpenPGPCertificate certificate, SubkeySelector subkeySelector)
@@ -653,9 +653,7 @@ public Signer(PGPSecretKeyRing signingKey,
                       SubkeySelector subkeySelector,
                       OpenPGPImplementation implementation)
         {
-            this(new OpenPGPKey(signingKey,
-                    implementation.pgpContentVerifierBuilderProvider(),
-                    implementation.pbeSecretKeyDecryptorBuilderProvider()),
+            this(new OpenPGPKey(signingKey, implementation),
                     decryptorProvider, subkeySelector);
         }
 
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPCertificateTest.java
@@ -7,16 +7,13 @@
 import org.bouncycastle.bcpg.test.AbstractPacketTest;
 import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.openpgp.PGPObjectFactory;
-import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPSignature;
 import org.bouncycastle.openpgp.PGPSignatureList;
+import org.bouncycastle.openpgp.api.BcOpenPGPImplementation;
 import org.bouncycastle.openpgp.api.OpenPGPCertificate;
 import org.bouncycastle.openpgp.api.OpenPGPKey;
 import org.bouncycastle.openpgp.api.util.UTCUtil;
 import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
-import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilderProvider;
-import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -45,28 +42,6 @@ public void performTest()
         testPKSignsPKRevocationSuperseded();
     }
 
-    private OpenPGPCertificate readCertificate(String armored)
-            throws IOException
-    {
-        ByteArrayInputStream bIn = new ByteArrayInputStream(armored.getBytes(StandardCharsets.UTF_8));
-        ArmoredInputStream aIn = new ArmoredInputStream(bIn);
-        BCPGInputStream pIn = new BCPGInputStream(aIn);
-        PGPObjectFactory objFac = new BcPGPObjectFactory(pIn);
-        PGPPublicKeyRing publicKeys = (PGPPublicKeyRing) objFac.nextObject();
-        return new OpenPGPCertificate(publicKeys, new BcPGPContentVerifierBuilderProvider());
-    }
-
-    private OpenPGPKey readKey(String armored)
-            throws IOException
-    {
-        ByteArrayInputStream bIn = new ByteArrayInputStream(armored.getBytes(StandardCharsets.UTF_8));
-        ArmoredInputStream aIn = new ArmoredInputStream(bIn);
-        BCPGInputStream pIn = new BCPGInputStream(aIn);
-        PGPObjectFactory objFac = new BcPGPObjectFactory(pIn);
-        PGPSecretKeyRing secretKey = (PGPSecretKeyRing) objFac.nextObject();
-        return new OpenPGPKey(secretKey, new BcPGPContentVerifierBuilderProvider(), new BcPBESecretKeyDecryptorBuilderProvider());
-    }
-
     private void testOpenPGPv6Key()
             throws IOException
     {
@@ -84,7 +59,7 @@ private void testOpenPGPv6Key()
                 "M0g12vYxoWM8Y81W+bHBw805I8kWVkXU6vFOi+HWvv/ira7ofJu16NnoUkhclkUr\n" +
                 "k0mXubZvyl4GBg==\n" +
                 "-----END PGP PRIVATE KEY BLOCK-----";
-        OpenPGPKey key = readKey(armoredKey);
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(armoredKey, new BcOpenPGPImplementation());
 
         isTrue("Test key has no identities", key.getIdentities().isEmpty());
 
@@ -803,7 +778,7 @@ private void testPKSignsPKRevocationSuperseded()
     private void signatureValidityTest(String cert, TestSignature... testSignatures)
             throws IOException
     {
-        OpenPGPCertificate certificate = readCertificate(cert);
+        OpenPGPCertificate certificate = OpenPGPCertificate.fromAsciiArmor(cert, new BcOpenPGPImplementation());
 
         for (TestSignature test : testSignatures)
         {

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`*/`
`62`	`62`	`public class OpenPGPCertificate`
`63`	`63`	`{`
`64`		`- private final PGPContentVerifierBuilderProvider contentVerifierBuilderProvider;`
	`64`	`+ private final OpenPGPImplementation implementation;`
`65`	`65`
`66`	`66`	`private final PGPKeyRing rawCert;`
`67`	`67`	`private final OpenPGPPrimaryKey primaryKey;`
`@@ -76,21 +76,15 @@ public OpenPGPCertificate(PGPKeyRing rawCert)`
`76`	`76`	`this(rawCert, new BcOpenPGPImplementation());`
`77`	`77`	`}`
`78`	`78`
`79`		`- public OpenPGPCertificate(PGPKeyRing rawCert, OpenPGPImplementation implementation)`
`80`		`- {`
`81`		`- this(rawCert, implementation.pgpContentVerifierBuilderProvider());`
`82`		`- }`
`83`		`-`
`84`	`79`	`/**`
`85`	`80`	`* Instantiate an {@link OpenPGPCertificate} from a parsed {@link PGPPublicKeyRing}.`
`86`	`81`	`*`
`87`	`82`	`* @param rawCert public key ring`
`88`		`- * @param contentVerifierBuilderProvider provider for signature verifiers`
	`83`	`+ * @param implementation OpenPGP implementation`
`89`	`84`	`*/`
`90`		`- public OpenPGPCertificate(PGPKeyRing rawCert,`
`91`		`- PGPContentVerifierBuilderProvider contentVerifierBuilderProvider)`
	`85`	`+ public OpenPGPCertificate(PGPKeyRing rawCert, OpenPGPImplementation implementation)`
`92`	`86`	`{`
`93`		`- this.contentVerifierBuilderProvider = contentVerifierBuilderProvider;`
	`87`	`+ this.implementation = implementation;`
`94`	`88`
`95`	`89`	`this.rawCert = rawCert;`
`96`	`90`	`this.subkeys = new HashMap<>();`
`@@ -459,7 +453,7 @@ private boolean isBoundBy(OpenPGPCertificateComponent component,`
`459`	`453`	`}`
`460`	`454`
`461`	`455`	`// Chain needs to be valid (signatures correct)`
`462`		`- if (chain.isValid(contentVerifierBuilderProvider))`
	`456`	`+ if (chain.isValid(implementation.pgpContentVerifierBuilderProvider()))`
`463`	`457`	`{`
`464`	`458`	`// Chain needs to not contain a revocation signature, otherwise the component is considered revoked`
`465`	`459`	`return !chain.isRevocation();`
`@@ -1727,7 +1721,7 @@ public boolean isEffectiveAt(Date evaluationDate)`
`1727`	`1721`	`public boolean isValid()`
`1728`	`1722`	`throws PGPSignatureException`
`1729`	`1723`	`{`
`1730`		`- return isValid(getRootKey().getCertificate().contentVerifierBuilderProvider);`
	`1724`	`+ return isValid(getRootKey().getCertificate().implementation.pgpContentVerifierBuilderProvider());`
`1731`	`1725`	`}`
`1732`	`1726`
`1733`	`1727`	`public boolean isValid(PGPContentVerifierBuilderProvider contentVerifierBuilderProvider)`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ static class Recipient`
`601`	`601`	`*/`
`602`	`602`	`public Recipient(PGPPublicKeyRing certificate, SubkeySelector subkeySelector, OpenPGPImplementation implementation)`
`603`	`603`	`{`
`604`		`- this(new OpenPGPCertificate(certificate, implementation.pgpContentVerifierBuilderProvider()), subkeySelector);`
	`604`	`+ this(new OpenPGPCertificate(certificate, implementation), subkeySelector);`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`public Recipient(OpenPGPCertificate certificate, SubkeySelector subkeySelector)`
`@@ -653,9 +653,7 @@ public Signer(PGPSecretKeyRing signingKey,`
`653`	`653`	`SubkeySelector subkeySelector,`
`654`	`654`	`OpenPGPImplementation implementation)`
`655`	`655`	`{`
`656`		`- this(new OpenPGPKey(signingKey,`
`657`		`- implementation.pgpContentVerifierBuilderProvider(),`
`658`		`- implementation.pbeSecretKeyDecryptorBuilderProvider()),`
	`656`	`+ this(new OpenPGPKey(signingKey, implementation),`
`659`	`657`	`decryptorProvider, subkeySelector);`
`660`	`658`	`}`
`661`	`659`