summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2019-08-02 22:30:07 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2019-08-02 22:30:07 +0700
commitc85a0e90ffc14dbb2673e2f5a1287133301b9f1a (patch)
treecafc39488113fe5e3d9e761b59acd5dcc2392232
parentAdd experimental support for GLV Type A endomorphisms (diff)
downloadBouncyCastle.NET-ed25519-c85a0e90ffc14dbb2673e2f5a1287133301b9f1a.tar.xz
EC wNAF-related updates from bc-java
- better control of window size limits
- callers take advantage of available larger precomps
- provide ConfigureBasepoint to mark points for larger precomp
- mark built-in curve basepoints for larger default wNAF width
Diffstat
-rw-r--r--crypto/src/asn1/anssi/ANSSINamedCurves.cs13
-rw-r--r--crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs72
-rw-r--r--crypto/src/asn1/gm/GMNamedCurves.cs19
-rw-r--r--crypto/src/asn1/sec/SECNamedCurves.cs198
-rw-r--r--crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs122
-rw-r--r--crypto/src/asn1/x9/X962NamedCurves.cs379
-rw-r--r--crypto/src/crypto/ec/CustomNamedCurves.cs164
-rw-r--r--crypto/src/math/ec/ECAlgorithms.cs48
-rw-r--r--crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs25
-rw-r--r--crypto/src/math/ec/multiplier/WNafPreCompInfo.cs16
-rw-r--r--crypto/src/math/ec/multiplier/WNafUtilities.cs142
11 files changed, 659 insertions, 539 deletions
diff --git a/crypto/src/asn1/anssi/ANSSINamedCurves.cs b/crypto/src/asn1/anssi/ANSSINamedCurves.cs
index d0c90ebf1..ce941709f 100644
--- a/crypto/src/asn1/anssi/ANSSINamedCurves.cs
+++ b/crypto/src/asn1/anssi/ANSSINamedCurves.cs
@@ -4,6 +4,7 @@ using System.Collections;
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -12,6 +13,13 @@ namespace Org.BouncyCastle.Asn1.Anssi
 {
     public class AnssiNamedCurves
     {
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
         private static ECCurve ConfigureCurve(ECCurve curve)
         {
             return curve;
@@ -42,9 +50,8 @@ namespace Org.BouncyCastle.Asn1.Anssi
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "B6B3D4C356C139EB31183D4749D423958C27D2DCAF98B70164C97A2DD98F5CFF"
-                    + "6142E0F7C8B204911F9271F0F3ECEF8C2701C307E8E4C9E183115A1554062CFB"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04B6B3D4C356C139EB31183D4749D423958C27D2DCAF98B70164C97A2DD98F5CFF6142E0F7C8B204911F9271F0F3ECEF8C2701C307E8E4C9E183115A1554062CFB");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
diff --git a/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs b/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
index f4a3fce64..92c9312c7 100644
--- a/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
+++ b/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
@@ -5,6 +5,7 @@ using Org.BouncyCastle.Asn1.Rosstandart;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 
@@ -15,6 +16,18 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
     /// </summary>
     public sealed class ECGost3410NamedCurves
     {
+        private static ECPoint ConfigureBasepoint(ECCurve curve, BigInteger x, BigInteger y)
+        {
+            ECPoint G = curve.CreatePoint(x, y);
+            WNafUtilities.ConfigureBasepoint(G);
+            return G;
+        }
+
+        private static ECCurve ConfigureCurve(ECCurve curve)
+        {
+            return curve;
+        }
+
         private ECGost3410NamedCurves()
         {
         }
@@ -28,15 +41,15 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             BigInteger mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
             BigInteger mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
 
-            FpCurve curve = new FpCurve(
+            ECCurve curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"), // a
                 new BigInteger("166"), // b
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ECDomainParameters ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("1"), // x
                     new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
                 mod_q, BigInteger.One);
@@ -46,15 +59,15 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
             mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
 
-            curve = new FpCurve(
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"),
                 new BigInteger("166"),
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("1"), // x
                     new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
                 mod_q, BigInteger.One);
@@ -64,15 +77,15 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823193"); //p
             mod_q = new BigInteger("57896044618658097711785492504343953927102133160255826820068844496087732066703"); //q
 
-            curve = new FpCurve(
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823190"), // a
                 new BigInteger("28091019353058090096996979000309560759124368558014865957655842872397301267595"), // b
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("1"), // x
                     new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124")), // y
                 mod_q, BigInteger.One);
@@ -82,15 +95,15 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619");
             mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601");
 
-            curve = new FpCurve(
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"),
                 new BigInteger("32858"),
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("0"),
                     new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")),
                 mod_q, BigInteger.One);
@@ -99,15 +112,16 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
 
             mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619"); //p
             mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601"); //q
-            curve = new FpCurve(
+
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"), // a
                 new BigInteger("32858"), // b
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("0"), // x
                     new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")), // y
                 mod_q, BigInteger.One);
@@ -117,15 +131,16 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             //GOST34.10 2012
             mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97", 16); //p
             mod_q = new BigInteger("400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67", 16); //q
-            curve = new FpCurve(
+
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335", 16), // a
                 new BigInteger("295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513", 16), // b
-                mod_q, BigInteger.Four);
+                mod_q, BigInteger.Four));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28", 16), // x
                     new BigInteger("32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C", 16)), // y
                 mod_q, BigInteger.Four);
@@ -134,15 +149,16 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
 
             mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7", 16); //p
             mod_q = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275", 16); //q
-            curve = new FpCurve(
+
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4", 16), // a
                 new BigInteger("E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760", 16), // b
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003"), // x
                     new BigInteger("7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4", 16)), // y
                 mod_q, BigInteger.One);
@@ -151,15 +167,16 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
 
             mod_p = new BigInteger("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F", 16); //p
             mod_q = new BigInteger("800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD", 16); //q
-            curve = new FpCurve(
+
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C", 16), // a
                 new BigInteger("687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116", 16), // b
-                mod_q, BigInteger.One);
+                mod_q, BigInteger.One));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002"), // x
                     new BigInteger("1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD", 16)), // y
                 mod_q, BigInteger.One);
@@ -168,15 +185,16 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
 
             mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7", 16); //p
             mod_q = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED", 16); //q
-            curve = new FpCurve(
+
+            curve = ConfigureCurve(new FpCurve(
                 mod_p, // p
                 new BigInteger("DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E143064546E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3", 16), // a
                 new BigInteger("B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1", 16), // b
-                mod_q, BigInteger.Four);
+                mod_q, BigInteger.Four));
 
             ecParams = new ECDomainParameters(
                 curve,
-                curve.CreatePoint(
+                ConfigureBasepoint(curve,
                     new BigInteger("E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148", 16), // x
                     new BigInteger("F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F", 16)), // y
                 mod_q, BigInteger.Four);
diff --git a/crypto/src/asn1/gm/GMNamedCurves.cs b/crypto/src/asn1/gm/GMNamedCurves.cs
index e2ec6d854..5b1072f8c 100644
--- a/crypto/src/asn1/gm/GMNamedCurves.cs
+++ b/crypto/src/asn1/gm/GMNamedCurves.cs
@@ -5,6 +5,7 @@ using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
 using Org.BouncyCastle.Math.EC.Endo;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -17,6 +18,13 @@ namespace Org.BouncyCastle.Asn1.GM
         {
         }
 
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
         private static ECCurve ConfigureCurve(ECCurve curve)
         {
             return curve;
@@ -47,10 +55,8 @@ namespace Org.BouncyCastle.Asn1.GM
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7"
-                    + "BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0"));
-
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0432C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0");
                 return new X9ECParameters(curve, G, n, h, S);
             }
         }
@@ -75,9 +81,8 @@ namespace Org.BouncyCastle.Asn1.GM
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "4AD5F7048DE709AD51236DE6" + "5E4D4B482C836DC6E4106640"
-                    + "02BB3A02D4AAADACAE24817A" + "4CA3A1B014B5270432DB27D2"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "044AD5F7048DE709AD51236DE65E4D4B482C836DC6E410664002BB3A02D4AAADACAE24817A4CA3A1B014B5270432DB27D2");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
diff --git a/crypto/src/asn1/sec/SECNamedCurves.cs b/crypto/src/asn1/sec/SECNamedCurves.cs
index 7d755cc11..44190d2b2 100644
--- a/crypto/src/asn1/sec/SECNamedCurves.cs
+++ b/crypto/src/asn1/sec/SECNamedCurves.cs
@@ -6,6 +6,7 @@ using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
 using Org.BouncyCastle.Math.EC.Endo;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -18,6 +19,13 @@ namespace Org.BouncyCastle.Asn1.Sec
         {
         }
 
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
         private static ECCurve ConfigureCurve(ECCurve curve)
         {
             return curve;
@@ -54,9 +62,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "09487239995A5EE76B55F9C2F098"
-                    + "A89CE5AF8724C0A23E0E0FF77500"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0409487239995A5EE76B55F9C2F098A89CE5AF8724C0A23E0E0FF77500"); 
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -83,9 +91,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "4BA30AB5E892B4E1649DD0928643"
-                    + "ADCD46F5882E3747DEF36E956E97"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "044BA30AB5E892B4E1649DD0928643ADCD46F5882E3747DEF36E956E97");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -112,9 +120,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "161FF7528B899B2D0C28607CA52C5B86"
-                    + "CF5AC8395BAFEB13C02DA292DDED7A83"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04161FF7528B899B2D0C28607CA52C5B86CF5AC8395BAFEB13C02DA292DDED7A83");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -141,9 +149,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "7B6AA5D85E572983E6FB32A7CDEBC140"
-                    + "27B6916A894D3AEE7106FE805FC34B44"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "047B6AA5D85E572983E6FB32A7CDEBC14027B6916A894D3AEE7106FE805FC34B44");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -184,9 +192,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                         176));
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
-                    + "938CF935318FDCED6BC28286531733C3F03C4FEE"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "043B4C382CE37AA192A4019E763036F4F5DD4D7EBB938CF935318FDCED6BC28286531733C3F03C4FEE");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -213,9 +221,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "4A96B5688EF573284664698968C38BB913CBFC82"
-                    + "23A628553168947D59DCC912042351377AC5FB32"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "044A96B5688EF573284664698968C38BB913CBFC8223A628553168947D59DCC912042351377AC5FB32");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -242,9 +250,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "52DCB034293A117E1F4FF11B30F7199D3144CE6D"
-                    + "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0452DCB034293A117E1F4FF11B30F7199D3144CE6DFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -285,9 +293,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                         208));
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
-                    + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -314,9 +322,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
-                    + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E794811");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -357,9 +365,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                         240));
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"
-                    + "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -386,9 +394,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
-                    + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -429,9 +437,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                         272));
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"
-                    + "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -458,9 +466,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
-                    + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -487,9 +495,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"
-                    + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"));
+                    + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -516,9 +525,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"
-                    + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650"));
+                    + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -546,9 +556,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "009D73616F35F4AB1407D73562C10F"
-                    + "00A52830277958EE84D1315ED31886"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04009D73616F35F4AB1407D73562C10F00A52830277958EE84D1315ED31886");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -576,9 +586,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "01A57A6A7B26CA5EF52FCDB8164797"
-                    + "00B3ADC94ED1FE674C06E695BABA1D"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0401A57A6A7B26CA5EF52FCDB816479700B3ADC94ED1FE674C06E695BABA1D");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -608,9 +618,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0081BAF91FDF9833C40F9C181343638399"
-                    + "078C6E7EA38C001F73C8134B1B4EF9E150"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040081BAF91FDF9833C40F9C181343638399078C6E7EA38C001F73C8134B1B4EF9E150");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -640,9 +650,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0356DCD8F2F95031AD652D23951BB366A8"
-                    + "0648F06D867940A5366D9E265DE9EB240F"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040356DCD8F2F95031AD652D23951BB366A80648F06D867940A5366D9E265DE9EB240F");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -672,9 +682,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"
-                    + "0289070FB05D38FF58321F2E800536D538CCDAA3D9"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0402FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE80289070FB05D38FF58321F2E800536D538CCDAA3D9");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -704,9 +714,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0369979697AB43897789566789567F787A7876A654"
-                    + "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040369979697AB43897789566789567F787A7876A65400435EDB42EFAFB2989D51FEFCE3C80988F41FF883");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -736,9 +746,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "03F0EBA16286A2D57EA0991168D4994637E8343E36"
-                    + "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0403F0EBA16286A2D57EA0991168D4994637E8343E3600D51FBC6C71A0094FA2CDD545B11C5C0C797324F1");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -766,9 +776,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1"
-                    + "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0401F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E10025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -796,9 +806,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F"
-                    + "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0400D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -826,9 +836,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"
-                    + "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD612601DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -856,9 +866,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"
-                    + "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0400FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -886,9 +896,9 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"
-                    + "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0429A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -918,9 +928,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"
-                    + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259"));
+                    + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -950,9 +961,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"
-                    + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4"));
+                    + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -980,9 +992,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"
-                    + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B"));
+                    + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -1010,9 +1023,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"
-                    + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706"));
+                    + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -1042,9 +1056,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"
-                    + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3"));
+                    + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
@@ -1074,9 +1089,10 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"
-                    + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B"));
+                    + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B");
 
                 return new X9ECParameters(curve, G, n, h, S);
             }
diff --git a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
index 9a82db319..8393f3ea5 100644
--- a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
+++ b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
@@ -3,6 +3,7 @@ using System.Collections;
 using Org.BouncyCastle.Asn1.X9;
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -15,6 +16,13 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
     */
     public class TeleTrusTNamedCurves
     {
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
         private static ECCurve ConfigureCurve(ECCurve curve)
         {
             return curve;
@@ -38,10 +46,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("1E589A8595423412134FAA2DBDEC95C8D8675E58", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -58,16 +66,16 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                 BigInteger h = new BigInteger("01", 16);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(
-                    //   new BigInteger("24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B", 16), // Z
+                    //new BigInteger("24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B", 16), // Z
                     new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620F", 16), // q
                     new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620C", 16), // a'
                     new BigInteger("7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -89,10 +97,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -115,10 +123,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -140,10 +148,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -166,10 +174,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -191,10 +199,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -217,10 +225,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -242,10 +250,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -268,10 +276,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -293,10 +301,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -319,10 +327,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -344,10 +352,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723", 16), // b
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892")), // G
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -370,10 +378,10 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
                     new BigInteger("7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E", 16), // b'
                     n, h));
 
-                return new X9ECParameters(
-                    curve,
-                    new X9ECPoint(curve, Hex.Decode("04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332")), // G'
-                    n, h);
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
diff --git a/crypto/src/asn1/x9/X962NamedCurves.cs b/crypto/src/asn1/x9/X962NamedCurves.cs
index 1609774f1..f8ba4144b 100644
--- a/crypto/src/asn1/x9/X962NamedCurves.cs
+++ b/crypto/src/asn1/x9/X962NamedCurves.cs
@@ -3,6 +3,7 @@ using System.Collections;
 
 using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Math.EC;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -18,6 +19,18 @@ namespace Org.BouncyCastle.Asn1.X9
         {
         }
 
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
+        {
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
+        }
+
+        private static ECCurve ConfigureCurve(ECCurve curve)
+        {
+            return curve;
+        }
+
         internal class Prime192v1Holder
             : X9ECParametersHolder
         {
@@ -30,18 +43,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("ffffffffffffffffffffffff99def836146bc9b1b4d22831", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp192v1 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", 16),
                     new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16),
                     new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp192v1,
-                    new X9ECPoint(cFp192v1,
-                        Hex.Decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")),
-                    n, h,
-                    Hex.Decode("3045AE6FC8422f64ED579528D38120EAE12196D5"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("3045AE6FC8422f64ED579528D38120EAE12196D5"));
             }
         }
 
@@ -57,18 +68,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("fffffffffffffffffffffffe5fb1a724dc80418648d8dd31", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp192v2 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", 16),
                     new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16),
                     new BigInteger("cc22d6dfb95c6b25e49c0d6364a4e5980c393aa21668d953", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp192v2,
-                    new X9ECPoint(cFp192v2,
-                        Hex.Decode("03eea2bae7e1497842f2de7769cfe9c989c072ad696f48034a")),
-                    n, h,
-                    Hex.Decode("31a92ee2029fd10d901b113e990710f0d21ac6b6"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "03eea2bae7e1497842f2de7769cfe9c989c072ad696f48034a");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("31a92ee2029fd10d901b113e990710f0d21ac6b6"));
             }
         }
 
@@ -84,18 +93,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("ffffffffffffffffffffffff7a62d031c83f4294f640ec13", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp192v3 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF", 16),
                     new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16),
                     new BigInteger("22123dc2395a05caa7423daeccc94760a7d462256bd56916", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp192v3,
-                    new X9ECPoint(cFp192v3,
-                        Hex.Decode("027d29778100c65a1da1783716588dce2b8b4aee8e228f1896")),
-                    n, h,
-                    Hex.Decode("c469684435deb378c4b65ca9591e2a5763059a2e"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "027d29778100c65a1da1783716588dce2b8b4aee8e228f1896");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("c469684435deb378c4b65ca9591e2a5763059a2e"));
             }
         }
 
@@ -111,18 +118,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("7fffffffffffffffffffffff7fffff9e5e9a9f5d9071fbd1522688909d0b", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp239v1 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"),
                     new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16),
                     new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp239v1,
-                    new X9ECPoint(cFp239v1,
-                        Hex.Decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")),
-                    n, h,
-                    Hex.Decode("e43bb460f0b80cc0c0b075798e948060f8321b7d"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("e43bb460f0b80cc0c0b075798e948060f8321b7d"));
             }
         }
 
@@ -138,18 +143,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("7fffffffffffffffffffffff800000cfa7e8594377d414c03821bc582063", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp239v2 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"),
                     new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16),
                     new BigInteger("617fab6832576cbbfed50d99f0249c3fee58b94ba0038c7ae84c8c832f2c", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp239v2,
-                    new X9ECPoint(cFp239v2,
-                        Hex.Decode("0238af09d98727705120c921bb5e9e26296a3cdcf2f35757a0eafd87b830e7")),
-                    n, h,
-                    Hex.Decode("e8b4011604095303ca3b8099982be09fcb9ae616"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0238af09d98727705120c921bb5e9e26296a3cdcf2f35757a0eafd87b830e7");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("e8b4011604095303ca3b8099982be09fcb9ae616"));
             }
         }
 
@@ -165,18 +168,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("7fffffffffffffffffffffff7fffff975deb41b3a6057c3c432146526551", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp239v3 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"),
                     new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16),
                     new BigInteger("255705fa2a306654b1f4cb03d6a750a30c250102d4988717d9ba15ab6d3e", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp239v3,
-                    new X9ECPoint(cFp239v3,
-                        Hex.Decode("036768ae8e18bb92cfcf005c949aa2c6d94853d0e660bbf854b1c9505fe95a")),
-                    n, h,
-                    Hex.Decode("7d7374168ffe3471b60a857686a19475d3bfa2ff"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "036768ae8e18bb92cfcf005c949aa2c6d94853d0e660bbf854b1c9505fe95a");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("7d7374168ffe3471b60a857686a19475d3bfa2ff"));
             }
         }
 
@@ -192,18 +193,16 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", 16);
                 BigInteger h = BigInteger.One;
 
-                ECCurve cFp256v1 = new FpCurve(
+                ECCurve curve = ConfigureCurve(new FpCurve(
                     new BigInteger("115792089210356248762697446949407573530086143415290314195533631308867097853951"),
                     new BigInteger("ffffffff00000001000000000000000000000000fffffffffffffffffffffffc", 16),
                     new BigInteger("5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    cFp256v1,
-                    new X9ECPoint(cFp256v1,
-                        Hex.Decode("036b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296")),
-                    n, h,
-                    Hex.Decode("c49d360886e704936a6678e1139d26b7819f7e90"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "036b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("c49d360886e704936a6678e1139d26b7819f7e90"));
             }
         }
 
@@ -222,19 +221,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0400000000000000000001E60FC8821CC74DAEAFC1", 16);
                 BigInteger h = BigInteger.Two;
 
-                ECCurve c2m163v1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     163,
                     1, 2, 8,
                     new BigInteger("072546B5435234A422E0789675F432C89435DE5242", 16),
                     new BigInteger("00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m163v1,
-                    new X9ECPoint(c2m163v1,
-                        Hex.Decode("0307AF69989546103D79329FCC3D74880F33BBE803CB")),
-                    n, h,
-                    Hex.Decode("D2C0FB15760860DEF1EEF4D696E6768756151754"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0307AF69989546103D79329FCC3D74880F33BBE803CB");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("D2C0FB15760860DEF1EEF4D696E6768756151754"));
             }
         }
 
@@ -250,19 +247,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7", 16);
                 BigInteger h = BigInteger.Two;
 
-                ECCurve c2m163v2 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     163,
                     1, 2, 8,
                     new BigInteger("0108B39E77C4B108BED981ED0E890E117C511CF072", 16),
                     new BigInteger("0667ACEB38AF4E488C407433FFAE4F1C811638DF20", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m163v2,
-                    new X9ECPoint(c2m163v2,
-                        Hex.Decode("030024266E4EB5106D0A964D92C4860E2671DB9B6CC5")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "030024266E4EB5106D0A964D92C4860E2671DB9B6CC5");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -278,18 +273,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309", 16);
                 BigInteger h = BigInteger.Two;
 
-                ECCurve c2m163v3 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     163,
                     1, 2, 8,
                     new BigInteger("07A526C63D3E25A256A007699F5447E32AE456B50E", 16),
                     new BigInteger("03F7061798EB99E238FD6F1BF95B48FEEB4854252B", 16),
-                    n, h);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0202F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB");
 
-                return new X9ECParameters(
-                    c2m163v3,
-                    new X9ECPoint(c2m163v3, Hex.Decode("0202F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB")),
-                    n, h,
-                    null);
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -305,19 +299,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("010092537397ECA4F6145799D62B0A19CE06FE26AD", 16);
                 BigInteger h = BigInteger.ValueOf(0xFF6E);
 
-                ECCurve c2m176w1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     176,
                     1, 2, 43,
                     new BigInteger("00E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B", 16),
                     new BigInteger("005DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m176w1,
-                    new X9ECPoint(c2m176w1,
-                        Hex.Decode("038D16C2866798B600F9F08BB4A8E860F3298CE04A5798")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "038D16C2866798B600F9F08BB4A8E860F3298CE04A5798");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -333,19 +325,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("40000000000000000000000004A20E90C39067C893BBB9A5", 16);
                 BigInteger h = BigInteger.Two;
 
-                ECCurve c2m191v1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     191,
                     9,
                     new BigInteger("2866537B676752636A68F56554E12640276B649EF7526267", 16),
                     new BigInteger("2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m191v1,
-                    new X9ECPoint(c2m191v1,
-                        Hex.Decode("0236B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D")),
-                    n, h,
-                    Hex.Decode("4E13CA542744D696E67687561517552F279A8C84"));
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0236B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D");
+
+                return new X9ECParameters(curve, G, n, h, Hex.Decode("4E13CA542744D696E67687561517552F279A8C84"));
             }
         }
 
@@ -361,19 +351,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("20000000000000000000000050508CB89F652824E06B8173", 16);
                 BigInteger h = BigInteger.ValueOf(4);
 
-                ECCurve c2m191v2 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     191,
                     9,
                     new BigInteger("401028774D7777C7B7666D1366EA432071274F89FF01E718", 16),
                     new BigInteger("0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m191v2,
-                    new X9ECPoint(c2m191v2,
-                        Hex.Decode("023809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "023809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -389,19 +377,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("155555555555555555555555610C0B196812BFB6288A3EA3", 16);
                 BigInteger h = BigInteger.ValueOf(6);
 
-                ECCurve c2m191v3 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     191,
                     9,
                     new BigInteger("6C01074756099122221056911C77D77E77A777E7E7E77FCB", 16),
                     new BigInteger("71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m191v3,
-                    new X9ECPoint(c2m191v3,
-                        Hex.Decode("03375D4CE24FDE434489DE8746E71786015009E66E38A926DD")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "03375D4CE24FDE434489DE8746E71786015009E66E38A926DD");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -417,19 +403,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D", 16);
                 BigInteger h = BigInteger.ValueOf(0xFE48);
 
-                ECCurve c2m208w1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     208,
                     1, 2, 83,
                     new BigInteger("0", 16),
                     new BigInteger("00C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m208w1,
-                    new X9ECPoint(c2m208w1,
-                        Hex.Decode("0289FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0289FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -445,19 +429,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447", 16);
                 BigInteger h = BigInteger.ValueOf(4);
 
-                ECCurve c2m239v1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     239,
                     36,
                     new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16),
                     new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m239v1,
-                    new X9ECPoint(c2m239v1,
-                        Hex.Decode("0257927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0257927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -473,19 +455,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("1555555555555555555555555555553C6F2885259C31E3FCDF154624522D", 16);
                 BigInteger h = BigInteger.ValueOf(6);
 
-                ECCurve c2m239v2 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     239,
                     36,
                     new BigInteger("4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F", 16),
                     new BigInteger("5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m239v2,
-                    new X9ECPoint(c2m239v2,
-                        Hex.Decode("0228F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0228F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -501,19 +481,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF", 16);
                 BigInteger h = BigInteger.ValueOf(10);
 
-                ECCurve c2m239v3 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     239,
                     36,
                     new BigInteger("01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F", 16),
                     new BigInteger("6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m239v3,
-                    new X9ECPoint(c2m239v3,
-                        Hex.Decode("0370F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0370F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -529,19 +507,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521", 16);
                 BigInteger h = BigInteger.ValueOf(0xFF06);
 
-                ECCurve c2m272w1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     272,
                     1, 3, 56,
                     new BigInteger("0091A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20", 16),
                     new BigInteger("7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m272w1,
-                    new X9ECPoint(c2m272w1,
-                        Hex.Decode("026108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "026108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -557,19 +533,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D", 16);
                 BigInteger h = BigInteger.ValueOf(0xFE2E);
 
-                ECCurve c2m304w1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     304,
                     1, 2, 11,
                     new BigInteger("00FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681", 16),
                     new BigInteger("00BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m304w1,
-                    new X9ECPoint(c2m304w1,
-                        Hex.Decode("02197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "02197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -585,19 +559,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B", 16);
                 BigInteger h = BigInteger.ValueOf(0x4C);
 
-                ECCurve c2m359v1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     359,
                     68,
                     new BigInteger("5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557", 16),
                     new BigInteger("2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m359v1,
-                    new X9ECPoint(c2m359v1,
-                        Hex.Decode("033C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "033C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -613,19 +585,17 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967", 16);
                 BigInteger h = BigInteger.ValueOf(0xFF70);
 
-                ECCurve c2m368w1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     368,
                     1, 2, 85,
                     new BigInteger("00E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D", 16),
                     new BigInteger("00FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m368w1,
-                    new X9ECPoint(c2m368w1,
-                        Hex.Decode("021085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "021085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
@@ -641,22 +611,21 @@ namespace Org.BouncyCastle.Asn1.X9
                 BigInteger n = new BigInteger("0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91", 16);
                 BigInteger h = BigInteger.ValueOf(0x2760);
 
-                ECCurve c2m431r1 = new F2mCurve(
+                ECCurve curve = ConfigureCurve(new F2mCurve(
                     431,
                     120,
                     new BigInteger("1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F", 16),
                     new BigInteger("10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618", 16),
-                    n, h);
-
-                return new X9ECParameters(
-                    c2m431r1,
-                    new X9ECPoint(c2m431r1,
-                        Hex.Decode("02120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7")),
-                    n, h,
-                    null);
+                    n, h));
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "02120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7");
+
+                return new X9ECParameters(curve, G, n, h);
             }
         }
 
+
         private static readonly IDictionary objIds = Platform.CreateHashtable();
         private static readonly IDictionary curves = Platform.CreateHashtable();
         private static readonly IDictionary names = Platform.CreateHashtable();
diff --git a/crypto/src/crypto/ec/CustomNamedCurves.cs b/crypto/src/crypto/ec/CustomNamedCurves.cs
index 1f6b361a2..a9f60dd8c 100644
--- a/crypto/src/crypto/ec/CustomNamedCurves.cs
+++ b/crypto/src/crypto/ec/CustomNamedCurves.cs
@@ -11,6 +11,7 @@ using Org.BouncyCastle.Math.EC.Custom.Djb;
 using Org.BouncyCastle.Math.EC.Custom.GM;
 using Org.BouncyCastle.Math.EC.Custom.Sec;
 using Org.BouncyCastle.Math.EC.Endo;
+using Org.BouncyCastle.Math.EC.Multiplier;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.Utilities.Collections;
 using Org.BouncyCastle.Utilities.Encoders;
@@ -23,9 +24,11 @@ namespace Org.BouncyCastle.Crypto.EC
         {
         }
 
-        private static BigInteger FromHex(string hex)
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, string encoding)
         {
-            return new BigInteger(1, Hex.Decode(hex));
+            X9ECPoint G = new X9ECPoint(curve, Hex.Decode(encoding));
+            WNafUtilities.ConfigureBasepoint(G.Point);
+            return G;
         }
 
         private static ECCurve ConfigureCurve(ECCurve curve)
@@ -38,6 +41,11 @@ namespace Org.BouncyCastle.Crypto.EC
             return c.Configure().SetEndomorphism(new GlvTypeBEndomorphism(c, p)).Create();
         }
 
+        private static BigInteger FromHex(string hex)
+        {
+            return new BigInteger(1, Hex.Decode(hex));
+        }
+
         /*
          * curve25519
          */
@@ -62,9 +70,8 @@ namespace Org.BouncyCastle.Crypto.EC
                  * 
                  * (The other possible y value is 5F51E65E475F794B1FE122D388B72EB36DC2B28192839E4DD6163A5D81312C14) 
                  */
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A"
-                    + "20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "042AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9");
 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
@@ -84,9 +91,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("000E0D4D696E6768756151750CC03A4473D03679");
                 ECCurve curve = ConfigureCurve(new SecP128R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "161FF7528B899B2D0C28607CA52C5B86"
-                    + "CF5AC8395BAFEB13C02DA292DDED7A83"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04161FF7528B899B2D0C28607CA52C5B86CF5AC8395BAFEB13C02DA292DDED7A83"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -118,9 +124,8 @@ namespace Org.BouncyCastle.Crypto.EC
                         new BigInteger("96341f1138933bc2f503fd44", 16),
                         176));
                 ECCurve curve = ConfigureCurveGlv(new SecP160K1Curve(), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
-                    + "938CF935318FDCED6BC28286531733C3F03C4FEE"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "043B4C382CE37AA192A4019E763036F4F5DD4D7EBB938CF935318FDCED6BC28286531733C3F03C4FEE"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -139,9 +144,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("1053CDE42C14D696E67687561517533BF3F83345");
                 ECCurve curve = ConfigureCurve(new SecP160R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "4A96B5688EF573284664698968C38BB913CBFC82"
-                    + "23A628553168947D59DCC912042351377AC5FB32"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "044A96B5688EF573284664698968C38BB913CBFC8223A628553168947D59DCC912042351377AC5FB32"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -160,9 +164,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("B99B99B099B323E02709A4D696E6768756151751");
                 ECCurve curve = ConfigureCurve(new SecP160R2Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "52DCB034293A117E1F4FF11B30F7199D3144CE6D"
-                    + "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0452DCB034293A117E1F4FF11B30F7199D3144CE6DFEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -194,9 +197,8 @@ namespace Org.BouncyCastle.Crypto.EC
                         new BigInteger("b3fb3400dec5c4adceb8655d4c94", 16),
                         208));
                 ECCurve curve = ConfigureCurveGlv(new SecP192K1Curve(), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
-                    + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -215,9 +217,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("3045AE6FC8422F64ED579528D38120EAE12196D5");
                 ECCurve curve = ConfigureCurve(new SecP192R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
-                    + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF101207192B95FFC8DA78631011ED6B24CDD573F977A11E794811"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -249,9 +250,8 @@ namespace Org.BouncyCastle.Crypto.EC
                         new BigInteger("b8adf1378a6eb73409fa6c9c637ba7f5", 16),
                         240));
                 ECCurve curve = ConfigureCurveGlv(new SecP224K1Curve(), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"
-                    + "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -270,9 +270,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5");
                 ECCurve curve = ConfigureCurve(new SecP224R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
-                    + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -304,9 +303,8 @@ namespace Org.BouncyCastle.Crypto.EC
                         new BigInteger("e4437ed6010e88286f547fa90abfe4c42212", 16),
                         272));
                 ECCurve curve = ConfigureCurveGlv(new SecP256K1Curve(), glv);
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"
-                    + "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -325,9 +323,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("C49D360886E704936A6678E1139D26B7819F7E90");
                 ECCurve curve = ConfigureCurve(new SecP256R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
-                    + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -346,9 +343,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("A335926AA319A27A1D00896A6773A4827ACDAC73");
                 ECCurve curve = ConfigureCurve(new SecP384R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"
-                    + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"));
+                    + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -367,9 +364,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("D09E8800291CB85396CC6717393284AAA0DA64BA");
                 ECCurve curve = ConfigureCurve(new SecP521R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"
-                    + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650"));
+                    + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
@@ -388,9 +385,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10E723AB14D696E6768756151756FEBF8FCB49A9");
                 ECCurve curve = ConfigureCurve(new SecT113R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "009D73616F35F4AB1407D73562C10F"
-                    + "00A52830277958EE84D1315ED31886"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04009D73616F35F4AB1407D73562C10F00A52830277958EE84D1315ED31886"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -409,9 +405,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10C0FB15760860DEF1EEF4D696E676875615175D");
                 ECCurve curve = ConfigureCurve(new SecT113R2Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "01A57A6A7B26CA5EF52FCDB8164797"
-                    + "00B3ADC94ED1FE674C06E695BABA1D"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0401A57A6A7B26CA5EF52FCDB816479700B3ADC94ED1FE674C06E695BABA1D"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -430,9 +425,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("4D696E676875615175985BD3ADBADA21B43A97E2");
                 ECCurve curve = ConfigureCurve(new SecT131R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0081BAF91FDF9833C40F9C181343638399"
-                    + "078C6E7EA38C001F73C8134B1B4EF9E150"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040081BAF91FDF9833C40F9C181343638399078C6E7EA38C001F73C8134B1B4EF9E150"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -451,9 +445,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("985BD3ADBAD4D696E676875615175A21B43A97E3");
                 ECCurve curve = ConfigureCurve(new SecT131R2Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0356DCD8F2F95031AD652D23951BB366A8"
-                    + "0648F06D867940A5366D9E265DE9EB240F"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040356DCD8F2F95031AD652D23951BB366A80648F06D867940A5366D9E265DE9EB240F"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -472,9 +465,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT163K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"
-                    + "0289070FB05D38FF58321F2E800536D538CCDAA3D9"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0402FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE80289070FB05D38FF58321F2E800536D538CCDAA3D9"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -493,9 +485,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("24B7B137C8A14D696E6768756151756FD0DA2E5C");
                 ECCurve curve = ConfigureCurve(new SecT163R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "0369979697AB43897789566789567F787A7876A654"
-                    + "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "040369979697AB43897789566789567F787A7876A65400435EDB42EFAFB2989D51FEFCE3C80988F41FF883"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -514,9 +505,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("85E25BFE5C86226CDB12016F7553F9D0E693A268");
                 ECCurve curve = ConfigureCurve(new SecT163R2Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "03F0EBA16286A2D57EA0991168D4994637E8343E36"
-                    + "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0403F0EBA16286A2D57EA0991168D4994637E8343E3600D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -535,9 +525,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("103FAEC74D696E676875615175777FC5B191EF30");
                 ECCurve curve = ConfigureCurve(new SecT193R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1"
-                    + "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0401F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E10025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -556,9 +545,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10B7B4D696E676875615175137C8A16FD0DA2211");
                 ECCurve curve = ConfigureCurve(new SecT193R2Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F"
-                    + "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0400D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -577,9 +565,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT233K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"
-                    + "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "04017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD612601DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -598,9 +585,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("74D59FF07F6B413D0EA14B344B20A2DB049B50C3");
                 ECCurve curve = ConfigureCurve(new SecT233R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"
-                    + "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0400FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -619,9 +605,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT239K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"
-                    + "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0429A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -640,9 +625,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT283K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"
-                    + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259"));
+                    + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -661,9 +646,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE");
                 ECCurve curve = ConfigureCurve(new SecT283R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"
-                    + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4"));
+                    + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -682,9 +667,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT409K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"
-                    + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B"));
+                    + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -703,9 +688,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("4099B5A457F9D69F79213D094C4BCD4D4262210B");
                 ECCurve curve = ConfigureCurve(new SecT409R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"
-                    + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706"));
+                    + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -724,9 +709,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT571K1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"
-                    + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3"));
+                    + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -745,9 +730,9 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("2AA058F73A0E33AB486B0F610410C53A7F132310");
                 ECCurve curve = ConfigureCurve(new SecT571R1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
+                X9ECPoint G = ConfigureBasepoint(curve, "04"
                     + "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"
-                    + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B"));
+                    + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B");
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         };
@@ -766,9 +751,8 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SM2P256V1Curve());
-                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
-                    + "32C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7"
-                    + "BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0"));
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    "0432C4AE2C1F1981195F9904466A39C9948FE30BBFF2660BE1715A4589334C74C7BC3736A2F4F6779C59BDCEE36B692153D0A9877CC62A474002DF32E52139F0A0"); 
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
             }
         }
diff --git a/crypto/src/math/ec/ECAlgorithms.cs b/crypto/src/math/ec/ECAlgorithms.cs
index b05c0201a..14658ac81 100644
--- a/crypto/src/math/ec/ECAlgorithms.cs
+++ b/crypto/src/math/ec/ECAlgorithms.cs
@@ -268,11 +268,14 @@ namespace Org.BouncyCastle.Math.EC
             k = k.Abs();
             l = l.Abs();
 
-            int widthP = System.Math.Max(2, System.Math.Min(16, WNafUtilities.GetWindowSize(k.BitLength)));
-            int widthQ = System.Math.Max(2, System.Math.Min(16, WNafUtilities.GetWindowSize(l.BitLength)));
+            int minWidthP = WNafUtilities.GetWindowSize(k.BitLength, 8);
+            int minWidthQ = WNafUtilities.GetWindowSize(l.BitLength, 8);
 
-            WNafPreCompInfo infoP = WNafUtilities.Precompute(P, widthP, true);
-            WNafPreCompInfo infoQ = WNafUtilities.Precompute(Q, widthQ, true);
+            WNafPreCompInfo infoP = WNafUtilities.Precompute(P, minWidthP, true);
+            WNafPreCompInfo infoQ = WNafUtilities.Precompute(Q, minWidthQ, true);
+
+            int widthP = System.Math.Min(8, infoP.Width);
+            int widthQ = System.Math.Min(8, infoQ.Width);
 
             ECPoint[] preCompP = negK ? infoP.PreCompNeg : infoP.PreComp;
             ECPoint[] preCompQ = negL ? infoQ.PreCompNeg : infoQ.PreComp;
@@ -292,19 +295,22 @@ namespace Org.BouncyCastle.Math.EC
             k = k.Abs();
             l = l.Abs();
 
-            int width = System.Math.Max(2, System.Math.Min(16, WNafUtilities.GetWindowSize(System.Math.Max(k.BitLength, l.BitLength))));
+            int minWidth = WNafUtilities.GetWindowSize(System.Math.Max(k.BitLength, l.BitLength), 8);
 
-            ECPoint Q = WNafUtilities.MapPointWithPrecomp(P, width, true, pointMapQ);
+            ECPoint Q = WNafUtilities.MapPointWithPrecomp(P, minWidth, true, pointMapQ); 
             WNafPreCompInfo infoP = WNafUtilities.GetWNafPreCompInfo(P);
             WNafPreCompInfo infoQ = WNafUtilities.GetWNafPreCompInfo(Q);
 
+            int widthP = System.Math.Min(8, infoP.Width);
+            int widthQ = System.Math.Min(8, infoQ.Width);
+
             ECPoint[] preCompP = negK ? infoP.PreCompNeg : infoP.PreComp;
             ECPoint[] preCompQ = negL ? infoQ.PreCompNeg : infoQ.PreComp;
             ECPoint[] preCompNegP = negK ? infoP.PreComp : infoP.PreCompNeg;
             ECPoint[] preCompNegQ = negL ? infoQ.PreComp : infoQ.PreCompNeg;
 
-            byte[] wnafP = WNafUtilities.GenerateWindowNaf(width, k);
-            byte[] wnafQ = WNafUtilities.GenerateWindowNaf(width, l);
+            byte[] wnafP = WNafUtilities.GenerateWindowNaf(widthP, k);
+            byte[] wnafQ = WNafUtilities.GenerateWindowNaf(widthQ, l);
 
             return ImplShamirsTrickWNaf(preCompP, preCompNegP, wnafP, preCompQ, preCompNegQ, wnafQ);
         }
@@ -373,8 +379,12 @@ namespace Org.BouncyCastle.Math.EC
             {
                 BigInteger ki = ks[i]; negs[i] = ki.SignValue < 0; ki = ki.Abs();
 
-                int width = System.Math.Max(2, System.Math.Min(16, WNafUtilities.GetWindowSize(ki.BitLength)));
-                infos[i] = WNafUtilities.Precompute(ps[i], width, true);
+                int minWidth = WNafUtilities.GetWindowSize(ki.BitLength, 8);
+                WNafPreCompInfo info = WNafUtilities.Precompute(ps[i], minWidth, true);
+
+                int width = System.Math.Min(8, info.Width);
+
+                infos[i] = info; 
                 wnafs[i] = WNafUtilities.GenerateWindowNaf(width, ki);
             }
 
@@ -427,13 +437,19 @@ namespace Org.BouncyCastle.Math.EC
                 BigInteger kj0 = ks[j0]; negs[j0] = kj0.SignValue < 0; kj0 = kj0.Abs();
                 BigInteger kj1 = ks[j1]; negs[j1] = kj1.SignValue < 0; kj1 = kj1.Abs();
 
-                int width = System.Math.Max(2, System.Math.Min(16, WNafUtilities.GetWindowSize(System.Math.Max(kj0.BitLength, kj1.BitLength))));
+                int minWidth = WNafUtilities.GetWindowSize(System.Math.Max(kj0.BitLength, kj1.BitLength), 8);
+                ECPoint P = ps[i], Q = WNafUtilities.MapPointWithPrecomp(P, minWidth, true, pointMap);
+
+                WNafPreCompInfo infoP = WNafUtilities.GetWNafPreCompInfo(P);
+                WNafPreCompInfo infoQ = WNafUtilities.GetWNafPreCompInfo(Q);
+
+                int widthP = System.Math.Min(8, infoP.Width);
+                int widthQ = System.Math.Min(8, infoQ.Width);
 
-                ECPoint P = ps[i], Q = WNafUtilities.MapPointWithPrecomp(P, width, true, pointMap);
-                infos[j0] = WNafUtilities.GetWNafPreCompInfo(P);
-                infos[j1] = WNafUtilities.GetWNafPreCompInfo(Q);
-                wnafs[j0] = WNafUtilities.GenerateWindowNaf(width, kj0);
-                wnafs[j1] = WNafUtilities.GenerateWindowNaf(width, kj1);
+                infos[j0] = infoP;
+                infos[j1] = infoQ;
+                wnafs[j0] = WNafUtilities.GenerateWindowNaf(widthP, kj0);
+                wnafs[j1] = WNafUtilities.GenerateWindowNaf(widthQ, kj1);
             }
 
             return ImplSumOfMultiplies(negs, infos, wnafs);
diff --git a/crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs b/crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs
index f671f6a5c..833bbb5ea 100644
--- a/crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs
+++ b/crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs
@@ -1,5 +1,7 @@
 using System;
 
+using Org.BouncyCastle.Utilities;
+
 namespace Org.BouncyCastle.Math.EC.Multiplier
 {
     /**
@@ -18,12 +20,12 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
          */
         protected override ECPoint MultiplyPositive(ECPoint p, BigInteger k)
         {
-            // Clamp the window width in the range [2, 16]
-            int width = System.Math.Max(2, System.Math.Min(16, GetWindowSize(k.BitLength)));
+            int minWidth = WNafUtilities.GetWindowSize(k.BitLength);
 
-            WNafPreCompInfo wnafPreCompInfo = WNafUtilities.Precompute(p, width, true);
-            ECPoint[] preComp = wnafPreCompInfo.PreComp;
-            ECPoint[] preCompNeg = wnafPreCompInfo.PreCompNeg;
+            WNafPreCompInfo info = WNafUtilities.Precompute(p, minWidth, true);
+            ECPoint[] preComp = info.PreComp;
+            ECPoint[] preCompNeg = info.PreCompNeg;
+            int width = info.Width;
 
             int[] wnaf = WNafUtilities.GenerateCompactWindowNaf(width, k);
 
@@ -46,7 +48,7 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
                 // Optimization can only be used for values in the lower half of the table
                 if ((n << 2) < (1 << width))
                 {
-                    int highest = LongArray.BitLengths[n];
+                    int highest = 32 - Integers.NumberOfLeadingZeros(n);
 
                     // TODO Get addition/doubling cost ratio from curve and compare to 'scale' to see if worth substituting?
                     int scale = width - highest;
@@ -83,16 +85,5 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
 
             return R;
         }
-
-        /**
-         * Determine window width to use for a scalar multiplication of the given size.
-         * 
-         * @param bits the bit-length of the scalar to multiply by
-         * @return the window size to use
-         */
-        protected virtual int GetWindowSize(int bits)
-        {
-            return WNafUtilities.GetWindowSize(bits);
-        }
     }
 }
diff --git a/crypto/src/math/ec/multiplier/WNafPreCompInfo.cs b/crypto/src/math/ec/multiplier/WNafPreCompInfo.cs
index 7e0a73154..fb3cb57cd 100644
--- a/crypto/src/math/ec/multiplier/WNafPreCompInfo.cs
+++ b/crypto/src/math/ec/multiplier/WNafPreCompInfo.cs
@@ -7,6 +7,8 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
     public class WNafPreCompInfo
         : PreCompInfo 
     {
+        protected int m_confWidth = -1;
+
         /**
          * Array holding the precomputed <code>ECPoint</code>s used for a Window
          * NAF multiplication.
@@ -25,6 +27,14 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
          */
         protected ECPoint m_twice = null;
 
+        protected int m_width = -1;
+
+        public virtual int ConfWidth
+        {
+            get { return m_confWidth; }
+            set { this.m_confWidth = value; }
+        }
+
         public virtual ECPoint[] PreComp
         {
             get { return m_preComp; }
@@ -42,5 +52,11 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
             get { return m_twice; }
             set { this.m_twice = value; }
         }
+
+        public virtual int Width
+        {
+            get { return m_width; }
+            set { this.m_width = value; }
+        }
     }
 }
diff --git a/crypto/src/math/ec/multiplier/WNafUtilities.cs b/crypto/src/math/ec/multiplier/WNafUtilities.cs
index 24646deb2..01599d777 100644
--- a/crypto/src/math/ec/multiplier/WNafUtilities.cs
+++ b/crypto/src/math/ec/multiplier/WNafUtilities.cs
@@ -9,9 +9,23 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
         public static readonly string PRECOMP_NAME = "bc_wnaf";
 
         private static readonly int[] DEFAULT_WINDOW_SIZE_CUTOFFS = new int[]{ 13, 41, 121, 337, 897, 2305 };
+        private static readonly int MAX_WIDTH = 16;
 
         private static readonly ECPoint[] EMPTY_POINTS = new ECPoint[0];
 
+        public static void ConfigureBasepoint(ECPoint p)
+        {
+            ECCurve c = p.Curve;
+            if (null == c)
+                return;
+
+            BigInteger n = c.Order;
+            int bits = (null == n) ? c.FieldSize + 1 : n.BitLength;
+            int confWidth = System.Math.Min(MAX_WIDTH, GetWindowSize(bits) + 3);
+
+            c.Precompute(p, PRECOMP_NAME, new ConfigureBasepointCallback(c, confWidth));
+        }
+
         public static int[] GenerateCompactNaf(BigInteger k)
         {
             if ((k.BitLength >> 16) != 0)
@@ -298,7 +312,19 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
          */
         public static int GetWindowSize(int bits)
         {
-            return GetWindowSize(bits, DEFAULT_WINDOW_SIZE_CUTOFFS);
+            return GetWindowSize(bits, DEFAULT_WINDOW_SIZE_CUTOFFS, MAX_WIDTH);
+        }
+
+        /**
+         * Determine window width to use for a scalar multiplication of the given size.
+         * 
+         * @param bits the bit-length of the scalar to multiply by
+         * @param maxWidth the maximum window width to return 
+         * @return the window size to use
+         */
+        public static int GetWindowSize(int bits, int maxWidth)
+        {
+            return GetWindowSize(bits, DEFAULT_WINDOW_SIZE_CUTOFFS, maxWidth);
         }
 
         /**
@@ -310,6 +336,19 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
          */
         public static int GetWindowSize(int bits, int[] windowSizeCutoffs)
         {
+            return GetWindowSize(bits, windowSizeCutoffs, MAX_WIDTH);
+        }
+
+        /**
+         * Determine window width to use for a scalar multiplication of the given size.
+         * 
+         * @param bits the bit-length of the scalar to multiply by
+         * @param windowSizeCutoffs a monotonically increasing list of bit sizes at which to increment the window width
+         * @param maxWidth the maximum window width to return 
+         * @return the window size to use
+         */
+        public static int GetWindowSize(int bits, int[] windowSizeCutoffs, int maxWidth)
+        {
             int w = 0;
             for (; w < windowSizeCutoffs.Length; ++w)
             {
@@ -318,23 +357,24 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
                     break;
                 }
             }
-            return w + 2;
+
+            return System.Math.Max(2, System.Math.Min(maxWidth, w + 2));
         }
 
-        public static ECPoint MapPointWithPrecomp(ECPoint p, int width, bool includeNegated,
+        public static ECPoint MapPointWithPrecomp(ECPoint p, int minWidth, bool includeNegated,
             ECPointMap pointMap)
         {
             ECCurve c = p.Curve;
-            WNafPreCompInfo wnafPreCompP = Precompute(p, width, includeNegated);
+            WNafPreCompInfo infoP = Precompute(p, minWidth, includeNegated);
 
             ECPoint q = pointMap.Map(p);
-            c.Precompute(q, PRECOMP_NAME, new MapPointCallback(wnafPreCompP, includeNegated, pointMap));
+            c.Precompute(q, PRECOMP_NAME, new MapPointCallback(infoP, includeNegated, pointMap));
             return q;
         }
 
-        public static WNafPreCompInfo Precompute(ECPoint p, int width, bool includeNegated)
+        public static WNafPreCompInfo Precompute(ECPoint p, int minWidth, bool includeNegated)
         {
-            return (WNafPreCompInfo)p.Curve.Precompute(p, PRECOMP_NAME, new WNafCallback(p, width, includeNegated));
+            return (WNafPreCompInfo)p.Curve.Precompute(p, PRECOMP_NAME, new WNafCallback(p, minWidth, includeNegated));
         }
 
         private static byte[] Trim(byte[] a, int length)
@@ -358,16 +398,53 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
             return result;
         }
 
+        private class ConfigureBasepointCallback
+            : IPreCompCallback
+        {
+            private readonly ECCurve m_curve;
+            private readonly int m_confWidth;
+
+            internal ConfigureBasepointCallback(ECCurve curve, int confWidth)
+            {
+                this.m_curve = curve;
+                this.m_confWidth = confWidth;
+            }
+
+            public PreCompInfo Precompute(PreCompInfo existing)
+            {
+                WNafPreCompInfo existingWNaf = existing as WNafPreCompInfo;
+
+                if (null != existingWNaf && existingWNaf.ConfWidth == m_confWidth)
+                {
+                    return existingWNaf;
+                }
+
+                WNafPreCompInfo result = new WNafPreCompInfo();
+
+                result.ConfWidth = m_confWidth;
+
+                if (null != existingWNaf)
+                {
+                    result.PreComp = existingWNaf.PreComp;
+                    result.PreCompNeg = existingWNaf.PreCompNeg;
+                    result.Twice = existingWNaf.Twice;
+                    result.Width = existingWNaf.Width;
+                }
+
+                return result;
+            }
+        }
+
         private class MapPointCallback
             : IPreCompCallback
         {
-            private readonly WNafPreCompInfo m_wnafPreCompP;
+            private readonly WNafPreCompInfo m_infoP;
             private readonly bool m_includeNegated;
             private readonly ECPointMap m_pointMap;
 
-            internal MapPointCallback(WNafPreCompInfo wnafPreCompP, bool includeNegated, ECPointMap pointMap)
+            internal MapPointCallback(WNafPreCompInfo infoP, bool includeNegated, ECPointMap pointMap)
             {
-                this.m_wnafPreCompP = wnafPreCompP;
+                this.m_infoP = infoP;
                 this.m_includeNegated = includeNegated;
                 this.m_pointMap = pointMap;
             }
@@ -376,20 +453,23 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
             {
                 WNafPreCompInfo result = new WNafPreCompInfo();
 
-                ECPoint twiceP = m_wnafPreCompP.Twice;
-                if (twiceP != null)
+                result.ConfWidth = m_infoP.ConfWidth;
+
+                ECPoint twiceP = m_infoP.Twice;
+                if (null != twiceP)
                 {
                     ECPoint twiceQ = m_pointMap.Map(twiceP);
                     result.Twice = twiceQ;
                 }
 
-                ECPoint[] preCompP = m_wnafPreCompP.PreComp;
+                ECPoint[] preCompP = m_infoP.PreComp;
                 ECPoint[] preCompQ = new ECPoint[preCompP.Length];
                 for (int i = 0; i < preCompP.Length; ++i)
                 {
                     preCompQ[i] = m_pointMap.Map(preCompP[i]);
                 }
                 result.PreComp = preCompQ;
+                result.Width = m_infoP.Width;
 
                 if (m_includeNegated)
                 {
@@ -409,13 +489,13 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
             : IPreCompCallback
         {
             private readonly ECPoint m_p;
-            private readonly int m_width;
+            private readonly int m_minWidth;
             private readonly bool m_includeNegated;
 
-            internal WNafCallback(ECPoint p, int width, bool includeNegated)
+            internal WNafCallback(ECPoint p, int minWidth, bool includeNegated)
             {
                 this.m_p = p;
-                this.m_width = width;
+                this.m_minWidth = minWidth;
                 this.m_includeNegated = includeNegated;
             }
 
@@ -423,24 +503,33 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
             {
                 WNafPreCompInfo existingWNaf = existing as WNafPreCompInfo;
 
-                int reqPreCompLen = 1 << System.Math.Max(0, m_width - 2);
+                int width = System.Math.Max(2, System.Math.Min(MAX_WIDTH, m_minWidth));
+                int reqPreCompLen = 1 << (width - 2);
 
-                if (CheckExisting(existingWNaf, reqPreCompLen, m_includeNegated))
+                if (CheckExisting(existingWNaf, width, reqPreCompLen, m_includeNegated))
                     return existingWNaf;
 
+                WNafPreCompInfo result = new WNafPreCompInfo();
+
                 ECCurve c = m_p.Curve;
                 ECPoint[] preComp = null, preCompNeg = null;
                 ECPoint twiceP = null;
 
-                if (existingWNaf != null)
+                if (null != existingWNaf)
                 {
+                    int confWidth = existingWNaf.ConfWidth;
+                    result.ConfWidth = confWidth;
+
                     preComp = existingWNaf.PreComp;
                     preCompNeg = existingWNaf.PreCompNeg;
                     twiceP = existingWNaf.Twice;
                 }
 
+                width = System.Math.Min(MAX_WIDTH, System.Math.Max(result.ConfWidth, width));
+                reqPreCompLen = 1 << (width - 2);
+
                 int iniPreCompLen = 0;
-                if (preComp == null)
+                if (null == preComp)
                 {
                     preComp = EMPTY_POINTS;
                 }
@@ -475,7 +564,7 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
                         else
                         {
                             ECPoint isoTwiceP = twiceP, last = preComp[curPreCompLen - 1];
-                            if (isoTwiceP == null)
+                            if (null == isoTwiceP)
                             {
                                 isoTwiceP = preComp[0].Twice();
                                 twiceP = isoTwiceP;
@@ -535,7 +624,7 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
                 if (m_includeNegated)
                 {
                     int pos;
-                    if (preCompNeg == null)
+                    if (null == preCompNeg)
                     {
                         pos = 0;
                         preCompNeg = new ECPoint[reqPreCompLen]; 
@@ -556,23 +645,24 @@ namespace Org.BouncyCastle.Math.EC.Multiplier
                     }
                 }
 
-                WNafPreCompInfo result = new WNafPreCompInfo();
                 result.PreComp = preComp;
                 result.PreCompNeg = preCompNeg;
                 result.Twice = twiceP;
+                result.Width = width;
                 return result;
             }
 
-            private bool CheckExisting(WNafPreCompInfo existingWNaf, int reqPreCompLen, bool includeNegated)
+            private bool CheckExisting(WNafPreCompInfo existingWNaf, int width, int reqPreCompLen, bool includeNegated)
             {
-                return existingWNaf != null
+                return null != existingWNaf
+                    && existingWNaf.Width >= System.Math.Max(existingWNaf.ConfWidth, width) 
                     && CheckTable(existingWNaf.PreComp, reqPreCompLen)
                     && (!includeNegated || CheckTable(existingWNaf.PreCompNeg, reqPreCompLen));
             }
 
             private bool CheckTable(ECPoint[] table, int reqLen)
             {
-                return table != null && table.Length >= reqLen;
+                return null != table && table.Length >= reqLen;
             }
         }
     }
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-09 17:04:21 +0000