Default to BcOpenPGPImplementation

bcgit · Nov 16, 2024 · ea5cde9 · ea5cde9
1 parent ecd7051
commit ea5cde9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java
@@ -105,6 +105,11 @@ public OpenPGPCertificate(PGPKeyRing rawCert, OpenPGPImplementation implementati
         }
     }
 
+    public static OpenPGPCertificate fromAsciiArmor(String armor)
+            throws IOException
+    {
+        return fromAsciiArmor(armor, new BcOpenPGPImplementation());
+    }
 
     public static OpenPGPCertificate fromAsciiArmor(
             String armor,

diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java b/pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java
@@ -51,6 +51,12 @@ public OpenPGPKey(PGPSecretKeyRing rawKey, OpenPGPImplementation implementation)
         }
     }
 
+    public static OpenPGPKey fromAsciiArmor(String armor)
+            throws IOException
+    {
+        return fromAsciiArmor(armor, new BcOpenPGPImplementation());
+    }
+
     public static OpenPGPKey fromAsciiArmor(
             String armor,
             OpenPGPImplementation implementation)

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
@@ -9,7 +9,6 @@
 import org.bouncycastle.openpgp.PGPObjectFactory;
 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;
@@ -59,7 +58,7 @@ private void testOpenPGPv6Key()
                 "M0g12vYxoWM8Y81W+bHBw805I8kWVkXU6vFOi+HWvv/ira7ofJu16NnoUkhclkUr\n" +
                 "k0mXubZvyl4GBg==\n" +
                 "-----END PGP PRIVATE KEY BLOCK-----";
-        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(armoredKey, new BcOpenPGPImplementation());
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(armoredKey);
 
         isTrue("Test key has no identities", key.getIdentities().isEmpty());
 
@@ -778,7 +777,7 @@ private void testPKSignsPKRevocationSuperseded()
     private void signatureValidityTest(String cert, TestSignature... testSignatures)
             throws IOException
     {
-        OpenPGPCertificate certificate = OpenPGPCertificate.fromAsciiArmor(cert, new BcOpenPGPImplementation());
+        OpenPGPCertificate certificate = OpenPGPCertificate.fromAsciiArmor(cert);
 
         for (TestSignature test : testSignatures)
         {

diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageGeneratorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageGeneratorTest.java
@@ -3,7 +3,6 @@
 import org.bouncycastle.bcpg.CompressionAlgorithmTags;
 import org.bouncycastle.bcpg.test.AbstractPacketTest;
 import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.api.BcOpenPGPImplementation;
 import org.bouncycastle.openpgp.api.OpenPGPCertificate;
 import org.bouncycastle.openpgp.api.OpenPGPKey;
 import org.bouncycastle.openpgp.api.OpenPGPMessageGenerator;
@@ -133,7 +132,7 @@ private void seipd2EncryptedMessage()
                 "j+VjFM21J0hqWlEg+bdiojWnKfA5AQpWUWtnNwDEM0g12vYxoWM8Y81W+bHBw805\n" +
                 "I8kWVkXU6vFOi+HWvv/ira7ofJu16NnoUkhclkUrk0mXubZvyl4GBg==\n" +
                 "-----END PGP PUBLIC KEY BLOCK-----";
-        OpenPGPCertificate cert = OpenPGPCertificate.fromAsciiArmor(v6Cert, new BcOpenPGPImplementation());
+        OpenPGPCertificate cert = OpenPGPCertificate.fromAsciiArmor(v6Cert);
 
         OpenPGPMessageGenerator gen = new OpenPGPMessageGenerator();
         gen.addEncryptionCertificate(cert);
@@ -231,7 +230,7 @@ private void seipd1EncryptedMessage()
                 "xqAY9Bwizt4FWgXuLm1a4+So4V9j1TRCXd12Uc2l2RNmgDE=\n" +
                 "=miES\n" +
                 "-----END PGP PRIVATE KEY BLOCK-----\n";
-        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(v4Key, new BcOpenPGPImplementation());
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(v4Key);
 
         OpenPGPMessageGenerator gen = new OpenPGPMessageGenerator();
         gen.addEncryptionCertificate(key);

diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageProcessorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPMessageProcessorTest.java
@@ -4,7 +4,6 @@
 import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags;
 import org.bouncycastle.bcpg.test.AbstractPacketTest;
 import org.bouncycastle.openpgp.PGPException;
-import org.bouncycastle.openpgp.api.BcOpenPGPImplementation;
 import org.bouncycastle.openpgp.api.OpenPGPKey;
 import org.bouncycastle.openpgp.api.OpenPGPMessageGenerator;
 import org.bouncycastle.openpgp.api.OpenPGPMessageProcessor;
@@ -151,8 +150,7 @@ private void roundTripCompressedSymEncMessageMessage()
     private void roundTripV6KeyEncryptedMessage()
             throws IOException, PGPException
     {
-        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(v6Key,
-                new BcOpenPGPImplementation());
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(v6Key);
 
         OpenPGPMessageGenerator gen = new OpenPGPMessageGenerator()
                 .setArmored(true)

diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/StaticV6OpenPGPMessageGeneratorTest.java b/pg/src/test/java/org/bouncycastle/openpgp/api/test/StaticV6OpenPGPMessageGeneratorTest.java
@@ -6,7 +6,6 @@
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
-import org.bouncycastle.openpgp.api.BcOpenPGPImplementation;
 import org.bouncycastle.openpgp.api.OpenPGPKey;
 import org.bouncycastle.openpgp.api.OpenPGPMessageGenerator;
 import org.bouncycastle.openpgp.api.OpenPGPMessageOutputStream;
@@ -59,7 +58,7 @@ public void performTest()
     private void staticEncryptedMessage()
             throws IOException, PGPException
     {
-        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(V6KEY, new BcOpenPGPImplementation());
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(V6KEY);
 
         OpenPGPMessageGenerator gen = getStaticGenerator()
                 .addEncryptionCertificate(key);
@@ -75,7 +74,7 @@ private void staticEncryptedMessage()
     private void staticSignedMessage()
             throws IOException, PGPException
     {
-        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(V6KEY, new BcOpenPGPImplementation());
+        OpenPGPKey key = OpenPGPKey.fromAsciiArmor(V6KEY);
         OpenPGPMessageGenerator gen = getStaticGenerator()
                 .addSigningKey(key, null);