Add ECNamedDomainParameters.lookup

Author: peterdettman

core/src/main/java/org/bouncycastle/crypto/params/ECNamedDomainParameters.java

@@ -3,14 +3,26 @@
 import java.math.BigInteger;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.X9ECParameters;
+import org.bouncycastle.crypto.ec.CustomNamedCurves;
 import org.bouncycastle.math.ec.ECConstants;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECPoint;
 
 public class ECNamedDomainParameters
     extends ECDomainParameters
 {
+    public static ECNamedDomainParameters lookup(ASN1ObjectIdentifier name)
+    {
+        X9ECParameters x9 = CustomNamedCurves.getByOID(name);
+        if (x9 == null)
+        {
+            x9 = ECNamedCurveTable.getByOID(name);
+        }
+        return new ECNamedDomainParameters(name, x9);
+    }
+
     private ASN1ObjectIdentifier name;
 
     public ECNamedDomainParameters(ASN1ObjectIdentifier name, ECCurve curve, ECPoint G, BigInteger n)

core/src/main/java/org/bouncycastle/crypto/util/OpenSSHPrivateKeyUtil.java

@@ -13,11 +13,9 @@
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
 import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.X962Parameters;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.CryptoServicesRegistrar;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.DSAParameters;
 import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
@@ -209,12 +207,7 @@ else if (sequence.size() == 4)
                     if (parameters.isNamedCurve())
                     {
                         ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(parameters.getParameters());
-                        X9ECParameters x9 = CustomNamedCurves.getByOID(oid);
-                        if (x9 == null)
-                        {
-                            x9 = ECNamedCurveTable.getByOID(oid);
-                        }
-                        domainParams = new ECNamedDomainParameters(oid, x9);
+                        domainParams = ECNamedDomainParameters.lookup(oid);
                     }
                     else
                     {

core/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java

@@ -26,7 +26,6 @@
 import org.bouncycastle.asn1.x9.X962Parameters;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.DHParameters;
 import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
@@ -162,12 +161,7 @@ else if (algOID.equals(X9ObjectIdentifiers.id_ecPublicKey))
             if (parameters.isNamedCurve())
             {
                 ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(parameters.getParameters());
-                X9ECParameters x9 = CustomNamedCurves.getByOID(oid);
-                if (x9 == null)
-                {
-                    x9 = ECNamedCurveTable.getByOID(oid);
-                }
-                domainParams = new ECNamedDomainParameters(oid, x9);
+                domainParams = ECNamedDomainParameters.lookup(oid);
             }
             else
             {

core/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java

@@ -32,14 +32,12 @@
 import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
 import org.bouncycastle.asn1.x9.DHPublicKey;
 import org.bouncycastle.asn1.x9.DomainParameters;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.ValidationParams;
 import org.bouncycastle.asn1.x9.X962Parameters;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.asn1.x9.X9ECPoint;
 import org.bouncycastle.asn1.x9.X9IntegerConverter;
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
 import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
 import org.bouncycastle.crypto.params.DHParameters;
 import org.bouncycastle.crypto.params.DHPublicKeyParameters;
@@ -291,13 +289,7 @@ AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Obje
             if (params.isNamedCurve())
             {
                 ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)params.getParameters();
-
-                X9ECParameters x9 = CustomNamedCurves.getByOID(oid);
-                if (x9 == null)
-                {
-                    x9 = ECNamedCurveTable.getByOID(oid);
-                }
-                dParams = new ECNamedDomainParameters(oid, x9);
+                dParams = ECNamedDomainParameters.lookup(oid);
             }
             else if (params.isImplicitlyCA())
             {