Improve curve registry laziness

1 files changed, 332 insertions, 191 deletions

diff --git a/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs b/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
index 1e54cb7d1..121843ada 100644
--- a/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
+++ b/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs
@@ -9,6 +9,7 @@ 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;
 
 namespace Org.BouncyCastle.Asn1.CryptoPro
 {
@@ -17,11 +18,15 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
     /// </summary>
     public sealed class ECGost3410NamedCurves
     {
-        private static ECPoint ConfigureBasepoint(ECCurve curve, BigInteger x, BigInteger y)
+        private ECGost3410NamedCurves()
+        {
+        }
+
+        private static X9ECPoint ConfigureBasepoint(ECCurve curve, BigInteger x, BigInteger y)
         {
             ECPoint G = curve.CreatePoint(x, y);
             WNafUtilities.ConfigureBasepoint(G);
-            return G;
+            return new X9ECPoint(G, false);
         }
 
         private static ECCurve ConfigureCurve(ECCurve curve)
@@ -29,210 +34,346 @@ namespace Org.BouncyCastle.Asn1.CryptoPro
             return curve;
         }
 
-        private ECGost3410NamedCurves()
+        private static BigInteger FromHex(string hex)
         {
+            return new BigInteger(1, Hex.DecodeStrict(hex));
         }
 
-        internal static readonly IDictionary objIds = Platform.CreateHashtable();
-        internal static readonly IDictionary parameters = Platform.CreateHashtable();
-        internal static readonly IDictionary names = Platform.CreateHashtable();
+        /*
+         * GostR3410-2001-CryptoPro-A (and GostR3410-2001-CryptoPro-XchA)
+         */
+        internal class Holder_gostR3410_2001_CryptoPro_A
+            : X9ECParametersHolder
+        {
+            private Holder_gostR3410_2001_CryptoPro_A() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_gostR3410_2001_CryptoPro_A();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97");
+                BigInteger mod_q = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD94"),
+                    FromHex("A6"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.One,
+                    FromHex("8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * GostR3410-2001-CryptoPro-B
+         */
+        internal class Holder_gostR3410_2001_CryptoPro_B
+            : X9ECParametersHolder
+        {
+            private Holder_gostR3410_2001_CryptoPro_B() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_gostR3410_2001_CryptoPro_B();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("8000000000000000000000000000000000000000000000000000000000000C99");
+                BigInteger mod_q = FromHex("800000000000000000000000000000015F700CFFF1A624E5E497161BCC8A198F");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("8000000000000000000000000000000000000000000000000000000000000C96"),
+                    FromHex("3E1AF419A269A5F866A7D3C25C3DF80AE979259373FF2B182F49D4CE7E1BBC8B"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.One,
+                    FromHex("3FA8124359F96680B83D1C3EB2C070E5C545C9858D03ECFB744BF8D717717EFC"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * GostR3410-2001-CryptoPro-C
+         */
+        internal class Holder_gostR3410_2001_CryptoPro_C
+            : X9ECParametersHolder
+        {
+            private Holder_gostR3410_2001_CryptoPro_C() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_gostR3410_2001_CryptoPro_C();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D759B");
+                BigInteger mod_q = FromHex("9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D7598"),
+                    FromHex("805A"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.Zero,
+                    FromHex("41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * GostR3410-2001-CryptoPro-XchB
+         */
+        internal class Holder_gostR3410_2001_CryptoPro_XchB
+            : X9ECParametersHolder
+        {
+            private Holder_gostR3410_2001_CryptoPro_XchB() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_gostR3410_2001_CryptoPro_XchB();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D759B");
+                BigInteger mod_q = FromHex("9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D7598"),
+                    FromHex("805A"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.Zero,
+                    FromHex("41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * Tc26-Gost-3410-12-256-paramSetA
+         */
+        internal class Holder_id_tc26_gost_3410_12_256_paramSetA
+            : X9ECParametersHolder
+        {
+            private Holder_id_tc26_gost_3410_12_256_paramSetA() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_id_tc26_gost_3410_12_256_paramSetA();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97");
+                BigInteger mod_q = FromHex("400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335"),
+                    FromHex("295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513"),
+                    mod_q, BigInteger.Four));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    FromHex("91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28"),
+                    FromHex("32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * Tc26-Gost-3410-12-512-paramSetA
+         */
+        internal class Holder_id_tc26_gost_3410_12_512_paramSetA
+            : X9ECParametersHolder
+        {
+            private Holder_id_tc26_gost_3410_12_512_paramSetA() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_id_tc26_gost_3410_12_512_paramSetA();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7");
+                BigInteger mod_q = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4"),
+                    FromHex("E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.Three,
+                    FromHex("7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * Tc26-Gost-3410-12-512-paramSetB
+         */
+        internal class Holder_id_tc26_gost_3410_12_512_paramSetB
+            : X9ECParametersHolder
+        {
+            private Holder_id_tc26_gost_3410_12_512_paramSetB() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_id_tc26_gost_3410_12_512_paramSetB();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F");
+                BigInteger mod_q = FromHex("800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C"),
+                    FromHex("687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116"),
+                    mod_q, BigInteger.One));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    BigInteger.Two,
+                    FromHex("1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+        /*
+         * Tc26-Gost-3410-12-512-paramSetC
+         */
+        internal class Holder_id_tc26_gost_3410_12_512_paramSetC
+            : X9ECParametersHolder
+        {
+            private Holder_id_tc26_gost_3410_12_512_paramSetC() {}
+
+            internal static readonly X9ECParametersHolder Instance = new Holder_id_tc26_gost_3410_12_512_paramSetC();
+
+            protected override ECCurve CreateCurve()
+            {
+                BigInteger mod_p = FromHex("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7");
+                BigInteger mod_q = FromHex("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED");
+
+                return ConfigureCurve(new FpCurve(
+                    mod_p,
+                    FromHex("DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E143064546E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3"),
+                    FromHex("B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1"),
+                    mod_q, BigInteger.Four));
+            }
+
+            protected override X9ECParameters CreateParameters()
+            {
+                byte[] S = null;
+                ECCurve curve = Curve;
+
+                X9ECPoint G = ConfigureBasepoint(curve,
+                    FromHex("E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148"),
+                    FromHex("F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F"));
+
+                return new X9ECParameters(curve, G, curve.Order, curve.Cofactor, S);
+            }
+        };
+
+
+        private static readonly IDictionary objIds = Platform.CreateHashtable();
+        private static readonly IDictionary curves = Platform.CreateHashtable();
+        private static readonly IDictionary names = Platform.CreateHashtable();
+
+        private static void DefineCurve(string name, DerObjectIdentifier oid, X9ECParametersHolder holder)
+        {
+            objIds.Add(name, oid);
+            names.Add(oid, name);
+            curves.Add(oid, holder);
+        }
 
         static ECGost3410NamedCurves()
         {
-            BigInteger mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
-            BigInteger mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-
-            ECCurve curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"), // a
-                new BigInteger("166"), // b
-                mod_q, BigInteger.One));
-
-            ECDomainParameters ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("1"), // x
-                    new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
-                mod_q, BigInteger.One);
-
-            parameters[CryptoProObjectIdentifiers.GostR3410x2001CryptoProA] = ecParams;
-
-            mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
-            mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"),
-                new BigInteger("166"),
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("1"), // x
-                    new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
-                mod_q, BigInteger.One);
-
-            parameters[CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA] = ecParams;
-
-            mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823193"); //p
-            mod_q = new BigInteger("57896044618658097711785492504343953927102133160255826820068844496087732066703"); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823190"), // a
-                new BigInteger("28091019353058090096996979000309560759124368558014865957655842872397301267595"), // b
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("1"), // x
-                    new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124")), // y
-                mod_q, BigInteger.One);
-
-            parameters[CryptoProObjectIdentifiers.GostR3410x2001CryptoProB] = ecParams;
-
-            mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619");
-            mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601");
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"),
-                new BigInteger("32858"),
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("0"),
-                    new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")),
-                mod_q, BigInteger.One);
-
-            parameters[CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB] = ecParams;
-
-            mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619"); //p
-            mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601"); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"), // a
-                new BigInteger("32858"), // b
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("0"), // x
-                    new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")), // y
-                mod_q, BigInteger.One);
-
-            parameters[CryptoProObjectIdentifiers.GostR3410x2001CryptoProC] = ecParams;
-
-            //GOST34.10 2012
-            mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97", 16); //p
-            mod_q = new BigInteger("400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67", 16); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335", 16), // a
-                new BigInteger("295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513", 16), // b
-                mod_q, BigInteger.Four));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28", 16), // x
-                    new BigInteger("32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C", 16)), // y
-                mod_q, BigInteger.Four);
-
-            parameters[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256_paramSetA] = ecParams;
-
-            mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7", 16); //p
-            mod_q = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275", 16); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4", 16), // a
-                new BigInteger("E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760", 16), // b
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003"), // x
-                    new BigInteger("7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4", 16)), // y
-                mod_q, BigInteger.One);
-
-            parameters[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetA] = ecParams;
-
-            mod_p = new BigInteger("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F", 16); //p
-            mod_q = new BigInteger("800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD", 16); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C", 16), // a
-                new BigInteger("687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116", 16), // b
-                mod_q, BigInteger.One));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002"), // x
-                    new BigInteger("1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD", 16)), // y
-                mod_q, BigInteger.One);
-
-            parameters[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetB] = ecParams;
-
-            mod_p = new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7", 16); //p
-            mod_q = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED", 16); //q
-
-            curve = ConfigureCurve(new FpCurve(
-                mod_p, // p
-                new BigInteger("DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E143064546E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3", 16), // a
-                new BigInteger("B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1", 16), // b
-                mod_q, BigInteger.Four));
-
-            ecParams = new ECDomainParameters(
-                curve,
-                ConfigureBasepoint(curve,
-                    new BigInteger("E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148", 16), // x
-                    new BigInteger("F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F", 16)), // y
-                mod_q, BigInteger.Four);
-
-            parameters[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetC] = ecParams;
-
-            objIds["GostR3410-2001-CryptoPro-A"] = CryptoProObjectIdentifiers.GostR3410x2001CryptoProA;
-            objIds["GostR3410-2001-CryptoPro-B"] = CryptoProObjectIdentifiers.GostR3410x2001CryptoProB;
-            objIds["GostR3410-2001-CryptoPro-C"] = CryptoProObjectIdentifiers.GostR3410x2001CryptoProC;
-            objIds["GostR3410-2001-CryptoPro-XchA"] = CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA;
-            objIds["GostR3410-2001-CryptoPro-XchB"] = CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB;
-            objIds["Tc26-Gost-3410-12-256-paramSetA"] = RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256_paramSetA;
-            objIds["Tc26-Gost-3410-12-512-paramSetA"] = RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetA;
-            objIds["Tc26-Gost-3410-12-512-paramSetB"] = RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetB;
-            objIds["Tc26-Gost-3410-12-512-paramSetC"] = RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetC;
-
-            names[CryptoProObjectIdentifiers.GostR3410x2001CryptoProA] = "GostR3410-2001-CryptoPro-A";
-            names[CryptoProObjectIdentifiers.GostR3410x2001CryptoProB] = "GostR3410-2001-CryptoPro-B";
-            names[CryptoProObjectIdentifiers.GostR3410x2001CryptoProC] = "GostR3410-2001-CryptoPro-C";
-            names[CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA] = "GostR3410-2001-CryptoPro-XchA";
-            names[CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB] = "GostR3410-2001-CryptoPro-XchB";
-            names[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256_paramSetA] = "Tc26-Gost-3410-12-256-paramSetA";
-            names[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetA] = "Tc26-Gost-3410-12-512-paramSetA";
-            names[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetB] = "Tc26-Gost-3410-12-512-paramSetB";
-            names[RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetC] = "Tc26-Gost-3410-12-512-paramSetC";
+            DefineCurve("GostR3410-2001-CryptoPro-A", CryptoProObjectIdentifiers.GostR3410x2001CryptoProA,
+                Holder_gostR3410_2001_CryptoPro_A.Instance);
+            DefineCurve("GostR3410-2001-CryptoPro-B", CryptoProObjectIdentifiers.GostR3410x2001CryptoProB,
+                Holder_gostR3410_2001_CryptoPro_B.Instance);
+            DefineCurve("GostR3410-2001-CryptoPro-C", CryptoProObjectIdentifiers.GostR3410x2001CryptoProC,
+                Holder_gostR3410_2001_CryptoPro_C.Instance);
+            DefineCurve("GostR3410-2001-CryptoPro-XchA", CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA,
+                Holder_gostR3410_2001_CryptoPro_A.Instance);
+            DefineCurve("GostR3410-2001-CryptoPro-XchB", CryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB,
+                Holder_gostR3410_2001_CryptoPro_XchB.Instance);
+            DefineCurve("Tc26-Gost-3410-12-256-paramSetA", RosstandartObjectIdentifiers.id_tc26_gost_3410_12_256_paramSetA,
+                Holder_id_tc26_gost_3410_12_256_paramSetA.Instance);
+            DefineCurve("Tc26-Gost-3410-12-512-paramSetA", RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetA,
+                Holder_id_tc26_gost_3410_12_512_paramSetA.Instance);
+            DefineCurve("Tc26-Gost-3410-12-512-paramSetB", RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetB,
+                Holder_id_tc26_gost_3410_12_512_paramSetB.Instance);
+            DefineCurve("Tc26-Gost-3410-12-512-paramSetC", RosstandartObjectIdentifiers.id_tc26_gost_3410_12_512_paramSetC,
+                Holder_id_tc26_gost_3410_12_512_paramSetC.Instance);
         }
 
         public static X9ECParameters GetByNameX9(string name)
         {
-            DerObjectIdentifier oid = (DerObjectIdentifier)objIds[name];
+            DerObjectIdentifier oid = GetOid(name);
             return oid == null ? null : GetByOidX9(oid);
         }
 
+        public static X9ECParametersHolder GetByNameLazy(string name)
+        {
+            DerObjectIdentifier oid = GetOid(name);
+            return oid == null ? null : GetByOidLazy(oid);
+        }
+
         public static X9ECParameters GetByOidX9(DerObjectIdentifier oid)
         {
-            ECDomainParameters ec = (ECDomainParameters)parameters[oid];
-            return ec == null ? null : new X9ECParameters(ec.Curve, new X9ECPoint(ec.G, false), ec.N, ec.H, ec.GetSeed());
+            X9ECParametersHolder holder = GetByOidLazy(oid);
+            return holder == null ? null : holder.Parameters;
+        }
+
+        public static X9ECParametersHolder GetByOidLazy(DerObjectIdentifier oid)
+        {
+            return (X9ECParametersHolder)curves[oid];
         }
 
         public static DerObjectIdentifier GetOid(