Make PBESecretKeyEncryptorFactory an Interface

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/openpgp/operator/PBESecretKeyEncryptorFactory.java

@@ -7,7 +7,7 @@
  * A concrete implementation of this class can not only choose the cryptographic backend (e.g. BC, JCA/JCE),
  * but also, whether to use AEAD (RFC9580) or classic CFB (RFC4880).
  */
-public abstract class PBESecretKeyEncryptorFactory
+public interface PBESecretKeyEncryptorFactory
 {
 
     /**
@@ -17,5 +17,5 @@ public abstract class PBESecretKeyEncryptorFactory
      * @param pubKeyPacket public-key packet of the key to protect (needed for AEAD)
      * @return key encryptor
      */
-    public abstract PBESecretKeyEncryptor build(char[] passphrase, PublicKeyPacket pubKeyPacket);
+    PBESecretKeyEncryptor build(char[] passphrase, PublicKeyPacket pubKeyPacket);
 }

pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcAEADSecretKeyEncryptorFactory.java

@@ -16,7 +16,7 @@
  * for the Argon2 key derivation (see {@link S2K.Argon2Params#memoryConstrainedParameters()}).
  */
 public class BcAEADSecretKeyEncryptorFactory
-        extends PBESecretKeyEncryptorFactory
+        implements PBESecretKeyEncryptorFactory
 {
     @Override
     public PBESecretKeyEncryptor build(char[] passphrase, PublicKeyPacket pubKeyPacket)
@@ -25,7 +25,7 @@ public PBESecretKeyEncryptor build(char[] passphrase, PublicKeyPacket pubKeyPack
         {
             return null;
         }
-        return new BcAEADSecretKeyEncryptorBuilder(
+        return new org.bouncycastle.openpgp.operator.bc.BcAEADSecretKeyEncryptorBuilder(
                 AEADAlgorithmTags.OCB,
                 SymmetricKeyAlgorithmTags.AES_256,
                 S2K.Argon2Params.memoryConstrainedParameters())

pg/src/main/java/org/bouncycastle/openpgp/operator/bc/BcCFBSecretKeyEncryptorFactory.java

@@ -17,7 +17,7 @@
  * and uses AES256 for secret key protection.
  */
 public class BcCFBSecretKeyEncryptorFactory
-        extends PBESecretKeyEncryptorFactory
+        implements PBESecretKeyEncryptorFactory
 {
     @Override
     public PBESecretKeyEncryptor build(char[] passphrase, PublicKeyPacket pubKeyPacket)

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaAEADSecretKeyEncryptorFactory.java

@@ -10,7 +10,7 @@
 import java.security.Provider;
 
 public class JcaAEADSecretKeyEncryptorFactory
-        extends PBESecretKeyEncryptorFactory
+        implements PBESecretKeyEncryptorFactory
 {
     private JcaAEADSecretKeyEncryptorBuilder builder = new JcaAEADSecretKeyEncryptorBuilder(
             AEADAlgorithmTags.OCB,

pg/src/main/java/org/bouncycastle/openpgp/operator/jcajce/JcaCFBSecretKeyEncryptorFactory.java

@@ -10,7 +10,7 @@
 import java.security.Provider;
 
 public class JcaCFBSecretKeyEncryptorFactory
-        extends PBESecretKeyEncryptorFactory
+        implements PBESecretKeyEncryptorFactory
 {
     private JcaPGPDigestCalculatorProviderBuilder digestCalcProviderBuilder =
             new JcaPGPDigestCalculatorProviderBuilder();