Refactoring around ECPrivateKey

Author: peterdettman

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

@@ -14,11 +14,14 @@
 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;
+import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.crypto.params.ECNamedDomainParameters;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters;
@@ -199,13 +202,29 @@ else if (sequence.size() == 4)
                     && sequence.getObjectAt(2) instanceof ASN1TaggedObject)
                 {
                     ECPrivateKey ecPrivateKey = ECPrivateKey.getInstance(sequence);
-                    ASN1ObjectIdentifier curveOID = ASN1ObjectIdentifier.getInstance(ecPrivateKey.getParametersObject());
-                    X9ECParameters x9Params = ECNamedCurveTable.getByOID(curveOID);
-                    result = new ECPrivateKeyParameters(
-                        ecPrivateKey.getKey(),
-                        new ECNamedDomainParameters(
-                            curveOID,
-                            x9Params));
+
+                    X962Parameters parameters = X962Parameters.getInstance(
+                        ecPrivateKey.getParametersObject().toASN1Primitive());
+                    ECDomainParameters domainParams;
+                    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);
+                    }
+                    else
+                    {
+                        X9ECParameters x9 = X9ECParameters.getInstance(parameters.getParameters());
+                        domainParams = new ECDomainParameters(x9);
+                    }
+
+                    BigInteger d = ecPrivateKey.getKey();
+
+                    result = new ECPrivateKeyParameters(d, domainParams);
                 }
             }
         }

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

@@ -155,33 +155,29 @@ else if (algOID.equals(X9ObjectIdentifiers.id_dsa))
         }
         else if (algOID.equals(X9ObjectIdentifiers.id_ecPublicKey))
         {
-            X962Parameters params = X962Parameters.getInstance(algId.getParameters());
+            ECPrivateKey ecPrivateKey = ECPrivateKey.getInstance(keyInfo.parsePrivateKey());
 
-            X9ECParameters x9;
-            ECDomainParameters dParams;
-
-            if (params.isNamedCurve())
+            X962Parameters parameters = X962Parameters.getInstance(algId.getParameters().toASN1Primitive());
+            ECDomainParameters domainParams;
+            if (parameters.isNamedCurve())
             {
-                ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)params.getParameters();
-
-                x9 = CustomNamedCurves.getByOID(oid);
+                ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(parameters.getParameters());
+                X9ECParameters x9 = CustomNamedCurves.getByOID(oid);
                 if (x9 == null)
                 {
                     x9 = ECNamedCurveTable.getByOID(oid);
                 }
-                dParams = new ECNamedDomainParameters(oid, x9);
+                domainParams = new ECNamedDomainParameters(oid, x9);
             }
             else
             {
-                x9 = X9ECParameters.getInstance(params.getParameters());
-                dParams = new ECDomainParameters(
-                    x9.getCurve(), x9.getG(), x9.getN(), x9.getH(), x9.getSeed());
+                X9ECParameters x9 = X9ECParameters.getInstance(parameters.getParameters());
+                domainParams = new ECDomainParameters(x9);
             }
 
-            ECPrivateKey ec = ECPrivateKey.getInstance(keyInfo.parsePrivateKey());
-            BigInteger d = ec.getKey();
+            BigInteger d = ecPrivateKey.getKey();
 
-            return new ECPrivateKeyParameters(d, dParams);
+            return new ECPrivateKeyParameters(d, domainParams);
         }
         else if (algOID.equals(EdECObjectIdentifiers.id_X25519))
         {