Centralise CRMFHelper construction in cert/crmf/jcajce in static CRMFHelper factory methods

Add createDefaultHelper/createProviderHelper/createNamedHelper as static factories on the package-private CRMFHelper (no jcajce-local Utils class exists, so the factories live on the wrapper itself). Collapses 12 inlined new CRMFHelper(new *JcaJceHelper(...)) sites across 4 classes and removes the now-stranded JcaJceHelper-family imports. Behaviour-preserving.

Author: gefeili

pkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/CRMFHelper.java

@@ -11,6 +11,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.Provider;
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.spec.InvalidParameterSpecException;
@@ -42,7 +43,10 @@
 import org.bouncycastle.cert.crmf.CRMFException;
 import org.bouncycastle.cms.CMSAlgorithm;
 import org.bouncycastle.jcajce.util.AlgorithmParametersUtils;
+import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
+import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
+import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 
 class CRMFHelper
 {
@@ -89,6 +93,21 @@ class CRMFHelper
         this.helper = helper;
     }
 
+    static CRMFHelper createDefaultHelper()
+    {
+        return new CRMFHelper(new DefaultJcaJceHelper());
+    }
+
+    static CRMFHelper createProviderHelper(Provider provider)
+    {
+        return new CRMFHelper(new ProviderJcaJceHelper(provider));
+    }
+
+    static CRMFHelper createNamedHelper(String providerName)
+    {
+        return new CRMFHelper(new NamedJcaJceHelper(providerName));
+    }
+
     PublicKey toPublicKey(SubjectPublicKeyInfo subjectPublicKeyInfo)
         throws CRMFException
     {

pkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessage.java

@@ -12,15 +12,12 @@
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.cert.crmf.CRMFException;
 import org.bouncycastle.cert.crmf.CertificateRequestMessage;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.util.Exceptions;
 
 public class JcaCertificateRequestMessage
     extends CertificateRequestMessage
 {
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
+    private CRMFHelper helper = CRMFHelper.createDefaultHelper();
 
     public JcaCertificateRequestMessage(byte[] certReqMsg)
     {
@@ -39,14 +36,14 @@ public JcaCertificateRequestMessage(CertReqMsg certReqMsg)
 
     public JcaCertificateRequestMessage setProvider(String providerName)
     {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
+        this.helper = CRMFHelper.createNamedHelper(providerName);
 
         return this;
     }
 
     public JcaCertificateRequestMessage setProvider(Provider provider)
     {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
+        this.helper = CRMFHelper.createProviderHelper(provider);
 
         return this;
     }

pkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceAsymmetricValueDecryptorGenerator.java

@@ -12,9 +12,6 @@
 import org.bouncycastle.cert.crmf.CRMFException;
 import org.bouncycastle.cert.crmf.ValueDecryptorGenerator;
 import org.bouncycastle.jcajce.io.CipherInputStream;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.InputDecryptor;
 import org.bouncycastle.operator.OperatorException;
 import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
@@ -23,7 +20,7 @@ public class JceAsymmetricValueDecryptorGenerator
     implements ValueDecryptorGenerator
 {
     private PrivateKey recipientKey;
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
+    private CRMFHelper helper = CRMFHelper.createDefaultHelper();
     private Provider provider = null;
     private String providerName = null;
 
@@ -34,7 +31,7 @@ public JceAsymmetricValueDecryptorGenerator(PrivateKey recipientKey)
 
     public JceAsymmetricValueDecryptorGenerator setProvider(Provider provider)
     {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
+        this.helper = CRMFHelper.createProviderHelper(provider);
         this.provider = provider;
         this.providerName = null;
 
@@ -43,7 +40,7 @@ public JceAsymmetricValueDecryptorGenerator setProvider(Provider provider)
 
     public JceAsymmetricValueDecryptorGenerator setProvider(String providerName)
     {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
+        this.helper = CRMFHelper.createNamedHelper(providerName);
         this.provider = null;
         this.providerName = providerName;
 

pkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceCRMFEncryptorBuilder.java

@@ -14,9 +14,6 @@
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.cert.crmf.CRMFException;
 import org.bouncycastle.jcajce.io.CipherOutputStream;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.DefaultSecretKeySizeProvider;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OutputEncryptor;
@@ -30,7 +27,7 @@ public class JceCRMFEncryptorBuilder
     private final ASN1ObjectIdentifier encryptionOID;
     private final int                  keySize;
 
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
+    private CRMFHelper helper = CRMFHelper.createDefaultHelper();
     private SecureRandom random;
 
     public JceCRMFEncryptorBuilder(ASN1ObjectIdentifier encryptionOID)
@@ -46,14 +43,14 @@ public JceCRMFEncryptorBuilder(ASN1ObjectIdentifier encryptionOID, int keySize)
 
     public JceCRMFEncryptorBuilder setProvider(Provider provider)
     {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
+        this.helper = CRMFHelper.createProviderHelper(provider);
 
         return this;
     }
 
     public JceCRMFEncryptorBuilder setProvider(String providerName)
     {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
+        this.helper = CRMFHelper.createNamedHelper(providerName);
 
         return this;
     }

pkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcePKMACValuesCalculator.java

@@ -10,9 +10,6 @@
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.cert.crmf.CRMFException;
 import org.bouncycastle.cert.crmf.PKMACValuesCalculator;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 
 public class JcePKMACValuesCalculator
     implements PKMACValuesCalculator
@@ -23,19 +20,19 @@ public class JcePKMACValuesCalculator
 
     public JcePKMACValuesCalculator()
     {
-        this.helper = new CRMFHelper(new DefaultJcaJceHelper());
+        this.helper = CRMFHelper.createDefaultHelper();
     }
 
     public JcePKMACValuesCalculator setProvider(Provider provider)
     {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
+        this.helper = CRMFHelper.createProviderHelper(provider);
 
         return this;
     }
 
     public JcePKMACValuesCalculator setProvider(String providerName)
     {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
+        this.helper = CRMFHelper.createNamedHelper(providerName);
 
         return this;
     }