Centralise OperatorHelper construction in operator/jcajce in package-private OperatorUtils factory methods

gefeili · gefeili · commit 424d7936ab83 · 2026-08-03T17:11:00.000+09:30
Add createDefaultHelper/createProviderHelper/createNamedHelper to the package-private operator/jcajce OperatorUtils. Collapses 27 inlined new OperatorHelper(new *JcaJceHelper(...)) sites across 9 builder/wrapper classes and removes the now-stranded JcaJceHelper-family imports. Behaviour-preserving. JceInputDecryptorProviderBuilder is left as-is — it holds a raw JcaJceHelper, not an OperatorHelper.
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentSignerBuilder.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentSignerBuilder.java
@@ -36,9 +36,6 @@
 import org.bouncycastle.jcajce.CompositePrivateKey;
 import org.bouncycastle.jcajce.io.OutputStreamFactory;
 import org.bouncycastle.jcajce.spec.CompositeAlgorithmSpec;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.ContentSigner;
 import org.bouncycastle.operator.FixedLengthContentSigner;
 import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
@@ -76,7 +73,7 @@ public class JcaContentSignerBuilder
     private final String signatureAlgorithm;
     private final AlgorithmIdentifier signatureDigestAlgorithm;
 
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private SecureRandom random;
 
     private AlgorithmIdentifier sigAlgId;
@@ -183,14 +180,14 @@ else if (sigParamSpec instanceof CompositeAlgorithmSpec)
 
     public JcaContentSignerBuilder setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JcaContentSignerBuilder setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentVerifierProviderBuilder.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaContentVerifierProviderBuilder.java
@@ -20,9 +20,6 @@
 import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
 import org.bouncycastle.jcajce.CompositePublicKey;
 import org.bouncycastle.jcajce.io.OutputStreamFactory;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.ContentVerifier;
 import org.bouncycastle.operator.ContentVerifierProvider;
 import org.bouncycastle.operator.OperatorCreationException;
@@ -32,22 +29,22 @@
 
 public class JcaContentVerifierProviderBuilder
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
 
     public JcaContentVerifierProviderBuilder()
     {
     }
 
     public JcaContentVerifierProviderBuilder setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JcaContentVerifierProviderBuilder setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaDigestCalculatorProviderBuilder.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JcaDigestCalculatorProviderBuilder.java
@@ -7,17 +7,14 @@
 import java.security.Provider;
 
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.DigestCalculator;
 import org.bouncycastle.operator.DigestCalculatorProvider;
 import org.bouncycastle.operator.OperatorCreationException;
 
 public class JcaDigestCalculatorProviderBuilder
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
 
     public JcaDigestCalculatorProviderBuilder()
     {
@@ -33,14 +30,14 @@ public JcaDigestCalculatorProviderBuilder setHelper(JcaJceHelper helper)
 
     public JcaDigestCalculatorProviderBuilder setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JcaDigestCalculatorProviderBuilder setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java
@@ -19,17 +19,14 @@
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
 
 public class JceAsymmetricKeyUnwrapper
     extends AsymmetricKeyUnwrapper
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private Map extraMappings = new HashMap();
     private PrivateKey privKey;
     private boolean unwrappedKeyMustBeEncodable;
@@ -43,14 +40,14 @@ public JceAsymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, Privat
 
     public JceAsymmetricKeyUnwrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceAsymmetricKeyUnwrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
@@ -43,9 +43,6 @@
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
 import org.bouncycastle.jcajce.spec.GOST28147WrapParameterSpec;
 import org.bouncycastle.jcajce.spec.UserKeyingMaterialSpec;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.AsymmetricKeyWrapper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
@@ -71,7 +68,7 @@ static boolean isGOST(ASN1ObjectIdentifier algorithm)
         return gostAlgs.contains(algorithm);
     }
 
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private Map extraMappings = new HashMap();
     private PublicKey publicKey;
     private SecureRandom random;
@@ -131,14 +128,14 @@ public JceAsymmetricKeyWrapper(AlgorithmParameterSpec algorithmParameterSpec, Pu
 
     public JceAsymmetricKeyWrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceAsymmetricKeyWrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceKTSKeyUnwrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceKTSKeyUnwrapper.java
@@ -13,9 +13,6 @@
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.crypto.util.DEROtherInfo;
 import org.bouncycastle.jcajce.spec.KTSParameterSpec;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
@@ -24,7 +21,7 @@
 public class JceKTSKeyUnwrapper
     extends AsymmetricKeyUnwrapper
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private Map extraMappings = new HashMap();
     private PrivateKey privKey;
     private byte[] partyUInfo;
@@ -41,14 +38,14 @@ public JceKTSKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, PrivateKey pr
 
     public JceKTSKeyUnwrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceKTSKeyUnwrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceKTSKeyWrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceKTSKeyWrapper.java
@@ -17,9 +17,6 @@
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 import org.bouncycastle.crypto.util.DEROtherInfo;
 import org.bouncycastle.jcajce.spec.KTSParameterSpec;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.AsymmetricKeyWrapper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
@@ -33,7 +30,7 @@ public class JceKTSKeyWrapper
     private final byte[] partyUInfo;
     private final byte[] partyVInfo;
 
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private PublicKey publicKey;
     private SecureRandom random;
 
@@ -55,14 +52,14 @@ public JceKTSKeyWrapper(X509Certificate certificate, String symmetricWrappingAlg
 
     public JceKTSKeyWrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceKTSKeyWrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java
@@ -8,17 +8,14 @@
 import javax.crypto.SecretKey;
 
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
 import org.bouncycastle.operator.SymmetricKeyUnwrapper;
 
 public class JceSymmetricKeyUnwrapper
     extends SymmetricKeyUnwrapper
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private SecretKey secretKey;
 
     public JceSymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, SecretKey secretKey)
@@ -30,14 +27,14 @@ public JceSymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, SecretK
 
     public JceSymmetricKeyUnwrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceSymmetricKeyUnwrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java
@@ -16,17 +16,14 @@
 import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.GenericKey;
 import org.bouncycastle.operator.OperatorException;
 import org.bouncycastle.operator.SymmetricKeyWrapper;
 
 public class JceSymmetricKeyWrapper
     extends SymmetricKeyWrapper
 {
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
+    private OperatorHelper helper = OperatorUtils.createDefaultHelper();
     private SecureRandom random;
     private SecretKey wrappingKey;
 
@@ -39,14 +36,14 @@ public JceSymmetricKeyWrapper(SecretKey wrappingKey)
 
     public JceSymmetricKeyWrapper setProvider(Provider provider)
     {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
+        this.helper = OperatorUtils.createProviderHelper(provider);
 
         return this;
     }
 
     public JceSymmetricKeyWrapper setProvider(String providerName)
     {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
+        this.helper = OperatorUtils.createNamedHelper(providerName);
 
         return this;
     }
diff --git a/pkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorUtils.java b/pkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorUtils.java
@@ -1,9 +1,13 @@
 package org.bouncycastle.operator.jcajce;
 
 import java.security.Key;
+import java.security.Provider;
 
 import javax.crypto.spec.SecretKeySpec;
 
+import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
+import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
+import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
 import org.bouncycastle.operator.GenericKey;
 
 class OperatorUtils
@@ -22,4 +26,19 @@ static Key getJceKey(GenericKey key)
 
         throw new IllegalArgumentException("unknown generic key type");
     }
+
+    static OperatorHelper createDefaultHelper()
+    {
+        return new OperatorHelper(new DefaultJcaJceHelper());
+    }
+
+    static OperatorHelper createProviderHelper(Provider provider)
+    {
+        return new OperatorHelper(new ProviderJcaJceHelper(provider));
+    }
+
+    static OperatorHelper createNamedHelper(String providerName)
+    {
+        return new OperatorHelper(new NamedJcaJceHelper(providerName));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@`
`20`	`20`	`import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;`
`21`	`21`	`import org.bouncycastle.jcajce.CompositePublicKey;`
`22`	`22`	`import org.bouncycastle.jcajce.io.OutputStreamFactory;`
`23`		`-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;`
`24`		`-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;`
`25`		`-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;`
`26`	`23`	`import org.bouncycastle.operator.ContentVerifier;`
`27`	`24`	`import org.bouncycastle.operator.ContentVerifierProvider;`
`28`	`25`	`import org.bouncycastle.operator.OperatorCreationException;`
`@@ -32,22 +29,22 @@`
`32`	`29`
`33`	`30`	`public class JcaContentVerifierProviderBuilder`
`34`	`31`	`{`
`35`		`- private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());`
	`32`	`+ private OperatorHelper helper = OperatorUtils.createDefaultHelper();`
`36`	`33`
`37`	`34`	`public JcaContentVerifierProviderBuilder()`
`38`	`35`	`{`
`39`	`36`	`}`
`40`	`37`
`41`	`38`	`public JcaContentVerifierProviderBuilder setProvider(Provider provider)`
`42`	`39`	`{`
`43`		`- this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));`
	`40`	`+ this.helper = OperatorUtils.createProviderHelper(provider);`
`44`	`41`
`45`	`42`	`return this;`
`46`	`43`	`}`
`47`	`44`
`48`	`45`	`public JcaContentVerifierProviderBuilder setProvider(String providerName)`
`49`	`46`	`{`
`50`		`- this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));`
	`47`	`+ this.helper = OperatorUtils.createNamedHelper(providerName);`
`51`	`48`
`52`	`49`	`return this;`
`53`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,17 +7,14 @@`
`7`	`7`	`import java.security.Provider;`
`8`	`8`
`9`	`9`	`import org.bouncycastle.asn1.x509.AlgorithmIdentifier;`
`10`		`-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;`
`11`	`10`	`import org.bouncycastle.jcajce.util.JcaJceHelper;`
`12`		`-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;`
`13`		`-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;`
`14`	`11`	`import org.bouncycastle.operator.DigestCalculator;`
`15`	`12`	`import org.bouncycastle.operator.DigestCalculatorProvider;`
`16`	`13`	`import org.bouncycastle.operator.OperatorCreationException;`
`17`	`14`
`18`	`15`	`public class JcaDigestCalculatorProviderBuilder`
`19`	`16`	`{`
`20`		`- private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());`
	`17`	`+ private OperatorHelper helper = OperatorUtils.createDefaultHelper();`
`21`	`18`
`22`	`19`	`public JcaDigestCalculatorProviderBuilder()`
`23`	`20`	`{`
`@@ -33,14 +30,14 @@ public JcaDigestCalculatorProviderBuilder setHelper(JcaJceHelper helper)`
`33`	`30`
`34`	`31`	`public JcaDigestCalculatorProviderBuilder setProvider(Provider provider)`
`35`	`32`	`{`
`36`		`- this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));`
	`33`	`+ this.helper = OperatorUtils.createProviderHelper(provider);`
`37`	`34`
`38`	`35`	`return this;`
`39`	`36`	`}`
`40`	`37`
`41`	`38`	`public JcaDigestCalculatorProviderBuilder setProvider(String providerName)`
`42`	`39`	`{`
`43`		`- this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));`
	`40`	`+ this.helper = OperatorUtils.createNamedHelper(providerName);`
`44`	`41`
`45`	`42`	`return this;`
`46`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,6 @@`
`43`	`43`	`import org.bouncycastle.crypto.CryptoServicesRegistrar;`
`44`	`44`	`import org.bouncycastle.jcajce.spec.GOST28147WrapParameterSpec;`
`45`	`45`	`import org.bouncycastle.jcajce.spec.UserKeyingMaterialSpec;`
`46`		`-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;`
`47`		`-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;`
`48`		`-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;`
`49`	`46`	`import org.bouncycastle.operator.AsymmetricKeyWrapper;`
`50`	`47`	`import org.bouncycastle.operator.GenericKey;`
`51`	`48`	`import org.bouncycastle.operator.OperatorException;`
`@@ -71,7 +68,7 @@ static boolean isGOST(ASN1ObjectIdentifier algorithm)`
`71`	`68`	`return gostAlgs.contains(algorithm);`
`72`	`69`	`}`
`73`	`70`
`74`		`- private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());`
	`71`	`+ private OperatorHelper helper = OperatorUtils.createDefaultHelper();`
`75`	`72`	`private Map extraMappings = new HashMap();`
`76`	`73`	`private PublicKey publicKey;`
`77`	`74`	`private SecureRandom random;`
`@@ -131,14 +128,14 @@ public JceAsymmetricKeyWrapper(AlgorithmParameterSpec algorithmParameterSpec, Pu`
`131`	`128`
`132`	`129`	`public JceAsymmetricKeyWrapper setProvider(Provider provider)`
`133`	`130`	`{`
`134`		`- this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));`
	`131`	`+ this.helper = OperatorUtils.createProviderHelper(provider);`
`135`	`132`
`136`	`133`	`return this;`
`137`	`134`	`}`
`138`	`135`
`139`	`136`	`public JceAsymmetricKeyWrapper setProvider(String providerName)`
`140`	`137`	`{`
`141`		`- this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));`
	`138`	`+ this.helper = OperatorUtils.createNamedHelper(providerName);`
`142`	`139`
`143`	`140`	`return this;`
`144`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,14 @@`
`8`	`8`	`import javax.crypto.SecretKey;`
`9`	`9`
`10`	`10`	`import org.bouncycastle.asn1.x509.AlgorithmIdentifier;`
`11`		`-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;`
`12`		`-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;`
`13`		`-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;`
`14`	`11`	`import org.bouncycastle.operator.GenericKey;`
`15`	`12`	`import org.bouncycastle.operator.OperatorException;`
`16`	`13`	`import org.bouncycastle.operator.SymmetricKeyUnwrapper;`
`17`	`14`
`18`	`15`	`public class JceSymmetricKeyUnwrapper`
`19`	`16`	`extends SymmetricKeyUnwrapper`
`20`	`17`	`{`
`21`		`- private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());`
	`18`	`+ private OperatorHelper helper = OperatorUtils.createDefaultHelper();`
`22`	`19`	`private SecretKey secretKey;`
`23`	`20`
`24`	`21`	`public JceSymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, SecretKey secretKey)`
`@@ -30,14 +27,14 @@ public JceSymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, SecretK`
`30`	`27`
`31`	`28`	`public JceSymmetricKeyUnwrapper setProvider(Provider provider)`
`32`	`29`	`{`
`33`		`- this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));`
	`30`	`+ this.helper = OperatorUtils.createProviderHelper(provider);`
`34`	`31`
`35`	`32`	`return this;`
`36`	`33`	`}`
`37`	`34`
`38`	`35`	`public JceSymmetricKeyUnwrapper setProvider(String providerName)`
`39`	`36`	`{`
`40`		`- this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));`
	`37`	`+ this.helper = OperatorUtils.createNamedHelper(providerName);`
`41`	`38`
`42`	`39`	`return this;`
`43`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,14 @@`
`16`	`16`	`import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;`
`17`	`17`	`import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;`
`18`	`18`	`import org.bouncycastle.asn1.x509.AlgorithmIdentifier;`
`19`		`-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;`
`20`		`-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;`
`21`		`-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;`
`22`	`19`	`import org.bouncycastle.operator.GenericKey;`
`23`	`20`	`import org.bouncycastle.operator.OperatorException;`
`24`	`21`	`import org.bouncycastle.operator.SymmetricKeyWrapper;`
`25`	`22`
`26`	`23`	`public class JceSymmetricKeyWrapper`
`27`	`24`	`extends SymmetricKeyWrapper`
`28`	`25`	`{`
`29`		`- private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());`
	`26`	`+ private OperatorHelper helper = OperatorUtils.createDefaultHelper();`
`30`	`27`	`private SecureRandom random;`
`31`	`28`	`private SecretKey wrappingKey;`
`32`	`29`
`@@ -39,14 +36,14 @@ public JceSymmetricKeyWrapper(SecretKey wrappingKey)`
`39`	`36`
`40`	`37`	`public JceSymmetricKeyWrapper setProvider(Provider provider)`
`41`	`38`	`{`
`42`		`- this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));`
	`39`	`+ this.helper = OperatorUtils.createProviderHelper(provider);`
`43`	`40`
`44`	`41`	`return this;`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`public JceSymmetricKeyWrapper setProvider(String providerName)`
`48`	`45`	`{`
`49`		`- this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));`
	`46`	`+ this.helper = OperatorUtils.createNamedHelper(providerName);`
`50`	`47`
`51`	`48`	`return this;`
`52`	`49`	`}`