Port latest X9 EC stuff from Java API

8 files changed, 224 insertions, 214 deletions

diff --git a/crypto/src/asn1/anssi/ANSSINamedCurves.cs b/crypto/src/asn1/anssi/ANSSINamedCurves.cs
index 04e30bb07..c7f9545f2 100644
--- a/crypto/src/asn1/anssi/ANSSINamedCurves.cs
+++ b/crypto/src/asn1/anssi/ANSSINamedCurves.cs
@@ -42,7 +42,7 @@ namespace Org.BouncyCastle.Asn1.Anssi
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "B6B3D4C356C139EB31183D4749D423958C27D2DCAF98B70164C97A2DD98F5CFF"
                     + "6142E0F7C8B204911F9271F0F3ECEF8C2701C307E8E4C9E183115A1554062CFB"));
 
diff --git a/crypto/src/asn1/sec/SECNamedCurves.cs b/crypto/src/asn1/sec/SECNamedCurves.cs
index 0bd60b0b8..ca71a4e66 100644
--- a/crypto/src/asn1/sec/SECNamedCurves.cs
+++ b/crypto/src/asn1/sec/SECNamedCurves.cs
@@ -54,9 +54,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "09487239995A5EE76B55F9C2F098"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "09487239995A5EE76B55F9C2F098"
                     + "A89CE5AF8724C0A23E0E0FF77500"));
 
@@ -85,9 +83,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "4BA30AB5E892B4E1649DD0928643"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "4BA30AB5E892B4E1649DD0928643"
                     + "ADCD46F5882E3747DEF36E956E97"));
 
@@ -116,9 +112,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "161FF7528B899B2D0C28607CA52C5B86"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "161FF7528B899B2D0C28607CA52C5B86"
                     + "CF5AC8395BAFEB13C02DA292DDED7A83"));
 
@@ -147,9 +141,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "7B6AA5D85E572983E6FB32A7CDEBC140"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "7B6AA5D85E572983E6FB32A7CDEBC140"
                     + "27B6916A894D3AEE7106FE805FC34B44"));
 
@@ -191,9 +183,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                     176);
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                    //+ "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
                     + "938CF935318FDCED6BC28286531733C3F03C4FEE"));
 
@@ -222,9 +212,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                    //+ "4A96B5688EF573284664698968C38BB913CBFC82"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "4A96B5688EF573284664698968C38BB913CBFC82"
                     + "23A628553168947D59DCC912042351377AC5FB32"));
 
@@ -253,9 +241,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "52DCB034293A117E1F4FF11B30F7199D3144CE6D"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "52DCB034293A117E1F4FF11B30F7199D3144CE6D"
                     + "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E"));
 
@@ -297,9 +283,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                     208);
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
                     + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"));
 
@@ -328,9 +312,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
                     + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"));
 
@@ -372,9 +354,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                     240);
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"
                     + "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"));
 
@@ -403,9 +383,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
                     + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"));
 
@@ -447,9 +425,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                     272);
 
                 ECCurve curve = ConfigureCurveGlv(new FpCurve(p, a, b, n, h), glv);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"
                     + "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"));
 
@@ -478,9 +454,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
                     + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"));
 
@@ -509,9 +483,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"
                     + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"));
 
@@ -540,9 +512,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.One;
 
                 ECCurve curve = ConfigureCurve(new FpCurve(p, a, b, n, h));
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"
                     + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650"));
 
@@ -572,9 +542,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "009D73616F35F4AB1407D73562C10F"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "009D73616F35F4AB1407D73562C10F"
                     + "00A52830277958EE84D1315ED31886"));
 
@@ -604,9 +572,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "01A57A6A7B26CA5EF52FCDB8164797"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "01A57A6A7B26CA5EF52FCDB8164797"
                     + "00B3ADC94ED1FE674C06E695BABA1D"));
 
@@ -638,9 +604,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "0081BAF91FDF9833C40F9C181343638399"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0081BAF91FDF9833C40F9C181343638399"
                     + "078C6E7EA38C001F73C8134B1B4EF9E150"));
 
@@ -672,9 +636,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "0356DCD8F2F95031AD652D23951BB366A8"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0356DCD8F2F95031AD652D23951BB366A8"
                     + "0648F06D867940A5366D9E265DE9EB240F"));
 
@@ -706,9 +668,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"
                     + "0289070FB05D38FF58321F2E800536D538CCDAA3D9"));
 
@@ -740,9 +700,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "0369979697AB43897789566789567F787A7876A654"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0369979697AB43897789566789567F787A7876A654"
                     + "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883"));
 
@@ -774,9 +732,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "03F0EBA16286A2D57EA0991168D4994637E8343E36"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "03F0EBA16286A2D57EA0991168D4994637E8343E36"
                     + "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"));
 
@@ -806,9 +762,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1"
                     + "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05"));
 
@@ -838,9 +792,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F"
                     + "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C"));
 
@@ -870,9 +822,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"
                     + "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"));
 
@@ -902,9 +852,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"
                     + "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"));
 
@@ -934,9 +882,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"
                     + "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"));
 
@@ -968,9 +914,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"
                     + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259"));
 
@@ -1002,9 +946,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"
                     + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4"));
 
@@ -1034,9 +976,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"
                     + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B"));
 
@@ -1066,9 +1006,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"
                     + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706"));
 
@@ -1100,9 +1038,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(4);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("02"
-                //+ "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"
                     + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3"));
 
@@ -1134,9 +1070,7 @@ namespace Org.BouncyCastle.Asn1.Sec
                 BigInteger h = BigInteger.ValueOf(2);
 
                 ECCurve curve = new F2mCurve(m, k1, k2, k3, a, b, n, h);
-                //ECPoint G = curve.DecodePoint(Hex.Decode("03"
-                //+ "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"));
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"
                     + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B"));
 
diff --git a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
index f476619a7..ba3eda620 100644
--- a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
+++ b/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs
@@ -40,7 +40,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321")), // G
+                    new X9ECPoint(curve, Hex.Decode("04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321")), // G
                     n, h);
             }
         }
@@ -66,7 +66,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD")), // G
+                    new X9ECPoint(curve, Hex.Decode("04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD")), // G
                     n, h);
             }
         }
@@ -91,7 +91,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F")), // G
+                    new X9ECPoint(curve, Hex.Decode("04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F")), // G
                     n, h);
             }
         }
@@ -117,7 +117,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9")), // G'
+                    new X9ECPoint(curve, Hex.Decode("043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9")), // G'
                     n, h);
             }
         }
@@ -142,7 +142,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD")), // G
+                    new X9ECPoint(curve, Hex.Decode("040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD")), // G
                     n, h);
             }
         }
@@ -168,7 +168,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C")), // G'
+                    new X9ECPoint(curve, Hex.Decode("046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C")), // G'
                     n, h);
             }
         }
@@ -193,7 +193,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997")), // G
+                    new X9ECPoint(curve, Hex.Decode("048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997")), // G
                     n, h);
             }
         }
@@ -219,7 +219,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE")), // G'
+                    new X9ECPoint(curve, Hex.Decode("04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE")), // G'
                     n, h);
             }
         }
@@ -244,7 +244,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1")), // G
+                    new X9ECPoint(curve, Hex.Decode("0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1")), // G
                     n, h);
             }
         }
@@ -270,7 +270,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3")), // G'
+                    new X9ECPoint(curve, Hex.Decode("04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3")), // G'
                     n, h);
             }
         }
@@ -295,7 +295,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315")), // G
+                    new X9ECPoint(curve, Hex.Decode("041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315")), // G
                     n, h);
             }
         }
@@ -321,7 +321,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928")), // G'
+                    new X9ECPoint(curve, Hex.Decode("0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928")), // G'
                     n, h);
             }
         }
@@ -346,7 +346,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892")), // G
+                    new X9ECPoint(curve, Hex.Decode("0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892")), // G
                     n, h);
             }
         }
@@ -372,7 +372,7 @@ namespace Org.BouncyCastle.Asn1.TeleTrust
 
                 return new X9ECParameters(
                     curve,
-                    curve.DecodePoint(Hex.Decode("04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332")), // G'
+                    new X9ECPoint(curve, Hex.Decode("04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332")), // G'
                     n, h);
             }
         }
diff --git a/crypto/src/asn1/x9/X962NamedCurves.cs b/crypto/src/asn1/x9/X962NamedCurves.cs
index a9ea0240c..6fa4e7c4b 100644
--- a/crypto/src/asn1/x9/X962NamedCurves.cs
+++ b/crypto/src/asn1/x9/X962NamedCurves.cs
@@ -38,7 +38,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp192v1,
-                    cFp192v1.DecodePoint(
+                    new X9ECPoint(cFp192v1,
                         Hex.Decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")),
                     n, h,
                     Hex.Decode("3045AE6FC8422f64ED579528D38120EAE12196D5"));
@@ -65,7 +65,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp192v2,
-                    cFp192v2.DecodePoint(
+                    new X9ECPoint(cFp192v2,
                         Hex.Decode("03eea2bae7e1497842f2de7769cfe9c989c072ad696f48034a")),
                     n, h,
                     Hex.Decode("31a92ee2029fd10d901b113e990710f0d21ac6b6"));
@@ -92,7 +92,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp192v3,
-                    cFp192v3.DecodePoint(
+                    new X9ECPoint(cFp192v3,
                         Hex.Decode("027d29778100c65a1da1783716588dce2b8b4aee8e228f1896")),
                     n, h,
                     Hex.Decode("c469684435deb378c4b65ca9591e2a5763059a2e"));
@@ -119,7 +119,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp239v1,
-                    cFp239v1.DecodePoint(
+                    new X9ECPoint(cFp239v1,
                         Hex.Decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")),
                     n, h,
                     Hex.Decode("e43bb460f0b80cc0c0b075798e948060f8321b7d"));
@@ -146,7 +146,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp239v2,
-                    cFp239v2.DecodePoint(
+                    new X9ECPoint(cFp239v2,
                         Hex.Decode("0238af09d98727705120c921bb5e9e26296a3cdcf2f35757a0eafd87b830e7")),
                     n, h,
                     Hex.Decode("e8b4011604095303ca3b8099982be09fcb9ae616"));
@@ -173,7 +173,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp239v3,
-                    cFp239v3.DecodePoint(
+                    new X9ECPoint(cFp239v3,
                         Hex.Decode("036768ae8e18bb92cfcf005c949aa2c6d94853d0e660bbf854b1c9505fe95a")),
                     n, h,
                     Hex.Decode("7d7374168ffe3471b60a857686a19475d3bfa2ff"));
@@ -200,7 +200,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     cFp256v1,
-                    cFp256v1.DecodePoint(
+                    new X9ECPoint(cFp256v1,
                         Hex.Decode("036b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296")),
                     n, h,
                     Hex.Decode("c49d360886e704936a6678e1139d26b7819f7e90"));
@@ -231,7 +231,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m163v1,
-                    c2m163v1.DecodePoint(
+                    new X9ECPoint(c2m163v1,
                         Hex.Decode("0307AF69989546103D79329FCC3D74880F33BBE803CB")),
                     n, h,
                     Hex.Decode("D2C0FB15760860DEF1EEF4D696E6768756151754"));
@@ -259,7 +259,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m163v2,
-                    c2m163v2.DecodePoint(
+                    new X9ECPoint(c2m163v2,
                         Hex.Decode("030024266E4EB5106D0A964D92C4860E2671DB9B6CC5")),
                     n, h,
                     null);
@@ -287,7 +287,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m163v3,
-                    c2m163v3.DecodePoint(Hex.Decode("0202F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB")),
+                    new X9ECPoint(c2m163v3, Hex.Decode("0202F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB")),
                     n, h,
                     null);
             }
@@ -314,7 +314,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m176w1,
-                    c2m176w1.DecodePoint(
+                    new X9ECPoint(c2m176w1,
                         Hex.Decode("038D16C2866798B600F9F08BB4A8E860F3298CE04A5798")),
                     n, h,
                     null);
@@ -342,7 +342,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m191v1,
-                    c2m191v1.DecodePoint(
+                    new X9ECPoint(c2m191v1,
                         Hex.Decode("0236B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D")),
                     n, h,
                     Hex.Decode("4E13CA542744D696E67687561517552F279A8C84"));
@@ -370,7 +370,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m191v2,
-                    c2m191v2.DecodePoint(
+                    new X9ECPoint(c2m191v2,
                         Hex.Decode("023809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10")),
                     n, h,
                     null);
@@ -398,7 +398,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m191v3,
-                    c2m191v3.DecodePoint(
+                    new X9ECPoint(c2m191v3,
                         Hex.Decode("03375D4CE24FDE434489DE8746E71786015009E66E38A926DD")),
                     n, h,
                     null);
@@ -426,7 +426,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m208w1,
-                    c2m208w1.DecodePoint(
+                    new X9ECPoint(c2m208w1,
                         Hex.Decode("0289FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A")),
                     n, h,
                     null);
@@ -454,7 +454,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m239v1,
-                    c2m239v1.DecodePoint(
+                    new X9ECPoint(c2m239v1,
                         Hex.Decode("0257927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D")),
                     n, h,
                     null);
@@ -482,7 +482,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m239v2,
-                    c2m239v2.DecodePoint(
+                    new X9ECPoint(c2m239v2,
                         Hex.Decode("0228F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205")),
                     n, h,
                     null);
@@ -510,7 +510,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m239v3,
-                    c2m239v3.DecodePoint(
+                    new X9ECPoint(c2m239v3,
                         Hex.Decode("0370F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92")),
                     n, h,
                     null);
@@ -538,7 +538,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m272w1,
-                    c2m272w1.DecodePoint(
+                    new X9ECPoint(c2m272w1,
                         Hex.Decode("026108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D")),
                     n, h,
                     null);
@@ -566,7 +566,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m304w1,
-                    c2m304w1.DecodePoint(
+                    new X9ECPoint(c2m304w1,
                         Hex.Decode("02197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614")),
                     n, h,
                     null);
@@ -594,7 +594,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m359v1,
-                    c2m359v1.DecodePoint(
+                    new X9ECPoint(c2m359v1,
                         Hex.Decode("033C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097")),
                     n, h,
                     null);
@@ -622,7 +622,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m368w1,
-                    c2m368w1.DecodePoint(
+                    new X9ECPoint(c2m368w1,
                         Hex.Decode("021085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F")),
                     n, h,
                     null);
@@ -650,7 +650,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
                 return new X9ECParameters(
                     c2m431r1,
-                    c2m431r1.DecodePoint(
+                    new X9ECPoint(c2m431r1,
                         Hex.Decode("02120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7")),
                     n, h,
                     null);
diff --git a/crypto/src/asn1/x9/X9ECParameters.cs b/crypto/src/asn1/x9/X9ECParameters.cs
index a192e4c52..2b6b14bcb 100644
--- a/crypto/src/asn1/x9/X9ECParameters.cs
+++ b/crypto/src/asn1/x9/X9ECParameters.cs
@@ -15,7 +15,7 @@ namespace Org.BouncyCastle.Asn1.X9
     {
         private X9FieldID	fieldID;
         private ECCurve		curve;
-        private ECPoint		g;
+        private X9ECPoint	g;
         private BigInteger	n;
         private BigInteger	h;
         private byte[]		seed;
@@ -29,36 +29,28 @@ namespace Org.BouncyCastle.Asn1.X9
                 throw new ArgumentException("bad version in X9ECParameters");
             }
 
-            X9Curve x9c = null;
-            if (seq[2] is X9Curve)
-            {
-                x9c = (X9Curve) seq[2];
-            }
-            else
-            {
-                x9c = new X9Curve(
-                    new X9FieldID(
-                        (Asn1Sequence) seq[1]),
-                        (Asn1Sequence) seq[2]);
-            }
+            X9Curve x9c = new X9Curve(
+                X9FieldID.GetInstance(seq[1]),
+                Asn1Sequence.GetInstance(seq[2]));
 
             this.curve = x9c.Curve;
+            object p = seq[3];
 
-            if (seq[3] is X9ECPoint)
+            if (p is X9ECPoint)
             {
-                this.g = ((X9ECPoint) seq[3]).Point;
+                this.g = ((X9ECPoint)p);
             }
             else
             {
-                this.g = new X9ECPoint(curve, (Asn1OctetString) seq[3]).Point;
+                this.g = new X9ECPoint(curve, (Asn1OctetString)p);
             }
 
-            this.n = ((DerInteger) seq[4]).Value;
+            this.n = ((DerInteger)seq[4]).Value;
             this.seed = x9c.GetSeed();
 
             if (seq.Count == 6)
             {
-                this.h = ((DerInteger) seq[5]).Value;
+                this.h = ((DerInteger)seq[5]).Value;
             }
         }
 
@@ -66,7 +58,16 @@ namespace Org.BouncyCastle.Asn1.X9
             ECCurve		curve,
             ECPoint		g,
             BigInteger	n)
-            : this(curve, g, n, BigInteger.One, null)
+            : this(curve, g, n, null, null)
+        {
+        }
+
+        public X9ECParameters(
+            ECCurve     curve,
+            X9ECPoint   g,
+            BigInteger  n,
+            BigInteger  h)
+            : this(curve, g, n, h, null)
         {
         }
 
@@ -85,9 +86,19 @@ namespace Org.BouncyCastle.Asn1.X9
             BigInteger	n,
             BigInteger	h,
             byte[]		seed)
+            : this(curve, new X9ECPoint(g), n, h, seed)
+        {
+        }
+
+        public X9ECParameters(
+            ECCurve     curve,
+            X9ECPoint   g,
+            BigInteger  n,
+            BigInteger  h,
+            byte[]      seed)
         {
             this.curve = curve;
-            this.g = g.Normalize();
+            this.g = g;
             this.n = n;
             this.h = h;
             this.seed = seed;
@@ -126,7 +137,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
         public ECPoint G
         {
-            get { return g; }
+            get { return g.Point; }
         }
 
         public BigInteger N
@@ -136,16 +147,7 @@ namespace Org.BouncyCastle.Asn1.X9
 
         public BigInteger H
         {
-            get
-            {
-                if (h == null)
-                {
-                    // TODO - this should be calculated, it will cause issues with custom curves.
-                    return BigInteger.One;
-                }
-
-                return h;
-            }
+            get { return h; }
         }
 
         public byte[] GetSeed()
@@ -154,6 +156,36 @@ namespace Org.BouncyCastle.Asn1.X9
         }
 
         /**
+         * Return the ASN.1 entry representing the Curve.
+         *
+         * @return the X9Curve for the curve in these parameters.
+         */
+        public X9Curve CurveEntry
+        {
+            get { return new X9Curve(curve, seed); }
+        }
+
+        /**
+         * Return the ASN.1 entry representing the FieldID.
+         *
+         * @return the X9FieldID for the FieldID in these parameters.
+         */
+        public X9FieldID FieldIDEntry
+        {
+            get { return fieldID; }
+        }
+
+        /**
+         * Return the ASN.1 entry representing the base point G.
+         *
+         * @return the X9ECPoint for the base point in these parameters.
+         */
+        public X9ECPoint BaseEntry
+        {
+            get { return g; }
+        }
+
+        /**
          * Produce an object suitable for an Asn1OutputStream.
          * <pre>
          *  ECParameters ::= Sequence {
@@ -169,10 +201,10 @@ namespace Org.BouncyCastle.Asn1.X9
         public override Asn1Object ToAsn1Object()
         {
             Asn1EncodableVector v = new Asn1EncodableVector(
-                new DerInteger(1),
+                new DerInteger(BigInteger.One),
                 fieldID,
                 new X9Curve(curve, seed),
-                new X9ECPoint(g),
+                g,
                 new DerInteger(n));
 
             if (h != null)
diff --git a/crypto/src/asn1/x9/X9ECPoint.cs b/crypto/src/asn1/x9/X9ECPoint.cs
index 75d58cd38..7ef4f13bc 100644
--- a/crypto/src/asn1/x9/X9ECPoint.cs
+++ b/crypto/src/asn1/x9/X9ECPoint.cs
@@ -1,5 +1,7 @@
 using Org.BouncyCastle.Math.EC;
 
+using Org.BouncyCastle.Utilities;
+
 namespace Org.BouncyCastle.Asn1.X9
 {
     /**
@@ -8,24 +10,58 @@ namespace Org.BouncyCastle.Asn1.X9
     public class X9ECPoint
         : Asn1Encodable
     {
-        private readonly ECPoint p;
+        private readonly Asn1OctetString encoding;
+
+        private ECCurve c;
+        private ECPoint p;
+
+        public X9ECPoint(ECPoint p)
+            : this(p, false)
+        {
+        }
 
-        public X9ECPoint(
-            ECPoint p)
+        public X9ECPoint(ECPoint p, bool compressed)
         {
             this.p = p.Normalize();
+            this.encoding = new DerOctetString(p.GetEncoded(compressed));
+        }
+
+        public X9ECPoint(ECCurve c, byte[] encoding)
+        {
+            this.c = c;
+            this.encoding = new DerOctetString(Arrays.Clone(encoding));
         }
 
-        public X9ECPoint(
-            ECCurve			c,
-            Asn1OctetString	s)
+        public X9ECPoint(ECCurve c, Asn1OctetString s)
+            : this(c, s.GetOctets())
         {
-            this.p = c.DecodePoint(s.GetOctets());
+        }
+
+        public byte[] GetPointEncoding()
+        {
+            return Arrays.Clone(encoding.GetOctets());
         }
 
         public ECPoint Point
         {
-            get { return p; }
+            get
+            {
+                if (p == null)
+                {
+                    p = c.DecodePoint(encoding.GetOctets()).Normalize();
+                }
+
+                return p;
+            }
+        }
+
+        public bool IsPointCompressed
+        {
+            get
+            {
+                byte[] octets = encoding.GetOctets();
+                return octets != null && octets.Length > 0 && (octets[0] == 2 || octets[0] == 3);
+            }
         }
 
         /**
@@ -38,7 +74,7 @@ namespace Org.BouncyCastle.Asn1.X9
          */
         public override Asn1Object ToAsn1Object()
         {
-            return new DerOctetString(p.GetEncoded());
+            return encoding;
         }
     }
 }
diff --git a/crypto/src/asn1/x9/X9FieldID.cs b/crypto/src/asn1/x9/X9FieldID.cs
index 58823a285..08d7d71b4 100644
--- a/crypto/src/asn1/x9/X9FieldID.cs
+++ b/crypto/src/asn1/x9/X9FieldID.cs
@@ -90,11 +90,19 @@ namespace Org.BouncyCastle.Asn1.X9
             this.parameters = new DerSequence(fieldIdParams);
         }
 
-        internal X9FieldID(
-            Asn1Sequence seq)
+        private X9FieldID(Asn1Sequence seq)
         {
-            this.id = (DerObjectIdentifier) seq[0];
-            this.parameters = (Asn1Object) seq[1];
+            this.id = DerObjectIdentifier.GetInstance(seq[0]);
+            this.parameters = seq[1].ToAsn1Object();
+        }
+
+        public static X9FieldID GetInstance(object obj)
+        {
+            if (obj is X9FieldID)
+                return (X9FieldID)obj;
+            if (obj == null)
+                return null;
+            return new X9FieldID(Asn1Sequence.GetInstance(obj));
         }
 
         public DerObjectIdentifier Identifier
diff --git a/crypto/src/crypto/ec/CustomNamedCurves.cs b/crypto/src/crypto/ec/CustomNamedCurves.cs
index 0f13b4571..51bb1829a 100644
--- a/crypto/src/crypto/ec/CustomNamedCurves.cs
+++ b/crypto/src/crypto/ec/CustomNamedCurves.cs
@@ -60,7 +60,7 @@ namespace Org.BouncyCastle.Crypto.EC
                  * 
                  * (The other possible y value is 5F51E65E475F794B1FE122D388B72EB36DC2B28192839E4DD6163A5D81312C14) 
                  */
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A"
                     + "20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9"));
 
@@ -82,7 +82,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("000E0D4D696E6768756151750CC03A4473D03679");
                 ECCurve curve = ConfigureCurve(new SecP128R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "161FF7528B899B2D0C28607CA52C5B86"
                     + "CF5AC8395BAFEB13C02DA292DDED7A83"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -115,7 +115,7 @@ namespace Org.BouncyCastle.Crypto.EC
                     new BigInteger("96341f1138933bc2f503fd44", 16),
                     176);
                 ECCurve curve = ConfigureCurveGlv(new SecP160K1Curve(), glv);
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB"
                     + "938CF935318FDCED6BC28286531733C3F03C4FEE"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -136,7 +136,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("1053CDE42C14D696E67687561517533BF3F83345");
                 ECCurve curve = ConfigureCurve(new SecP160R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "4A96B5688EF573284664698968C38BB913CBFC82"
                     + "23A628553168947D59DCC912042351377AC5FB32"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -157,7 +157,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("B99B99B099B323E02709A4D696E6768756151751");
                 ECCurve curve = ConfigureCurve(new SecP160R2Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "52DCB034293A117E1F4FF11B30F7199D3144CE6D"
                     + "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -190,7 +190,7 @@ namespace Org.BouncyCastle.Crypto.EC
                     new BigInteger("b3fb3400dec5c4adceb8655d4c94", 16),
                     208);
                 ECCurve curve = ConfigureCurveGlv(new SecP192K1Curve(), glv);
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D"
                     + "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -211,7 +211,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("3045AE6FC8422F64ED579528D38120EAE12196D5");
                 ECCurve curve = ConfigureCurve(new SecP192R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012"
                     + "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -244,7 +244,7 @@ namespace Org.BouncyCastle.Crypto.EC
                     new BigInteger("b8adf1378a6eb73409fa6c9c637ba7f5", 16),
                     240);
                 ECCurve curve = ConfigureCurveGlv(new SecP224K1Curve(), glv);
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C"
                     + "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -265,7 +265,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("BD71344799D5C7FCDC45B59FA3B9AB8F6A948BC5");
                 ECCurve curve = ConfigureCurve(new SecP224R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21"
                     + "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -298,7 +298,7 @@ namespace Org.BouncyCastle.Crypto.EC
                     new BigInteger("e4437ed6010e88286f547fa90abfe4c42212", 16),
                     272);
                 ECCurve curve = ConfigureCurveGlv(new SecP256K1Curve(), glv);
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798"
                     + "483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -319,7 +319,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("C49D360886E704936A6678E1139D26B7819F7E90");
                 ECCurve curve = ConfigureCurve(new SecP256R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296"
                     + "4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -340,7 +340,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("A335926AA319A27A1D00896A6773A4827ACDAC73");
                 ECCurve curve = ConfigureCurve(new SecP384R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7"
                     + "3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -361,7 +361,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("D09E8800291CB85396CC6717393284AAA0DA64BA");
                 ECCurve curve = ConfigureCurve(new SecP521R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66"
                     + "011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -382,7 +382,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10E723AB14D696E6768756151756FEBF8FCB49A9");
                 ECCurve curve = ConfigureCurve(new SecT113R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "009D73616F35F4AB1407D73562C10F"
                     + "00A52830277958EE84D1315ED31886"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -403,7 +403,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10C0FB15760860DEF1EEF4D696E676875615175D");
                 ECCurve curve = ConfigureCurve(new SecT113R2Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "01A57A6A7B26CA5EF52FCDB8164797"
                     + "00B3ADC94ED1FE674C06E695BABA1D"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -424,7 +424,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("4D696E676875615175985BD3ADBADA21B43A97E2");
                 ECCurve curve = ConfigureCurve(new SecT131R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0081BAF91FDF9833C40F9C181343638399"
                     + "078C6E7EA38C001F73C8134B1B4EF9E150"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -445,7 +445,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("985BD3ADBAD4D696E676875615175A21B43A97E3");
                 ECCurve curve = ConfigureCurve(new SecT131R2Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0356DCD8F2F95031AD652D23951BB366A8"
                     + "0648F06D867940A5366D9E265DE9EB240F"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -466,7 +466,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT163K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8"
                     + "0289070FB05D38FF58321F2E800536D538CCDAA3D9"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -487,7 +487,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("24B7B137C8A14D696E6768756151756FD0DA2E5C");
                 ECCurve curve = ConfigureCurve(new SecT163R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0369979697AB43897789566789567F787A7876A654"
                     + "00435EDB42EFAFB2989D51FEFCE3C80988F41FF883"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -508,7 +508,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("85E25BFE5C86226CDB12016F7553F9D0E693A268");
                 ECCurve curve = ConfigureCurve(new SecT163R2Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "03F0EBA16286A2D57EA0991168D4994637E8343E36"
                     + "00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -529,7 +529,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("103FAEC74D696E676875615175777FC5B191EF30");
                 ECCurve curve = ConfigureCurve(new SecT193R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1"
                     + "0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -550,7 +550,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("10B7B4D696E676875615175137C8A16FD0DA2211");
                 ECCurve curve = ConfigureCurve(new SecT193R2Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F"
                     + "01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -571,7 +571,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT233K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126"
                     + "01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -592,7 +592,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("74D59FF07F6B413D0EA14B344B20A2DB049B50C3");
                 ECCurve curve = ConfigureCurve(new SecT233R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B"
                     + "01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -613,7 +613,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT239K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC"
                     + "76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -634,7 +634,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT283K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836"
                     + "01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -655,7 +655,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("77E2B07370EB0F832A6DD5B62DFC88CD06BB84BE");
                 ECCurve curve = ConfigureCurve(new SecT283R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053"
                     + "03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -676,7 +676,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT409K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746"
                     + "01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -697,7 +697,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("4099B5A457F9D69F79213D094C4BCD4D4262210B");
                 ECCurve curve = ConfigureCurve(new SecT409R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7"
                     + "0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -718,7 +718,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = null;
                 ECCurve curve = ConfigureCurve(new SecT571K1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA44370958493B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972"
                     + "0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
@@ -739,7 +739,7 @@ namespace Org.BouncyCastle.Crypto.EC
             {
                 byte[] S = Hex.Decode("2AA058F73A0E33AB486B0F610410C53A7F132310");
                 ECCurve curve = ConfigureCurve(new SecT571R1Curve());
-                ECPoint G = curve.DecodePoint(Hex.Decode("04"
+                X9ECPoint G = new X9ECPoint(curve, Hex.Decode("04"
                     + "0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19"
                     + "037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B"));
                 return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);