get PGPObjectFactory from OpenPGPImplementation

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java

@@ -24,7 +24,6 @@
 import org.bouncycastle.openpgp.PGPUserAttributeSubpacketVector;
 import org.bouncycastle.openpgp.PGPUtil;
 import org.bouncycastle.openpgp.api.util.UTCUtil;
-import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
 import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
 import org.bouncycastle.util.Iterable;
 import org.bouncycastle.util.encoders.Hex;
@@ -131,7 +130,7 @@ public static OpenPGPCertificate fromBytes(
         ByteArrayInputStream bIn = new ByteArrayInputStream(bytes);
         InputStream decoderStream = PGPUtil.getDecoderStream(bIn);
         BCPGInputStream pIn = BCPGInputStream.wrap(decoderStream);
-        PGPObjectFactory objectFactory = new BcPGPObjectFactory(pIn);
+        PGPObjectFactory objectFactory = implementation.pgpObjectFactory(pIn);
         PGPPublicKeyRing keyRing = (PGPPublicKeyRing) objectFactory.nextObject();
         return new OpenPGPCertificate(keyRing, implementation);
     }

pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPKey.java

@@ -12,7 +12,6 @@
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPUtil;
-import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptorBuilderProvider;
 import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
@@ -81,7 +80,7 @@ public static OpenPGPKey fromBytes(
         ByteArrayInputStream bIn = new ByteArrayInputStream(bytes);
         InputStream decoderStream = PGPUtil.getDecoderStream(bIn);
         BCPGInputStream pIn = BCPGInputStream.wrap(decoderStream);
-        PGPObjectFactory objectFactory = new BcPGPObjectFactory(pIn);
+        PGPObjectFactory objectFactory = implementation.pgpObjectFactory(pIn);
         PGPSecretKeyRing keyRing = (PGPSecretKeyRing) objectFactory.nextObject();
         return new OpenPGPKey(keyRing, implementation);
     }