Use ECCurve.fromBigInteger to construct field elements

1 files changed, 33 insertions, 34 deletions

diff --git a/core/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java b/core/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java
index e2035051..d9ea744c 100644
--- a/core/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java
+++ b/core/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java
@@ -7,7 +7,6 @@ import java.util.Hashtable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
 import org.bouncycastle.math.ec.ECPoint;
 
 /**
@@ -23,7 +22,7 @@ public class ECGOST3410NamedCurves
     {
         BigInteger mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
         BigInteger mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-        
+
         ECCurve.Fp curve = new ECCurve.Fp(
             mod_p, // p
             new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"), // a
@@ -32,32 +31,32 @@ public class ECGOST3410NamedCurves
         ECDomainParameters ecParams = new ECDomainParameters(
             curve,
             new ECPoint.Fp(curve,
-                    new ECFieldElement.Fp(curve.getQ(),new BigInteger("1")), // x
-                    new ECFieldElement.Fp(curve.getQ(),new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612"))), // y
+                curve.fromBigInteger(new BigInteger("1")), // x
+                curve.fromBigInteger(new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612"))), // y
             mod_q);
-        
+
         params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A, ecParams);  
-        
+
         mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
         mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-        
+
         curve = new ECCurve.Fp(
-                mod_p, // p
-                new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"),
-                new BigInteger("166"));
+            mod_p, // p
+            new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"),
+            new BigInteger("166"));
 
         ecParams = new ECDomainParameters(
-                curve,
-                new ECPoint.Fp(curve,
-                        new ECFieldElement.Fp(curve.getQ(),new BigInteger("1")), // x
-                        new ECFieldElement.Fp(curve.getQ(),new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612"))), // y
-                mod_q);
+            curve,
+            new ECPoint.Fp(curve,
+                curve.fromBigInteger(new BigInteger("1")), // x
+                curve.fromBigInteger(new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612"))), // y
+            mod_q);
 
         params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchA, ecParams); 
-        
+
         mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823193"); //p
         mod_q = new BigInteger("57896044618658097711785492504343953927102133160255826820068844496087732066703"); //q
-        
+
         curve = new ECCurve.Fp(
             mod_p, // p
             new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823190"), // a
@@ -66,29 +65,29 @@ public class ECGOST3410NamedCurves
         ecParams = new ECDomainParameters(
             curve,
             new ECPoint.Fp(curve,
-                           new ECFieldElement.Fp(mod_p,new BigInteger("1")), // x
-                           new ECFieldElement.Fp(mod_p,new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124"))), // y
+                curve.fromBigInteger(new BigInteger("1")), // x
+                curve.fromBigInteger(new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124"))), // y
             mod_q); // q
 
         params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B, ecParams);  
-        
+
         mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619");
         mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601");
-        
+
         curve = new ECCurve.Fp(
-                mod_p, // p
-                new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"),
-                new BigInteger("32858"));
+            mod_p, // p
+            new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"),
+            new BigInteger("32858"));
 
         ecParams = new ECDomainParameters(
-                curve,
-                new ECPoint.Fp(curve,
-                               new ECFieldElement.Fp(mod_p,new BigInteger("0")),
-                               new ECFieldElement.Fp(mod_p,new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247"))),
+            curve,
+            new ECPoint.Fp(curve,
+                curve.fromBigInteger(new BigInteger("0")),
+                curve.fromBigInteger(new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247"))),
             mod_q);
-        
+
         params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchB, ecParams);  
-                                
+
         mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619"); //p
         mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601"); //q
         curve = new ECCurve.Fp(
@@ -99,18 +98,18 @@ public class ECGOST3410NamedCurves
         ecParams = new ECDomainParameters(
             curve,
             new ECPoint.Fp(curve,
-                           new ECFieldElement.Fp(mod_p,new BigInteger("0")), // x
-                           new ECFieldElement.Fp(mod_p,new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247"))), // y
+                curve.fromBigInteger(new BigInteger("0")), // x
+                curve.fromBigInteger(new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247"))), // y
             mod_q); // q
 
         params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C, ecParams); 
-            
+
         objIds.put("GostR3410-2001-CryptoPro-A", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A);
         objIds.put("GostR3410-2001-CryptoPro-B", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B);
         objIds.put("GostR3410-2001-CryptoPro-C", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C);
         objIds.put("GostR3410-2001-CryptoPro-XchA", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchA);
         objIds.put("GostR3410-2001-CryptoPro-XchB", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchB);
-        
+
         names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A, "GostR3410-2001-CryptoPro-A");
         names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B, "GostR3410-2001-CryptoPro-B");
         names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C, "GostR3410-2001-CryptoPro-C");