Merge "bouncycastle: upgrade to version 1.56" am: ae9dc88d85 am: ed012da722

am: 07a37e800c

Change-Id: Ie6a51b57d83037f0f7f1acecedc16da1c1bd6820

1 files changed, 61 insertions, 3 deletions

diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java
index 0f25888a..3b8a0a6a 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/EC5Util.java
@@ -10,13 +10,16 @@ import java.security.spec.EllipticCurve;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.x9.ECNamedCurveTable;
 import org.bouncycastle.asn1.x9.X962Parameters;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.ec.CustomNamedCurves;
+import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
 import org.bouncycastle.jce.spec.ECNamedCurveSpec;
 import org.bouncycastle.math.ec.ECAlgorithms;
@@ -43,6 +46,15 @@ public class EC5Util
                 customCurves.put(curveParams.getCurve(), CustomNamedCurves.getByName(name).getCurve());
             }
         }
+
+        // BEGIN android-removed
+        // X9ECParameters c25519 = CustomNamedCurves.getByName("Curve25519");
+
+        // customCurves.put(new ECCurve.Fp(
+        //     c25519.getCurve().getField().getCharacteristic(),
+        //     c25519.getCurve().getA().toBigInteger(),
+        //    c25519.getCurve().getB().toBigInteger()), c25519.getCurve());
+        // END android-removed
     }
 
     public static ECCurve getCurve(
@@ -50,28 +62,66 @@ public class EC5Util
         X962Parameters params)
     {
         ECCurve curve;
+        Set acceptableCurves = configuration.getAcceptableNamedCurves();
 
         if (params.isNamedCurve())
         {
             ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
-            X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
 
-            curve = ecP.getCurve();
+            if (acceptableCurves.isEmpty() || acceptableCurves.contains(oid))
+            {
+                X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
+
+                if (ecP == null)
+                {
+                    ecP = (X9ECParameters)configuration.getAdditionalECParameters().get(oid);
+                }
+
+                curve = ecP.getCurve();
+            }
+            else
+            {
+                throw new IllegalStateException("named curve not acceptable");
+            }
         }
         else if (params.isImplicitlyCA())
         {
             curve = configuration.getEcImplicitlyCa().getCurve();
         }
-        else
+        else if (acceptableCurves.isEmpty())
         {
             X9ECParameters ecP = X9ECParameters.getInstance(params.getParameters());
 
             curve = ecP.getCurve();
         }
+        else
+        {
+            throw new IllegalStateException("encoded parameters not acceptable");
+        }
 
         return curve;
     }
 
+    public static ECDomainParameters getDomainParameters(
+        ProviderConfiguration configuration,
+        java.security.spec.ECParameterSpec params)
+    {
+        ECDomainParameters domainParameters;
+
+        if (params == null)
+        {
+            org.bouncycastle.jce.spec.ECParameterSpec iSpec = configuration.getEcImplicitlyCa();
+
+            domainParameters = new ECDomainParameters(iSpec.getCurve(), iSpec.getG(), iSpec.getN(), iSpec.getH(), iSpec.getSeed());
+        }
+        else
+        {
+            domainParameters = ECUtil.getDomainParameters(configuration, convertSpec(params, false));
+        }
+
+        return domainParameters;
+    }
+
     public static ECParameterSpec convertToSpec(
         X962Parameters params, ECCurve curve)
     {
@@ -82,6 +132,14 @@ public class EC5Util
         {
             ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)params.getParameters();
             X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
+            if (ecP == null)
+            {
+                Map additionalECParameters = BouncyCastleProvider.CONFIGURATION.getAdditionalECParameters();
+                if (!additionalECParameters.isEmpty())
+                {
+                    ecP = (X9ECParameters)additionalECParameters.get(oid);
+                }
+            }
 
             ellipticCurve = EC5Util.convertCurve(curve, ecP.getSeed());