some ec updates

CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.dpr

@@ -587,7 +587,8 @@ uses
   ClpEndoUtilities in '..\..\CryptoLib\src\Math\EC\Endo\ClpEndoUtilities.pas',
   ClpWNafUtilities in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpWNafUtilities.pas',
   ClpCustomNamedCurves in '..\..\CryptoLib\src\Crypto\EC\ClpCustomNamedCurves.pas',
-  ClpECUtilities in '..\..\CryptoLib\src\Crypto\EC\ClpECUtilities.pas';
+  ClpECUtilities in '..\..\CryptoLib\src\Crypto\EC\ClpECUtilities.pas',
+  ClpX962NamedCurves in '..\..\CryptoLib\src\Asn1\X9\ClpX962NamedCurves.pas';
 
 begin
 

CryptoLib.Tests/src/Others/ECDsa5Tests.pas

@@ -176,10 +176,8 @@ begin
     TBigInteger.Create
     ('32010857077C5431123A46B808906756F543423E8D27877578125778AC76', 16), // a
     TBigInteger.Create
-    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16), // b
-    TBigInteger.Create
-    ('2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447', 16),
-    TBigInteger.Four);
+    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16) // b
+    );
 
   parameters := TECDomainParameters.Create(curve,
     curve.DecodePoint

CryptoLib.Tests/src/Others/ECTests.pas

@@ -94,12 +94,12 @@ type
     /// X9.62 - 1998, <br />J.2.1, Page 100, ECDSA over the field F2m <br />
     /// an example with 191 bit binary field
     /// </summary>
-    procedure TestECDsa239bitBinary();
+    procedure TestECDsa239BitBinary();
 
     /// <summary>
     /// General test for long digest.
     /// </summary>
-    procedure TestECDsa239bitBinaryAndLargeDigest();
+    procedure TestECDsa239BitBinaryAndLargeDigest();
 
     /// <summary>
     /// key generation test
@@ -342,7 +342,7 @@ begin
   end;
 end;
 
-procedure TTestEC.TestECDsa239bitBinary;
+procedure TTestEC.TestECDsa239BitBinary;
 var
   sig: TCryptoLibGenericArray<TBigInteger>;
   k: ISecureRandom;
@@ -373,10 +373,8 @@ begin
     TBigInteger.Create
     ('32010857077C5431123A46B808906756F543423E8D27877578125778AC76', 16), // a
     TBigInteger.Create
-    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16), // b
-    TBigInteger.Create
-    ('2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447', 16),
-    TBigInteger.Four);
+    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16) // b
+    );
 
   parameters := TECDomainParameters.Create(curve,
     curve.DecodePoint
@@ -430,7 +428,7 @@ begin
   end;
 end;
 
-procedure TTestEC.TestECDsa239bitBinaryAndLargeDigest;
+procedure TTestEC.TestECDsa239BitBinaryAndLargeDigest;
 var
   r, s: TBigInteger;
   kData, &message: TBytes;
@@ -460,10 +458,8 @@ begin
     TBigInteger.Create
     ('32010857077C5431123A46B808906756F543423E8D27877578125778AC76', 16), // a
     TBigInteger.Create
-    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16), // b
-    TBigInteger.Create
-    ('2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447', 16),
-    TBigInteger.Four);
+    ('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16', 16) // b
+    );
 
   parameters := TECDomainParameters.Create(curve,
     curve.DecodePoint

CryptoLib.Tests/src/Others/NamedCurveTests.pas

@@ -169,17 +169,8 @@ end;
 function TTestNamedCurve.GetCurveParameters(const name: String)
   : IECDomainParameters;
 var
-  ecdp: IECDomainParameters;
   ecP: IX9ECParameters;
 begin
-  ecdp := TECGost3410NamedCurves.GetByName(name);
-
-  if (ecdp <> Nil) then
-  begin
-    result := ecdp;
-    Exit;
-  end;
-
   ecP := TECNamedCurveTable.GetByName(name);
 
   if (ecP = Nil) then

CryptoLib/src/Asn1/CryptoPro/ClpECGost3410NamedCurves.pas

@@ -22,388 +22,425 @@ unit ClpECGost3410NamedCurves;
 interface
 
 uses
+  SysUtils,
   Generics.Collections,
-  ClpCryptoLibTypes,
-  ClpBigInteger,
+  ClpAsn1Comparers,
+  ClpCryptoLibComparers,
+  ClpCollectionUtilities,
+  ClpEncoders,
   ClpCryptoProObjectIdentifiers,
   ClpRosstandartObjectIdentifiers,
+  ClpCryptoLibTypes,
+  ClpBigInteger,
   ClpECCurve,
+  ClpWnafUtilities,
   ClpIECCore,
-  ClpECParameters,
-  ClpIECParameters,
-  ClpIAsn1Objects;
+  ClpIAsn1Objects,
+  ClpX9ECAsn1Objects,
+  ClpIX9ECAsn1Objects,
+  ClpX9ECParametersHolder,
+  ClpIX9ECParametersHolder;
 
 type
-  /// <summary>
-  /// Table of the available named parameters for GOST 3410-2001 / 2012.
-  /// </summary>
+  /// <summary>Elliptic curve registry for GOST 3410-2001 / 2012.</summary>
   TECGost3410NamedCurves = class sealed(TObject)
 
   strict private
-  class var
-    Fparameters: TDictionary<IDerObjectIdentifier, IECDomainParameters>;
-    FobjIds: TDictionary<String, IDerObjectIdentifier>;
-    Fnames: TDictionary<IDerObjectIdentifier, String>;
-
-    class procedure Boot(); static;
-    class constructor CreateECGost3410NamedCurves();
-    class destructor DestroyECGost3410NamedCurves();
+    class var
+      FObjIds: TDictionary<String, IDerObjectIdentifier>;
+      FCurves: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
+      FNames: TDictionary<IDerObjectIdentifier, String>;
 
     class function GetNames: TCryptoLibStringArray; static; inline;
+    class function FromHex(const AHex: String): TBigInteger; static;
+    class function ConfigureBasepoint(const ACurve: IECCurve; const AX,
+      AY: TBigInteger): IX9ECPoint; static;
+    class function ConfigureCurve(const ACurve: IECCurve): IECCurve;
+      static; inline;
+    class procedure DefineCurve(const AName: String;
+      const AOid: IDerObjectIdentifier;
+      const AHolder: IX9ECParametersHolder); static;
+
+    class procedure Boot; static;
+    class constructor CreateECGost3410NamedCurves;
+    class destructor DestroyECGost3410NamedCurves;
 
   public
-    // /**
-    // * return the ECDomainParameters object for the given OID, null if it
-    // * isn't present.
-    // *
-    // * @param oid an object identifier representing a named parameters, if present.
-    // */
-    class function GetByOid(const oid: IDerObjectIdentifier)
-      : IECDomainParameters; static; inline;
-    // /**
-    // * return the ECDomainParameters object for the given OID, null if it
-    // * isn't present.
-    // *
-    // * @param oid an object identifier representing a named parameters, if present.
-    // */
-    class function GetByName(const name: String): IECDomainParameters;
+    class function GetByName(const AName: String): IX9ECParameters;
       static; inline;
-    // /**
-    // * return the named curve name represented by the given object identifier.
-    // */
-    class function GetName(const oid: IDerObjectIdentifier): String;
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder;
       static; inline;
-
-    class function GetOid(const name: String): IDerObjectIdentifier;
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
+      static; inline;
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier)
+      : IX9ECParametersHolder; static; inline;
+    class function GetName(const AOid: IDerObjectIdentifier): String;
+      static; inline;
+    class function GetOid(const AName: String): IDerObjectIdentifier;
       static; inline;
-
-    // /**
-    // * returns an enumeration containing the name strings for curves
-    // * contained in this structure.
-    // */
     class property Names: TCryptoLibStringArray read GetNames;
 
+type
+  THolderGostR34102001CryptoProA = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderGostR34102001CryptoProB = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderGostR34102001CryptoProC = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderIdTc26Gost341012256ParamSetA = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderIdTc26Gost341012512ParamSetA = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderIdTc26Gost341012512ParamSetB = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  THolderIdTc26Gost341012512ParamSetC = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
   end;
 
 implementation
 
 { TECGost3410NamedCurves }
 
-class procedure TECGost3410NamedCurves.Boot;
+class function TECGost3410NamedCurves.FromHex(const AHex: String): TBigInteger;
+begin
+  Result := TBigInteger.Create(1, THex.Decode(AHex));
+end;
+
+class function TECGost3410NamedCurves.ConfigureBasepoint(const ACurve: IECCurve;
+  const AX, AY: TBigInteger): IX9ECPoint;
 var
-  mod_p, mod_q: TBigInteger;
-  curve: IFPCurve;
-  ecParams: IECDomainParameters;
+  LPoint: IECPoint;
 begin
+  LPoint := ACurve.CreatePoint(AX, AY);
+  TWnafUtilities.ConfigureBasepoint(LPoint);
+  Result := TX9ECPoint.Create(LPoint, False);
+end;
 
-  Fparameters := TDictionary<IDerObjectIdentifier,
-    IECDomainParameters>.Create();
-  FobjIds := TDictionary<String, IDerObjectIdentifier>.Create();
-  Fnames := TDictionary<IDerObjectIdentifier, String>.Create();
-
-  mod_p := TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639319');
-  mod_q := TBigInteger.Create
-    ('115792089237316195423570985008687907853073762908499243225378155805079068850323');
-
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639316'),
-    // a
-    TBigInteger.Create('166'), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('1'), // x
-    TBigInteger.Create
-    ('64033881142927202683649881450433473985931760268884941288852745803908878638612')
-    ), // y
-    mod_q);
-
-  Fparameters.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProA,
-    ecParams);
-
-  mod_p := TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639319');
-  mod_q := TBigInteger.Create
-    ('115792089237316195423570985008687907853073762908499243225378155805079068850323');
-
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639316'),
-    TBigInteger.Create('166'), mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('1'), // x
-    TBigInteger.Create
-    ('64033881142927202683649881450433473985931760268884941288852745803908878638612')
-    ), // y
-    mod_q);
-
-  Fparameters.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA,
-    ecParams);
-
-  mod_p := TBigInteger.Create
-    ('57896044618658097711785492504343953926634992332820282019728792003956564823193');
-  // p
-  mod_q := TBigInteger.Create
-    ('57896044618658097711785492504343953927102133160255826820068844496087732066703');
-  // q
-
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('57896044618658097711785492504343953926634992332820282019728792003956564823190'),
-    // a
-    TBigInteger.Create
-    ('28091019353058090096996979000309560759124368558014865957655842872397301267595'),
-    // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('1'), // x
-    TBigInteger.Create
-    ('28792665814854611296992347458380284135028636778229113005756334730996303888124')
-    ), // y
-    mod_q); // q
-
-  Fparameters.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProB,
-    ecParams);
-
-  mod_p := TBigInteger.Create
-    ('70390085352083305199547718019018437841079516630045180471284346843705633502619');
-  mod_q := TBigInteger.Create
-    ('70390085352083305199547718019018437840920882647164081035322601458352298396601');
-
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('70390085352083305199547718019018437841079516630045180471284346843705633502616'),
-    TBigInteger.Create('32858'), mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('0'),
-    TBigInteger.Create
-    ('29818893917731240733471273240314769927240550812383695689146495261604565990247')
-    ), mod_q);
-
-  Fparameters.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB,
-    ecParams);
-
-  mod_p := TBigInteger.Create
-    ('70390085352083305199547718019018437841079516630045180471284346843705633502619');
-  // p
-  mod_q := TBigInteger.Create
-    ('70390085352083305199547718019018437840920882647164081035322601458352298396601');
-  // q
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('70390085352083305199547718019018437841079516630045180471284346843705633502616'),
-    // a
-    TBigInteger.Create('32858'), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('0'), // x
-    TBigInteger.Create
-    ('29818893917731240733471273240314769927240550812383695689146495261604565990247')
-    ), // y
-    mod_q); // q
-
-  Fparameters.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProC,
-    ecParams);
-
-  // GOST34.10 2012
-  mod_p := TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639319');
-  // p
-  mod_q := TBigInteger.Create
-    ('115792089237316195423570985008687907853073762908499243225378155805079068850323');
-  // q
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('115792089237316195423570985008687907853269984665640564039457584007913129639316'),
-    // a
-    TBigInteger.Create('166'), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create('1'), // x
-    TBigInteger.Create
-    ('64033881142927202683649881450433473985931760268884941288852745803908878638612')
-    ), // y
-    mod_q); // q
-
-  Fparameters.Add(TRosstandartObjectIdentifiers.
-    IdTc26Gost3410_12_256ParamSetA, ecParams);
-
-  mod_p := TBigInteger.Create
-    ('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7',
-    16); // p
-  mod_q := TBigInteger.Create
-    ('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275',
-    16); // q
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4',
-    16), // a
-    TBigInteger.Create
-    ('E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760',
-    16), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create
-    ('00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003'),
-    // x
-    TBigInteger.Create
-    ('7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4',
-    16)), // y
-    mod_q); // q
-
-  Fparameters.Add(TRosstandartObjectIdentifiers.
-    IdTc26Gost3410_12_512ParamSetA, ecParams);
-
-  mod_p := TBigInteger.Create
-    ('8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F',
-    16); // p
-  mod_q := TBigInteger.Create
-    ('800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD',
-    16); // q
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C',
-    16), // a
-    TBigInteger.Create
-    ('687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116',
-    16), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create
-    ('00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002'),
-    // x
-    TBigInteger.Create
-    ('1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD',
-    16)), // y
-    mod_q); // q
-
-  Fparameters.Add(TRosstandartObjectIdentifiers.
-    IdTc26Gost3410_12_512ParamSetB, ecParams);
-
-  mod_p := TBigInteger.Create
-    ('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7',
-    16); // p
-  mod_q := TBigInteger.Create
-    ('3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED',
-    16); // q
-  curve := TFpCurve.Create(mod_p, // p
-    TBigInteger.Create
-    ('DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E143064546E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3',
-    16), // a
-    TBigInteger.Create
-    ('B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1',
-    16), // b
-    mod_q, TBigInteger.One);
-
-  ecParams := TECDomainParameters.Create(curve,
-    curve.CreatePoint(TBigInteger.Create
-    ('E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148',
-    16), // x
-    TBigInteger.Create
-    ('F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F',
-    16)), // y
-    mod_q); // q
-
-  Fparameters.Add(TRosstandartObjectIdentifiers.
-    IdTc26Gost3410_12_512ParamSetC, ecParams);
-
-  FobjIds.Add('GostR3410-2001-CryptoPro-A',
-    TCryptoProObjectIdentifiers.GostR3410x2001CryptoProA);
-  FobjIds.Add('GostR3410-2001-CryptoPro-B',
-    TCryptoProObjectIdentifiers.GostR3410x2001CryptoProB);
-  FobjIds.Add('GostR3410-2001-CryptoPro-C',
-    TCryptoProObjectIdentifiers.GostR3410x2001CryptoProC);
-  FobjIds.Add('GostR3410-2001-CryptoPro-XchA',
-    TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA);
-  FobjIds.Add('GostR3410-2001-CryptoPro-XchB',
-    TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB);
-  FobjIds.Add('Tc26-Gost-3410-12-256-paramSetA',
-    TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetA);
-  FobjIds.Add('Tc26-Gost-3410-12-512-paramSetA',
-    TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetA);
-  FobjIds.Add('Tc26-Gost-3410-12-512-paramSetB',
-    TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetB);
-  FobjIds.Add('Tc26-Gost-3410-12-512-paramSetC',
-    TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetC);
-
-  Fnames.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProA,
-    'GostR3410-2001-CryptoPro-A');
-  Fnames.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProB,
-    'GostR3410-2001-CryptoPro-B');
-  Fnames.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProC,
-    'GostR3410-2001-CryptoPro-C');
-  Fnames.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA,
-    'GostR3410-2001-CryptoPro-XchA');
-  Fnames.Add(TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB,
-    'GostR3410-2001-CryptoPro-XchB');
-  Fnames.Add(TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetA,
-    'Tc26-Gost-3410-12-256-paramSetA');
-  Fnames.Add(TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetA,
-    'Tc26-Gost-3410-12-512-paramSetA');
-  Fnames.Add(TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetB,
-    'Tc26-Gost-3410-12-512-paramSetB');
-  Fnames.Add(TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetC,
-    'Tc26-Gost-3410-12-512-paramSetC');
+class function TECGost3410NamedCurves.ConfigureCurve(const ACurve: IECCurve)
+  : IECCurve;
+begin
+  Result := ACurve;
+end;
+
+class procedure TECGost3410NamedCurves.DefineCurve(const AName: String;
+  const AOid: IDerObjectIdentifier;
+  const AHolder: IX9ECParametersHolder);
+var
+  LName: String;
+begin
+  LName := AName;
+  FNames.Add(AOid, LName);
+  FCurves.Add(AOid, AHolder);
+  FObjIds.Add(LName, AOid);
+end;
+
+class procedure TECGost3410NamedCurves.Boot;
+begin
+  FObjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
+  FCurves := TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
+  FNames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
+
+  DefineCurve('GostR3410-2001-CryptoPro-A', TCryptoProObjectIdentifiers.GostR3410x2001CryptoProA, THolderGostR34102001CryptoProA.Instance);
+  DefineCurve('GostR3410-2001-CryptoPro-B', TCryptoProObjectIdentifiers.GostR3410x2001CryptoProB, THolderGostR34102001CryptoProB.Instance);
+  DefineCurve('GostR3410-2001-CryptoPro-C', TCryptoProObjectIdentifiers.GostR3410x2001CryptoProC, THolderGostR34102001CryptoProC.Instance);
+  DefineCurve('GostR3410-2001-CryptoPro-XchA', TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchA, THolderGostR34102001CryptoProA.Instance);
+  DefineCurve('GostR3410-2001-CryptoPro-XchB', TCryptoProObjectIdentifiers.GostR3410x2001CryptoProXchB, THolderGostR34102001CryptoProC.Instance);
+  DefineCurve('Tc26-Gost-3410-12-256-paramSetA', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetA, THolderIdTc26Gost341012256ParamSetA.Instance);
+  DefineCurve('Tc26-Gost-3410-12-256-paramSetB', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetB, THolderGostR34102001CryptoProA.Instance);
+  DefineCurve('Tc26-Gost-3410-12-256-paramSetC', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetC, THolderGostR34102001CryptoProB.Instance);
+  DefineCurve('Tc26-Gost-3410-12-256-paramSetD', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_256ParamSetD, THolderGostR34102001CryptoProC.Instance);
+  DefineCurve('Tc26-Gost-3410-12-512-paramSetA', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetA, THolderIdTc26Gost341012512ParamSetA.Instance);
+  DefineCurve('Tc26-Gost-3410-12-512-paramSetB', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetB, THolderIdTc26Gost341012512ParamSetB.Instance);
+  DefineCurve('Tc26-Gost-3410-12-512-paramSetC', TRosstandartObjectIdentifiers.IdTc26Gost3410_12_512ParamSetC, THolderIdTc26Gost341012512ParamSetC.Instance);
 end;
 
 class constructor TECGost3410NamedCurves.CreateECGost3410NamedCurves;
 begin
-  TECGost3410NamedCurves.Boot;
+  Boot;
 end;
 
 class destructor TECGost3410NamedCurves.DestroyECGost3410NamedCurves;
 begin
-  Fparameters.Free;
-  FobjIds.Free;
-  Fnames.Free;
+  FObjIds.Free;
+  FCurves.Free;
+  FNames.Free;
+end;
+
+class function TECGost3410NamedCurves.GetNames: TCryptoLibStringArray;
+begin
+  Result := TCollectionUtilities.Keys<String, IDerObjectIdentifier>(FObjIds);
 end;
 
-class function TECGost3410NamedCurves.GetByName(const name: String)
-  : IECDomainParameters;
+class function TECGost3410NamedCurves.GetByName(const AName: String): IX9ECParameters;
 var
-  oid: IDerObjectIdentifier;
+  LOid: IDerObjectIdentifier;
 begin
-  if (FobjIds.TryGetValue(name, oid)) then
-  begin
-    Fparameters.TryGetValue(oid, Result);
-    Exit;
-  end;
-  Result := Nil;
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOid(LOid);
 end;
 
-class function TECGost3410NamedCurves.GetByOid(const oid: IDerObjectIdentifier)
-  : IECDomainParameters;
+class function TECGost3410NamedCurves.GetByNameLazy(const AName: String)
+  : IX9ECParametersHolder;
+var
+  LOid: IDerObjectIdentifier;
 begin
-  Fparameters.TryGetValue(oid, Result);
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOidLazy(LOid);
 end;
 
-class function TECGost3410NamedCurves.GetName
-  (const oid: IDerObjectIdentifier): String;
+class function TECGost3410NamedCurves.GetByOid(const AOid: IDerObjectIdentifier)
+  : IX9ECParameters;
+var
+  LHolder: IX9ECParametersHolder;
 begin
-  Fnames.TryGetValue(oid, Result);
+  LHolder := GetByOidLazy(AOid);
+  if LHolder = nil then
+    Result := nil
+  else
+    Result := LHolder.Parameters;
 end;
 
-class function TECGost3410NamedCurves.GetNames: TCryptoLibStringArray;
+class function TECGost3410NamedCurves.GetByOidLazy(const AOid: IDerObjectIdentifier)
+  : IX9ECParametersHolder;
 begin
-  Result := Fnames.Values.ToArray();
+  Result := TCollectionUtilities.GetValueOrNull<IDerObjectIdentifier, IX9ECParametersHolder>(FCurves, AOid);
 end;
 
-class function TECGost3410NamedCurves.GetOid(const name: String)
-  : IDerObjectIdentifier;
+class function TECGost3410NamedCurves.GetName(const AOid: IDerObjectIdentifier): String;
 begin
-  if (not(FobjIds.TryGetValue(name, Result))) then
-  begin
-    Result := Nil;
-  end;
+  if not FNames.TryGetValue(AOid, Result) then
+    Result := '';
+end;
+
+class function TECGost3410NamedCurves.GetOid(const AName: String): IDerObjectIdentifier;
+begin
+  if not FObjIds.TryGetValue(UpperCase(AName), Result) then
+    Result := nil;
+end;
+
+{ TECGost3410NamedCurves.THolderGostR34102001CryptoProA }
+
+function TECGost3410NamedCurves.THolderGostR34102001CryptoProA.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97');
+  LModQ := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6C611070995AD10045841B09B761B893');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD94'),
+    TECGost3410NamedCurves.FromHex('A6'),
+    LModQ, TBigInteger.One, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve, TBigInteger.One,
+    TECGost3410NamedCurves.FromHex('8D91E471E0989CDA27DF505A453F2B7635294F2DDF23E3B122ACC99C9E9F1E14'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderGostR34102001CryptoProA.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderGostR34102001CryptoProA.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderGostR34102001CryptoProB }
+
+function TECGost3410NamedCurves.THolderGostR34102001CryptoProB.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('8000000000000000000000000000000000000000000000000000000000000C99');
+  LModQ := TECGost3410NamedCurves.FromHex('800000000000000000000000000000015F700CFFF1A624E5E497161BCC8A198F');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('8000000000000000000000000000000000000000000000000000000000000C96'),
+    TECGost3410NamedCurves.FromHex('3E1AF419A269A5F866A7D3C25C3DF80AE979259373FF2B182F49D4CE7E1BBC8B'),
+    LModQ, TBigInteger.One, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve, TBigInteger.One,
+    TECGost3410NamedCurves.FromHex('3FA8124359F96680B83D1C3EB2C070E5C545C9858D03ECFB744BF8D717717EFC'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderGostR34102001CryptoProB.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderGostR34102001CryptoProB.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderGostR34102001CryptoProC }
+
+function TECGost3410NamedCurves.THolderGostR34102001CryptoProC.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D759B');
+  LModQ := TECGost3410NamedCurves.FromHex('9B9F605F5A858107AB1EC85E6B41C8AA582CA3511EDDFB74F02F3A6598980BB9');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('9B9F605F5A858107AB1EC85E6B41C8AACF846E86789051D37998F7B9022D7598'),
+    TECGost3410NamedCurves.FromHex('805A'),
+    LModQ, TBigInteger.One, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve, TBigInteger.Zero,
+    TECGost3410NamedCurves.FromHex('41ECE55743711A8C3CBF3783CD08C0EE4D4DC440D4641A8F366E550DFDB3BB67'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderGostR34102001CryptoProC.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderGostR34102001CryptoProC.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderIdTc26Gost341012256ParamSetA }
+
+function TECGost3410NamedCurves.THolderIdTc26Gost341012256ParamSetA.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD97');
+  LModQ := TECGost3410NamedCurves.FromHex('400000000000000000000000000000000FD8CDDFC87B6635C115AF556C360C67');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('C2173F1513981673AF4892C23035A27CE25E2013BF95AA33B22C656F277E7335'),
+    TECGost3410NamedCurves.FromHex('295F9BAE7428ED9CCC20E7C359A9D41A22FCCD9108E17BF7BA9337A6F8AE9513'),
+    LModQ, TBigInteger.Four, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve,
+    TECGost3410NamedCurves.FromHex('91E38443A5E82C0D880923425712B2BB658B9196932E02C78B2582FE742DAA28'),
+    TECGost3410NamedCurves.FromHex('32879423AB1A0375895786C4BB46E9565FDE0B5344766740AF268ADB32322E5C'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderIdTc26Gost341012256ParamSetA.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderIdTc26Gost341012256ParamSetA.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetA }
+
+function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetA.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7');
+  LModQ := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF27E69532F48D89116FF22B8D4E0560609B4B38ABFAD2B85DCACDB1411F10B275');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC4'),
+    TECGost3410NamedCurves.FromHex('E8C2505DEDFC86DDC1BD0B2B6667F1DA34B82574761CB0E879BD081CFD0B6265EE3CB090F30D27614CB4574010DA90DD862EF9D4EBEE4761503190785A71C760'),
+    LModQ, TBigInteger.One, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve, TBigInteger.Three,
+    TECGost3410NamedCurves.FromHex('7503CFE87A836AE3A61B8816E25450E6CE5E1C93ACF1ABC1778064FDCBEFA921DF1626BE4FD036E93D75E6A50E3A41E98028FE5FC235F5B889A589CB5215F2A4'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetA.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderIdTc26Gost341012512ParamSetA.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetB }
+
+function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetB.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006F');
+  LModQ := TECGost3410NamedCurves.FromHex('800000000000000000000000000000000000000000000000000000000000000149A1EC142565A545ACFDB77BD9D40CFA8B996712101BEA0EC6346C54374F25BD');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006C'),
+    TECGost3410NamedCurves.FromHex('687D1B459DC841457E3E06CF6F5E2517B97C7D614AF138BCBF85DC806C4B289F3E965D2DB1416D217F8B276FAD1AB69C50F78BEE1FA3106EFB8CCBC7C5140116'),
+    LModQ, TBigInteger.One, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve, TBigInteger.Two,
+    TECGost3410NamedCurves.FromHex('1A8F7EDA389B094C2C071E3647A8940F3C123B697578C213BE6DD9E6C8EC7335DCB228FD1EDF4A39152CBCAAF8C0398828041055F94CEEEC7E21340780FE41BD'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetB.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderIdTc26Gost341012512ParamSetB.Create();
+end;
+
+{ TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetC }
+
+function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetC.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LModP, LModQ: TBigInteger;
+begin
+  LModP := TECGost3410NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFDC7');
+  LModQ := TECGost3410NamedCurves.FromHex('3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC98CDBA46506AB004C33A9FF5147502CC8EDA9E7A769A12694623CEF47F023ED');
+  LBaseCurve := TFpCurve.Create(LModP,
+    TECGost3410NamedCurves.FromHex('DC9203E514A721875485A529D2C722FB187BC8980EB866644DE41C68E143064546E861C0E2C9EDD92ADE71F46FCF50FF2AD97F951FDA9F2A2EB6546F39689BD3'),
+    TECGost3410NamedCurves.FromHex('B4C4EE28CEBC6C2C8AC12952CF37F16AC7EFB6A9F69F4B57FFDA2E4F0DE5ADE038CBC2FFF719D2C18DE0284B8BFEF3B52B8CC7A5F5BF0A3C8D2319A5312557E1'),
+    LModQ, TBigInteger.Four, True);
+  LCurve := TECGost3410NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TECGost3410NamedCurves.ConfigureBasepoint(LCurve,
+    TECGost3410NamedCurves.FromHex('E2E31EDFC23DE7BDEBE241CE593EF5DE2295B7A9CBAEF021D385F7074CEA043AA27272A7AE602BF2A7B9033DB9ED3610C6FB85487EAE97AAC5BC7928C1950148'),
+    TECGost3410NamedCurves.FromHex('F5CE40D95B5EB899ABBCCFF5911CB8577939804D6527378B8C108C3D2090FF9BE18E2D33E3021ED2EF32D85822423B6304F726AA854BAE07D0396E9A9ADDC40F'));
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TECGost3410NamedCurves.THolderIdTc26Gost341012512ParamSetC.Instance: IX9ECParametersHolder;
+begin
+  Result := THolderIdTc26Gost341012512ParamSetC.Create();
 end;
 
 end.

CryptoLib/src/Asn1/Nist/ClpNistNamedCurves.pas

@@ -26,64 +26,43 @@ uses
   Generics.Collections,
   ClpAsn1Comparers,
   ClpCryptoLibComparers,
-  ClpIX9ECAsn1Objects,
+  ClpCollectionUtilities,
   ClpSecNamedCurves,
+  ClpSecObjectIdentifiers,
   ClpCryptoLibTypes,
   ClpIAsn1Objects,
-  ClpSecObjectIdentifiers;
+  ClpIX9ECAsn1Objects,
+  ClpIX9ECParametersHolder;
 
 type
-
-  /// <summary>
-  /// Utility class for fetching curves using their NIST names as published
-  /// in FIPS-PUB 186-3
-  /// </summary>
   TNistNamedCurves = class sealed(TObject)
 
   strict private
-
-  class var
-    FobjIds: TDictionary<String, IDerObjectIdentifier>;
-    Fnames: TDictionary<IDerObjectIdentifier, String>;
+    class var
+      FObjIds: TDictionary<String, IDerObjectIdentifier>;
+      FNames: TDictionary<IDerObjectIdentifier, String>;
 
     class function GetNames: TCryptoLibStringArray; static; inline;
-
-    class procedure DefineCurveAlias(const name: String;
-      const oid: IDerObjectIdentifier); static; inline;
+    class procedure DefineCurveAlias(const AName: String;
+      const AOid: IDerObjectIdentifier); static;
 
     class procedure Boot; static;
-    class constructor CreateNistNamedCurves();
-    class destructor DestroyNistNamedCurves();
+    class constructor CreateNistNamedCurves;
+    class destructor DestroyNistNamedCurves;
 
   public
-
-    class function GetByName(const name: String): IX9ECParameters;
+    class function GetByName(const AName: String): IX9ECParameters;
       static; inline;
-    // /**
-    // * return the X9ECParameters object for the named curve represented by
-    // * the passed in object identifier. Null if the curve isn't present.
-    // *
-    // * @param oid an object identifier representing a named curve, if present.
-    // */
-    class function GetByOid(const oid: IDerObjectIdentifier): IX9ECParameters;
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder;
       static; inline;
-    // /**
-    // * return the object identifier signified by the passed in name. Null
-    // * if there is no object identifier associated with name.
-    // *
-    // * @return the object identifier associated with name, if present.
-    // */
-    class function GetOid(const name: String): IDerObjectIdentifier;
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
       static; inline;
-    // /**
-    // * return the named curve name represented by the given object identifier.
-    // */
-    class function GetName(const oid: IDerObjectIdentifier): String;
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier)
+      : IX9ECParametersHolder; static; inline;
+    class function GetName(const AOid: IDerObjectIdentifier): String;
+      static; inline;
+    class function GetOid(const AName: String): IDerObjectIdentifier;
       static; inline;
-    // /**
-    // * returns an enumeration containing the name strings for curves
-    // * contained in this structure.
-    // */
     class property Names: TCryptoLibStringArray read GetNames;
 
   end;
@@ -92,62 +71,22 @@ implementation
 
 { TNistNamedCurves }
 
-class procedure TNistNamedCurves.DefineCurveAlias(const name: String;
-  const oid: IDerObjectIdentifier);
-begin
-  FobjIds.Add(UpperCase(name), oid);
-  Fnames.Add(oid, name);
-end;
-
-class function TNistNamedCurves.GetByOid(const oid: IDerObjectIdentifier)
-  : IX9ECParameters;
-begin
-  result := TSecNamedCurves.GetByOid(oid);
-end;
-
-class function TNistNamedCurves.GetOid(const name: String)
-  : IDerObjectIdentifier;
-begin
-  if not(FobjIds.TryGetValue(UpperCase(name), result)) then
-  begin
-    result := Nil;
-  end;
-end;
-
-class function TNistNamedCurves.GetByName(const name: String): IX9ECParameters;
+class procedure TNistNamedCurves.DefineCurveAlias(const AName: String;
+  const AOid: IDerObjectIdentifier);
 var
-  oid: IDerObjectIdentifier;
-begin
-  oid := GetOid(name);
-  if oid = Nil then
-  begin
-    result := Nil;
-  end
-  else
-  begin
-    result := GetByOid(oid);
-  end;
-
-end;
-
-class function TNistNamedCurves.GetName(const oid
-  : IDerObjectIdentifier): String;
-begin
-  if not(Fnames.TryGetValue(oid, result)) then
-  begin
-    result := '';
-  end;
-end;
-
-class function TNistNamedCurves.GetNames: TCryptoLibStringArray;
+  LName: String;
 begin
-  result := Fnames.Values.ToArray();
+  if TSecNamedCurves.GetByOidLazy(AOid) = nil then
+    raise EInvalidOperationCryptoLibException.Create('NIST alias OID not in SEC registry');
+  LName := AName;
+  FNames.Add(AOid, LName);
+  FObjIds.Add(LName, AOid);
 end;
 
 class procedure TNistNamedCurves.Boot;
 begin
-  FobjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
-  Fnames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
+  FObjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
+  FNames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
 
   DefineCurveAlias('B-163', TSecObjectIdentifiers.SecT163r2);
   DefineCurveAlias('B-233', TSecObjectIdentifiers.SecT233r1);
@@ -170,13 +109,71 @@ end;
 
 class constructor TNistNamedCurves.CreateNistNamedCurves;
 begin
-  TNistNamedCurves.Boot;
+  Boot;
 end;
 
 class destructor TNistNamedCurves.DestroyNistNamedCurves;
 begin
-  FobjIds.Free;
-  Fnames.Free;
+  FObjIds.Free;
+  FNames.Free;
+end;
+
+class function TNistNamedCurves.GetNames: TCryptoLibStringArray;
+begin
+  Result := TCollectionUtilities.Keys<String, IDerObjectIdentifier>(FObjIds);
+end;
+
+class function TNistNamedCurves.GetByName(const AName: String): IX9ECParameters;
+var
+  LOid: IDerObjectIdentifier;
+begin
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOid(LOid);
+end;
+
+class function TNistNamedCurves.GetByNameLazy(const AName: String)
+  : IX9ECParametersHolder;
+var
+  LOid: IDerObjectIdentifier;
+begin
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOidLazy(LOid);
+end;
+
+class function TNistNamedCurves.GetByOid(const AOid: IDerObjectIdentifier)
+  : IX9ECParameters;
+begin
+  if FNames.ContainsKey(AOid) then
+    Result := TSecNamedCurves.GetByOid(AOid)
+  else
+    Result := nil;
+end;
+
+class function TNistNamedCurves.GetByOidLazy(const AOid: IDerObjectIdentifier)
+  : IX9ECParametersHolder;
+begin
+  if FNames.ContainsKey(AOid) then
+    Result := TSecNamedCurves.GetByOidLazy(AOid)
+  else
+    Result := nil;
+end;
+
+class function TNistNamedCurves.GetName(const AOid: IDerObjectIdentifier): String;
+begin
+  if not FNames.TryGetValue(AOid, Result) then
+    Result := '';
+end;
+
+class function TNistNamedCurves.GetOid(const AName: String): IDerObjectIdentifier;
+begin
+  if not FObjIds.TryGetValue(UpperCase(AName), Result) then
+    Result := nil;
 end;
 
 end.

CryptoLib/src/Asn1/TeleTrust/ClpTeleTrusTNamedCurves.pas

@@ -26,12 +26,13 @@ uses
   Generics.Collections,
   ClpAsn1Comparers,
   ClpCryptoLibComparers,
+  ClpCollectionUtilities,
   ClpEncoders,
   ClpTeleTrusTObjectIdentifiers,
   ClpCryptoLibTypes,
   ClpBigInteger,
-  ClpWnafUtilities,
   ClpECCurve,
+  ClpWnafUtilities,
   ClpIECCore,
   ClpIAsn1Objects,
   ClpX9ECAsn1Objects,
@@ -40,940 +41,633 @@ uses
   ClpIX9ECParametersHolder;
 
 type
-
-  /// <summary>
-  /// elliptic curves defined in 'ECC Brainpool Standard Curves and Curve
-  /// Generation' <br /><see href="http://www.ecc-brainpool.org/download/draft_pkix_additional_ecc_dp.txt" />
-  /// </summary>
+  /// <summary>Elliptic curve registry for curves defined in ECC Brainpool Standard.</summary>
   TTeleTrusTNamedCurves = class sealed(TObject)
 
   strict private
-
-  class var
-    FobjIds: TDictionary<String, IDerObjectIdentifier>;
-    Fnames: TDictionary<IDerObjectIdentifier, String>;
-    Fcurves: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
+    class var
+      FObjIds: TDictionary<String, IDerObjectIdentifier>;
+      FCurves: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
+      FNames: TDictionary<IDerObjectIdentifier, String>;
 
     class function GetNames: TCryptoLibStringArray; static; inline;
-    class procedure DefineCurve(const name: String;
-      const oid: IDerObjectIdentifier; const holder: IX9ECParametersHolder);
-      static; inline;
-
-    class function ConfigureCurve(const curve: IECCurve): IECCurve;
+    class function FromHex(const AHex: String): TBigInteger; static;
+    class function ConfigureBasepoint(const ACurve: IECCurve;
+      const AEncoding: String): IX9ECPoint; static;
+    class function ConfigureCurve(const ACurve: IECCurve): IECCurve;
       static; inline;
+    class procedure DefineCurve(const AName: String;
+      const AOid: IDerObjectIdentifier;
+      const AHolder: IX9ECParametersHolder); static;
 
-    class function ConfigureBasepoint(const curve: IECCurve;
-      const encoding: String): IX9ECPoint; static;
-
-    class procedure Boot(); static;
-    class constructor CreateTeleTrusTNamedCurves();
-    class destructor DestroyTeleTrusTNamedCurves();
+    class procedure Boot; static;
+    class constructor CreateTeleTrusTNamedCurves;
+    class destructor DestroyTeleTrusTNamedCurves;
 
   public
-    class function GetByName(const name: String): IX9ECParameters;
+    class function GetByName(const AName: String): IX9ECParameters;
+      static; inline;
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder;
       static; inline;
-    // /**
-    // * return the X9ECParameters object for the named curve represented by
-    // * the passed in object identifier. Null if the curve isn't present.
-    // *
-    // * @param oid an object identifier representing a named curve, if present.
-    // */
-    class function GetByOid(const oid: IDerObjectIdentifier): IX9ECParameters;
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
       static; inline;
-    // /**
-    // * return the object identifier signified by the passed in name. Null
-    // * if there is no object identifier associated with name.
-    // *
-    // * @return the object identifier associated with name, if present.
-    // */
-    class function GetOid(const name: String): IDerObjectIdentifier;
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier)
+      : IX9ECParametersHolder; static; inline;
+    class function GetName(const AOid: IDerObjectIdentifier): String;
       static; inline;
-    // /**
-    // * return the named curve name represented by the given object identifier.
-    // */
-    class function GetName(const oid: IDerObjectIdentifier): String;
+    class function GetOid(const AName: String): IDerObjectIdentifier;
       static; inline;
-    // /**
-    // * returns an enumeration containing the name strings for curves
-    // * contained in this structure.
-    // */
     class property Names: TCryptoLibStringArray read GetNames;
 
-  type
-
-    /// <summary>
-    /// brainpoolP160r1
-    /// </summary>
-    TBrainpoolP160r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP160t1
-    /// </summary>
-    TBrainpoolP160t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP192r1
-    /// </summary>
-    TBrainpoolP192r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP192t1
-    /// </summary>
-    TBrainpoolP192t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP224r1
-    /// </summary>
-    TBrainpoolP224r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP224t1
-    /// </summary>
-    TBrainpoolP224t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP256r1
-    /// </summary>
-    TBrainpoolP256r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP256t1
-    /// </summary>
-    TBrainpoolP256t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP320r1
-    /// </summary>
-    TBrainpoolP320r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP320t1
-    /// </summary>
-    TBrainpoolP320t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP384r1
-    /// </summary>
-    TBrainpoolP384r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
-    end;
-
-  type
-
-    /// <summary>
-    /// brainpoolP384t1
-    /// </summary>
-    TBrainpoolP384t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
+type
+  TBrainpoolP160r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
+  TBrainpoolP160t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    public
-      class function Instance(): IX9ECParametersHolder; static;
+  TBrainpoolP192r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    end;
+  TBrainpoolP192t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-  type
+  TBrainpoolP224r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    /// <summary>
-    /// brainpoolP512r1
-    /// </summary>
-    TBrainpoolP512r1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
+  TBrainpoolP224t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
+  TBrainpoolP256r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    public
-      class function Instance(): IX9ECParametersHolder; static;
+  TBrainpoolP256t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    end;
+  TBrainpoolP320r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-  type
+  TBrainpoolP320t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    /// <summary>
-    /// brainpoolP512t1
-    /// </summary>
-    TBrainpoolP512t1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
+  TBrainpoolP384r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
+  TBrainpoolP384t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    public
-      class function Instance(): IX9ECParametersHolder; static;
+  TBrainpoolP512r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
-    end;
+  TBrainpoolP512t1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
 
   end;
 
 implementation
 
-{ TeleTrusTNamedCurves }
+{ TTeleTrusTNamedCurves }
+
+class function TTeleTrusTNamedCurves.FromHex(const AHex: String): TBigInteger;
+begin
+  Result := TBigInteger.Create(1, THex.Decode(AHex));
+end;
 
-class function TTeleTrusTNamedCurves.ConfigureBasepoint(const curve: IECCurve;
-  const encoding: String): IX9ECPoint;
+class function TTeleTrusTNamedCurves.ConfigureBasepoint(const ACurve: IECCurve;
+  const AEncoding: String): IX9ECPoint;
 begin
-  result := TX9ECPoint.Create(curve, THex.Decode(encoding));
-  TWnafUtilities.ConfigureBasepoint(result.Point);
+  Result := TX9ECPoint.Create(ACurve, THex.Decode(AEncoding));
+  TWnafUtilities.ConfigureBasepoint(Result.Point);
 end;
 
-class function TTeleTrusTNamedCurves.ConfigureCurve(const curve: IECCurve)
+class function TTeleTrusTNamedCurves.ConfigureCurve(const ACurve: IECCurve)
   : IECCurve;
 begin
-  result := curve;
+  Result := ACurve;
+end;
+
+class procedure TTeleTrusTNamedCurves.DefineCurve(const AName: String;
+  const AOid: IDerObjectIdentifier;
+  const AHolder: IX9ECParametersHolder);
+var
+  LName: String;
+begin
+  LName := AName;
+  FNames.Add(AOid, LName);
+  FCurves.Add(AOid, AHolder);
+  FObjIds.Add(LName, AOid);
+end;
+
+class procedure TTeleTrusTNamedCurves.Boot;
+begin
+  FObjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
+  FCurves := TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
+  FNames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
+
+  DefineCurve('brainpoolP160r1', TTeleTrusTObjectIdentifiers.BrainpoolP160R1, TBrainpoolP160r1Holder.Instance);
+  DefineCurve('brainpoolP160t1', TTeleTrusTObjectIdentifiers.BrainpoolP160T1, TBrainpoolP160t1Holder.Instance);
+  DefineCurve('brainpoolP192r1', TTeleTrusTObjectIdentifiers.BrainpoolP192R1, TBrainpoolP192r1Holder.Instance);
+  DefineCurve('brainpoolP192t1', TTeleTrusTObjectIdentifiers.BrainpoolP192T1, TBrainpoolP192t1Holder.Instance);
+  DefineCurve('brainpoolP224r1', TTeleTrusTObjectIdentifiers.BrainpoolP224R1, TBrainpoolP224r1Holder.Instance);
+  DefineCurve('brainpoolP224t1', TTeleTrusTObjectIdentifiers.BrainpoolP224T1, TBrainpoolP224t1Holder.Instance);
+  DefineCurve('brainpoolP256r1', TTeleTrusTObjectIdentifiers.BrainpoolP256R1, TBrainpoolP256r1Holder.Instance);
+  DefineCurve('brainpoolP256t1', TTeleTrusTObjectIdentifiers.BrainpoolP256T1, TBrainpoolP256t1Holder.Instance);
+  DefineCurve('brainpoolP320r1', TTeleTrusTObjectIdentifiers.BrainpoolP320R1, TBrainpoolP320r1Holder.Instance);
+  DefineCurve('brainpoolP320t1', TTeleTrusTObjectIdentifiers.BrainpoolP320T1, TBrainpoolP320t1Holder.Instance);
+  DefineCurve('brainpoolP384r1', TTeleTrusTObjectIdentifiers.BrainpoolP384R1, TBrainpoolP384r1Holder.Instance);
+  DefineCurve('brainpoolP384t1', TTeleTrusTObjectIdentifiers.BrainpoolP384T1, TBrainpoolP384t1Holder.Instance);
+  DefineCurve('brainpoolP512r1', TTeleTrusTObjectIdentifiers.BrainpoolP512R1, TBrainpoolP512r1Holder.Instance);
+  DefineCurve('brainpoolP512t1', TTeleTrusTObjectIdentifiers.BrainpoolP512T1, TBrainpoolP512t1Holder.Instance);
 end;
 
 class constructor TTeleTrusTNamedCurves.CreateTeleTrusTNamedCurves;
 begin
-  TTeleTrusTNamedCurves.Boot;
+  Boot;
 end;
 
 class destructor TTeleTrusTNamedCurves.DestroyTeleTrusTNamedCurves;
 begin
-  FobjIds.Free;
-  Fnames.Free;
-  Fcurves.Free;
+  FObjIds.Free;
+  FCurves.Free;
+  FNames.Free;
 end;
 
-class procedure TTeleTrusTNamedCurves.DefineCurve(const name: String;
-  const oid: IDerObjectIdentifier; const holder: IX9ECParametersHolder);
+class function TTeleTrusTNamedCurves.GetNames: TCryptoLibStringArray;
 begin
-  FobjIds.Add(UpperCase(name), oid);
-  Fnames.Add(oid, name);
-  Fcurves.Add(oid, holder);
+  Result := TCollectionUtilities.Keys<String, IDerObjectIdentifier>(FObjIds);
 end;
 
-class function TTeleTrusTNamedCurves.GetByOid(const oid: IDerObjectIdentifier)
-  : IX9ECParameters;
+class function TTeleTrusTNamedCurves.GetByName(const AName: String): IX9ECParameters;
 var
-  holder: IX9ECParametersHolder;
+  LOid: IDerObjectIdentifier;
 begin
-  if Fcurves.TryGetValue(oid, holder) then
-  begin
-    result := holder.Parameters
-  end
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
   else
-  begin
-    result := Nil;
-  end;
+    Result := GetByOid(LOid);
 end;
 
-class function TTeleTrusTNamedCurves.GetOid(const name: String)
-  : IDerObjectIdentifier;
+class function TTeleTrusTNamedCurves.GetByNameLazy(const AName: String)
+  : IX9ECParametersHolder;
+var
+  LOid: IDerObjectIdentifier;
 begin
-  if not(FobjIds.TryGetValue(UpperCase(name), result)) then
-  begin
-    result := Nil;
-  end;
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOidLazy(LOid);
 end;
 
-class function TTeleTrusTNamedCurves.GetByName(const name: String)
+class function TTeleTrusTNamedCurves.GetByOid(const AOid: IDerObjectIdentifier)
   : IX9ECParameters;
 var
-  oid: IDerObjectIdentifier;
+  LHolder: IX9ECParametersHolder;
 begin
-  oid := GetOid(name);
-  if oid = Nil then
-  begin
-    result := Nil;
-  end
+  LHolder := GetByOidLazy(AOid);
+  if LHolder = nil then
+    Result := nil
   else
-  begin
-    result := GetByOid(oid);
-  end;
+    Result := LHolder.Parameters;
 end;
 
-class function TTeleTrusTNamedCurves.GetName
-  (const oid: IDerObjectIdentifier): String;
+class function TTeleTrusTNamedCurves.GetByOidLazy(const AOid: IDerObjectIdentifier)
+  : IX9ECParametersHolder;
 begin
-  if not(Fnames.TryGetValue(oid, result)) then
-  begin
-    result := '';
-  end;
+  Result := TCollectionUtilities.GetValueOrNull<IDerObjectIdentifier, IX9ECParametersHolder>(FCurves, AOid);
 end;
 
-class function TTeleTrusTNamedCurves.GetNames: TCryptoLibStringArray;
+class function TTeleTrusTNamedCurves.GetName(const AOid: IDerObjectIdentifier): String;
 begin
-  result := Fnames.Values.ToArray();
+  if not FNames.TryGetValue(AOid, Result) then
+    Result := '';
 end;
 
-class procedure TTeleTrusTNamedCurves.Boot;
+class function TTeleTrusTNamedCurves.GetOid(const AName: String): IDerObjectIdentifier;
 begin
-  FobjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
-  Fnames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
-  Fcurves := TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
-
-  DefineCurve('brainpoolP160r1', TTeleTrusTObjectIdentifiers.BrainpoolP160R1,
-    TBrainpoolP160r1Holder.Instance);
-  DefineCurve('brainpoolP160t1', TTeleTrusTObjectIdentifiers.BrainpoolP160T1,
-    TBrainpoolP160t1Holder.Instance);
-  DefineCurve('brainpoolP192r1', TTeleTrusTObjectIdentifiers.BrainpoolP192R1,
-    TBrainpoolP160t1Holder.Instance);
-  DefineCurve('brainpoolP192t1', TTeleTrusTObjectIdentifiers.BrainpoolP192T1,
-    TBrainpoolP192t1Holder.Instance);
-  DefineCurve('brainpoolP224r1', TTeleTrusTObjectIdentifiers.BrainpoolP224R1,
-    TBrainpoolP224r1Holder.Instance);
-  DefineCurve('brainpoolP224t1', TTeleTrusTObjectIdentifiers.BrainpoolP224T1,
-    TBrainpoolP224t1Holder.Instance);
-  DefineCurve('brainpoolP256r1', TTeleTrusTObjectIdentifiers.BrainpoolP256R1,
-    TBrainpoolP256r1Holder.Instance);
-  DefineCurve('brainpoolP256t1', TTeleTrusTObjectIdentifiers.BrainpoolP256T1,
-    TBrainpoolP256t1Holder.Instance);
-  DefineCurve('brainpoolP320r1', TTeleTrusTObjectIdentifiers.BrainpoolP320R1,
-    TBrainpoolP320r1Holder.Instance);
-  DefineCurve('brainpoolP320t1', TTeleTrusTObjectIdentifiers.BrainpoolP320T1,
-    TBrainpoolP320t1Holder.Instance);
-  DefineCurve('brainpoolP384r1', TTeleTrusTObjectIdentifiers.BrainpoolP384R1,
-    TBrainpoolP384r1Holder.Instance);
-  DefineCurve('brainpoolP384t1', TTeleTrusTObjectIdentifiers.BrainpoolP384T1,
-    TBrainpoolP384t1Holder.Instance);
-  DefineCurve('brainpoolP512r1', TTeleTrusTObjectIdentifiers.BrainpoolP512R1,
-    TBrainpoolP512r1Holder.Instance);
-  DefineCurve('brainpoolP512t1', TTeleTrusTObjectIdentifiers.BrainpoolP512T1,
-    TBrainpoolP512t1Holder.Instance);
-end;
-
-{ TeleTrusTNamedCurves.TBrainpoolP160r1Holder }
-
-function TTeleTrusTNamedCurves.TBrainpoolP160r1Holder.CreateParameters
-  : IX9ECParameters;
-var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create('E95E4A5F737059DC60DF5991D45029409E60FC09', 16);
-  h := TBigInteger.Create('01', 16);
+  if not FObjIds.TryGetValue(UpperCase(AName), Result) then
+    Result := nil;
+end;
 
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16), // q
-    TBigInteger.Create('340E7BE2A280EB74E2BE61BADA745D97E8F7C300', 16), // a
-    TBigInteger.Create('1E589A8595423412134FAA2DBDEC95C8D8675E58', 16), // b
-    n, h) as IFpCurve);
+{ TTeleTrusTNamedCurves.TBrainpoolP160r1Holder }
 
-  G := ConfigureBasepoint(curve,
+function TTeleTrusTNamedCurves.TBrainpoolP160r1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('E95E4A5F737059DC60DF5991D45029409E60FC09');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('E95E4A5F737059DC60DFC7AD95B3D8139515620F'),
+    TTeleTrusTNamedCurves.FromHex('340E7BE2A280EB74E2BE61BADA745D97E8F7C300'),
+    TTeleTrusTNamedCurves.FromHex('1E589A8595423412134FAA2DBDEC95C8D8675E58'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP160r1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP160r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP160r1Holder.Create();
+  Result := TBrainpoolP160r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP160t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP160t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP160t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP160t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create('E95E4A5F737059DC60DF5991D45029409E60FC09', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16), // q
-    TBigInteger.Create('E95E4A5F737059DC60DFC7AD95B3D8139515620C', 16), // a'
-    TBigInteger.Create('7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380', 16), // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('E95E4A5F737059DC60DF5991D45029409E60FC09');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('E95E4A5F737059DC60DFC7AD95B3D8139515620F'),
+    TTeleTrusTNamedCurves.FromHex('E95E4A5F737059DC60DFC7AD95B3D8139515620C'),
+    TTeleTrusTNamedCurves.FromHex('7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP160t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP160t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP160t1Holder.Create();
+  Result := TBrainpoolP160t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP192r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP192r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP192r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP192r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16), // q
-    TBigInteger.Create('6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF', 16),
-    // a
-    TBigInteger.Create('469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9', 16),
-    // b
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297'),
+    TTeleTrusTNamedCurves.FromHex('6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF'),
+    TTeleTrusTNamedCurves.FromHex('469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP192r1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP192r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP192r1Holder.Create();
+  Result := TBrainpoolP192r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP192t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP192t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP192t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP192t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16), // q
-    TBigInteger.Create('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294', 16),
-    // a'
-    TBigInteger.Create('13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79', 16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297'),
+    TTeleTrusTNamedCurves.FromHex('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294'),
+    TTeleTrusTNamedCurves.FromHex('13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP192t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP192t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP192t1Holder.Create();
+  Result := TBrainpoolP192t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP224r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP224r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP224r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP224r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16), // q
-    TBigInteger.Create
-    ('68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43', 16),
-    // a
-    TBigInteger.Create
-    ('2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B', 16),
-    // b
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF'),
+    TTeleTrusTNamedCurves.FromHex('68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43'),
+    TTeleTrusTNamedCurves.FromHex('2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP224r1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP224r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP224r1Holder.Create();
+  Result := TBrainpoolP224r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP224t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP224t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP224t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP224t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16), // q
-    TBigInteger.Create
-    ('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC', 16),
-    // a'
-    TBigInteger.Create
-    ('4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D', 16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF'),
+    TTeleTrusTNamedCurves.FromHex('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC'),
+    TTeleTrusTNamedCurves.FromHex('4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP224t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP224t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP224t1Holder.Create();
+  Result := TBrainpoolP224t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP256r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP256r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP256r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP256r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16),
-    // q
-    TBigInteger.Create
-    ('7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9', 16),
-    // a
-    TBigInteger.Create
-    ('26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6', 16),
-    // b
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377'),
+    TTeleTrusTNamedCurves.FromHex('7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9'),
+    TTeleTrusTNamedCurves.FromHex('26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP256r1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP256r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP256r1Holder.Create();
+  Result := TBrainpoolP256r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP256t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP256t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP256t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP256t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16),
-    // q
-    TBigInteger.Create
-    ('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374', 16),
-    // a'
-    TBigInteger.Create
-    ('662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04', 16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377'),
+    TTeleTrusTNamedCurves.FromHex('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374'),
+    TTeleTrusTNamedCurves.FromHex('662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP256t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP256t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP256t1Holder.Create();
+  Result := TBrainpoolP256t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP320r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP320r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP320r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP320r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-begin
-  n := TBigInteger.Create
-    ('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27',
-    16),
-    // q
-    TBigInteger.Create
-    ('3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4',
-    16),
-    // a
-    TBigInteger.Create
-    ('520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6',
-    16),
-    // b
-    n, h) as IFpCurve);
-
-  result := TX9ECParameters.Create(curve, TX9ECPoint.Create(curve,
-    THex.Decode
-    ('0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1')
-    ) as IX9ECPoint, // G
-    n, h);
-end;
-
-class function TTeleTrusTNamedCurves.TBrainpoolP320r1Holder.Instance
-  : IX9ECParametersHolder;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27'),
+    TTeleTrusTNamedCurves.FromHex('3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4'),
+    TTeleTrusTNamedCurves.FromHex('520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
+    '0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TTeleTrusTNamedCurves.TBrainpoolP320r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP320r1Holder.Create();
+  Result := TBrainpoolP320r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP320t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP320t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP320t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP320t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27',
-    16),
-    // q
-    TBigInteger.Create
-    ('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E24',
-    16),
-    // a'
-    TBigInteger.Create
-    ('A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353',
-    16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27'),
+    TTeleTrusTNamedCurves.FromHex('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E24'),
+    TTeleTrusTNamedCurves.FromHex('A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP320t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP320t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP320t1Holder.Create();
+  Result := TBrainpoolP320t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP384r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP384r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP384r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP384r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53',
-    16),
-    // q
-    TBigInteger.Create
-    ('7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826',
-    16),
-    // a
-    TBigInteger.Create
-    ('4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11',
-    16),
-    // b
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53'),
+    TTeleTrusTNamedCurves.FromHex('7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826'),
+    TTeleTrusTNamedCurves.FromHex('04A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP384r1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP384r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP384r1Holder.Create();
+  Result := TBrainpoolP384r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP384t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP384t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP384t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP384t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53',
-    16),
-    // q
-    TBigInteger.Create
-    ('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC50',
-    16),
-    // a'
-    TBigInteger.Create
-    ('7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE',
-    16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53'),
+    TTeleTrusTNamedCurves.FromHex('8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC50'),
+    TTeleTrusTNamedCurves.FromHex('7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
     '0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TTeleTrusTNamedCurves.TBrainpoolP384t1Holder.Instance
-  : IX9ECParametersHolder;
+class function TTeleTrusTNamedCurves.TBrainpoolP384t1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP384t1Holder.Create();
+  Result := TBrainpoolP384t1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP512r1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP512r1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP512r1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP512r1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
-    16),
-    // q
-    TBigInteger.Create
-    ('7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA',
-    16),
-    // a
-    TBigInteger.Create
-    ('3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723',
-    16),
-    // b
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
-    '0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF' +
-    '3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
-end;
-
-class function TTeleTrusTNamedCurves.TBrainpoolP512r1Holder.Instance
-  : IX9ECParametersHolder;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3'),
+    TTeleTrusTNamedCurves.FromHex('7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA'),
+    TTeleTrusTNamedCurves.FromHex('3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
+    '0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D504740' + '6A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TTeleTrusTNamedCurves.TBrainpoolP512r1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TBrainpoolP512r1Holder.Create();
+  Result := TBrainpoolP512r1Holder.Create();
 end;
 
-{ TeleTrusTNamedCurves.TBrainpoolP512t1Holder }
+{ TTeleTrusTNamedCurves.TBrainpoolP512t1Holder }
 
-function TTeleTrusTNamedCurves.TBrainpoolP512t1Holder.CreateParameters
-  : IX9ECParameters;
+function TTeleTrusTNamedCurves.TBrainpoolP512t1Holder.CreateParameters: IX9ECParameters;
 var
-  n, h: TBigInteger;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  n := TBigInteger.Create
-    ('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
-    16);
-  h := TBigInteger.Create('01', 16);
-
-  curve := ConfigureCurve
-    (TFpCurve.Create(TBigInteger.Create
-    ('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
-    16),
-    // q
-    TBigInteger.Create
-    ('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0',
-    16),
-    // a'
-    TBigInteger.Create
-    ('7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E',
-    16),
-    // b'
-    n, h) as IFpCurve);
-
-  G := ConfigureBasepoint(curve,
-    '04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5'
-    + 'B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332');
-
-  result := TX9ECParameters.Create(curve, G, n, h);
-end;
-
-class function TTeleTrusTNamedCurves.TBrainpoolP512t1Holder.Instance
-  : IX9ECParametersHolder;
-begin
-  result := TBrainpoolP512t1Holder.Create();
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TTeleTrusTNamedCurves.FromHex('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069');
+  LBaseCurve := TFpCurve.Create(
+    TTeleTrusTNamedCurves.FromHex('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3'),
+    TTeleTrusTNamedCurves.FromHex('AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0'),
+    TTeleTrusTNamedCurves.FromHex('7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E'),
+    LN, TBigInteger.One, True);
+  LCurve := TTeleTrusTNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TTeleTrusTNamedCurves.ConfigureBasepoint(LCurve,
+    '04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26' + 'F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TTeleTrusTNamedCurves.TBrainpoolP512t1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TBrainpoolP512t1Holder.Create();
 end;
 
 end.

CryptoLib/src/Asn1/X9/ClpECNamedCurveTable.pas

@@ -24,11 +24,15 @@ interface
 uses
   Generics.Collections,
   ClpCryptoLibTypes,
+  ClpCollectionUtilities,
   ClpSecNamedCurves,
   ClpNistNamedCurves,
   ClpTeleTrusTNamedCurves,
+  ClpECGost3410NamedCurves,
+  ClpX962NamedCurves,
   ClpIAsn1Objects,
-  ClpIX9ECAsn1Objects;
+  ClpIX9ECAsn1Objects,
+  ClpIX9ECParametersHolder;
 
 type
   /// <summary>
@@ -41,39 +45,25 @@ type
     class function GetNames: TCryptoLibStringArray; static;
 
   public
-    // /**
-    // * return a X9ECParameters object representing the passed in named
-    // * curve. The routine returns null if the curve is not present.
-    // *
-    // * @param name the name of the curve requested
-    // * @return an X9ECParameters object or null if the curve is not available.
-    // */
-    class function GetByName(const name: String): IX9ECParameters; static;
-
-    // /**
-    // * return the object identifier signified by the passed in name. Null
-    // * if there is no object identifier associated with name.
-    // *
-    // * @return the object identifier associated with name, if present.
-    // */
-    class function GetOid(const name: String): IDerObjectIdentifier; static;
-
-    // /**
-    // * return a X9ECParameters object representing the passed in named
-    // * curve.
-    // *
-    // * @param oid the object id of the curve requested
-    // * @return an X9ECParameters object or null if the curve is not available.
-    // */
-
-    class function GetByOid(const oid: IDerObjectIdentifier)
-      : IX9ECParameters; static;
-
-    // /**
-    // * return an enumeration of the names of the available curves.
-    // *
-    // * @return an enumeration of the names of the available curves.
-    // */
+    /// <summary>Look up the X9ECParameters for the curve with the given name.</summary>
+    class function GetByName(const AName: String): IX9ECParameters; static;
+
+    /// <summary>Look up an X9ECParametersHolder for the curve with the given name (lazy).</summary>
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder; static;
+
+    /// <summary>Look up the X9ECParameters for the curve with the given OID.</summary>
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters; static;
+
+    /// <summary>Look up an X9ECParametersHolder for the curve with the given OID (lazy).</summary>
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder; static;
+
+    /// <summary>Look up the name of the curve with the given OID.</summary>
+    class function GetName(const AOid: IDerObjectIdentifier): String; static;
+
+    /// <summary>Look up the OID of the curve with the given name.</summary>
+    class function GetOid(const AName: String): IDerObjectIdentifier; static;
+
+    /// <summary>Enumerate the available curve names in all the registries.</summary>
     class property Names: TCryptoLibStringArray read GetNames;
 
   end;
@@ -82,77 +72,115 @@ implementation
 
 { TECNamedCurveTable }
 
-class function TECNamedCurveTable.GetByName(const name: String)
-  : IX9ECParameters;
+class function TECNamedCurveTable.GetByName(const AName: String): IX9ECParameters;
 var
-  ecP: IX9ECParameters;
+  LEcP: IX9ECParameters;
 begin
-  ecP := TSecNamedCurves.GetByName(name);
-
-  if (ecP = Nil) then
-  begin
-    ecP := TNistNamedCurves.GetByName(name);
-  end;
-
-  if (ecP = Nil) then
-  begin
-    ecP := TTeleTrusTNamedCurves.GetByName(name);
-  end;
+  LEcP := TX962NamedCurves.GetByName(AName);
+  if LEcP = nil then
+    LEcP := TSecNamedCurves.GetByName(AName);
+  if LEcP = nil then
+    LEcP := TNistNamedCurves.GetByName(AName);
+  if LEcP = nil then
+    LEcP := TTeleTrusTNamedCurves.GetByName(AName);
+  if LEcP = nil then
+    LEcP := TECGost3410NamedCurves.GetByName(AName);
+  Result := LEcP;
+end;
 
-  result := ecP;
+class function TECNamedCurveTable.GetByNameLazy(const AName: String): IX9ECParametersHolder;
+var
+  LHolder: IX9ECParametersHolder;
+begin
+  LHolder := TX962NamedCurves.GetByNameLazy(AName);
+  if LHolder = nil then
+    LHolder := TSecNamedCurves.GetByNameLazy(AName);
+  if LHolder = nil then
+    LHolder := TNistNamedCurves.GetByNameLazy(AName);
+  if LHolder = nil then
+    LHolder := TTeleTrusTNamedCurves.GetByNameLazy(AName);
+  if LHolder = nil then
+    LHolder := TECGost3410NamedCurves.GetByNameLazy(AName);
+  Result := LHolder;
 end;
 
-class function TECNamedCurveTable.GetByOid(const oid: IDerObjectIdentifier)
-  : IX9ECParameters;
+class function TECNamedCurveTable.GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
 var
-  ecP: IX9ECParameters;
+  LEcP: IX9ECParameters;
 begin
-  ecP := TSecNamedCurves.GetByOid(oid);
+  LEcP := TX962NamedCurves.GetByOid(AOid);
+  if LEcP = nil then
+    LEcP := TSecNamedCurves.GetByOid(AOid);
   // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup
-
-  if (ecP = Nil) then
-  begin
-    ecP := TTeleTrusTNamedCurves.GetByOid(oid);
-  end;
-
-  result := ecP;
+  if LEcP = nil then
+    LEcP := TTeleTrusTNamedCurves.GetByOid(AOid);
+  if LEcP = nil then
+    LEcP := TECGost3410NamedCurves.GetByOid(AOid);
+  Result := LEcP;
 end;
 
-class function TECNamedCurveTable.GetOid(const name: String)
-  : IDerObjectIdentifier;
+class function TECNamedCurveTable.GetByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder;
 var
-  oid: IDerObjectIdentifier;
+  LHolder: IX9ECParametersHolder;
 begin
+  LHolder := TX962NamedCurves.GetByOidLazy(AOid);
+  if LHolder = nil then
+    LHolder := TSecNamedCurves.GetByOidLazy(AOid);
+  // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup
+  if LHolder = nil then
+    LHolder := TTeleTrusTNamedCurves.GetByOidLazy(AOid);
+  if LHolder = nil then
+    LHolder := TECGost3410NamedCurves.GetByOidLazy(AOid);
+  Result := LHolder;
+end;
 
-  oid := TSecNamedCurves.GetOid(name);
-
-  if (oid = Nil) then
-  begin
-    oid := TNistNamedCurves.GetOid(name);
-  end;
-
-  if (oid = Nil) then
-  begin
-    oid := TTeleTrusTNamedCurves.GetOid(name);
-  end;
+class function TECNamedCurveTable.GetName(const AOid: IDerObjectIdentifier): String;
+var
+  LName: String;
+begin
+  LName := TX962NamedCurves.GetName(AOid);
+  if LName = '' then
+    LName := TSecNamedCurves.GetName(AOid);
+  if LName = '' then
+    LName := TNistNamedCurves.GetName(AOid);
+  if LName = '' then
+    LName := TTeleTrusTNamedCurves.GetName(AOid);
+  if LName = '' then
+    LName := TECGost3410NamedCurves.GetName(AOid);
+  Result := LName;
+end;
 
-  result := oid;
+class function TECNamedCurveTable.GetOid(const AName: String): IDerObjectIdentifier;
+var
+  LOid: IDerObjectIdentifier;
+begin
+  LOid := TX962NamedCurves.GetOid(AName);
+  if LOid = nil then
+    LOid := TSecNamedCurves.GetOid(AName);
+  if LOid = nil then
+    LOid := TNistNamedCurves.GetOid(AName);
+  if LOid = nil then
+    LOid := TTeleTrusTNamedCurves.GetOid(AName);
+  if LOid = nil then
+    LOid := TECGost3410NamedCurves.GetOid(AName);
+  Result := LOid;
 end;
 
 class function TECNamedCurveTable.GetNames: TCryptoLibStringArray;
 var
-  temp: TList<String>;
+  LTemp: TList<String>;
 begin
-  temp := TList<String>.Create();
+  LTemp := TList<String>.Create();
   try
-    temp.AddRange(TSecNamedCurves.Names);
-    temp.AddRange(TNistNamedCurves.Names);
-    temp.AddRange(TTeleTrusTNamedCurves.Names);
-    result := temp.ToArray;
+    LTemp.AddRange(TX962NamedCurves.Names);
+    LTemp.AddRange(TSecNamedCurves.Names);
+    LTemp.AddRange(TNistNamedCurves.Names);
+    LTemp.AddRange(TTeleTrusTNamedCurves.Names);
+    LTemp.AddRange(TECGost3410NamedCurves.Names);
+    Result := TCollectionUtilities.ToArray<String>(LTemp);
   finally
-    temp.Free;
+    LTemp.Free;
   end;
-
 end;
 
 end.

CryptoLib/src/Asn1/X9/ClpX962NamedCurves.pas

@@ -0,0 +1,971 @@
+{ *********************************************************************************** }
+{ *                              CryptoLib Library                                  * }
+{ *                Copyright (c) 2018 - 20XX Ugochukwu Mmaduekwe                    * }
+{ *                 Github Repository <https://github.com/Xor-el>                   * }
+
+{ *  Distributed under the MIT software license, see the accompanying file LICENSE  * }
+{ *          or visit http://www.opensource.org/licenses/mit-license.php.           * }
+
+{ *                              Acknowledgements:                                  * }
+{ *                                                                                 * }
+{ *      Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring     * }
+{ *                           development of this library                           * }
+
+{ * ******************************************************************************* * }
+
+(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
+
+unit ClpX962NamedCurves;
+
+{$I ..\..\Include\CryptoLib.inc}
+
+interface
+
+uses
+  SysUtils,
+  Generics.Collections,
+  ClpAsn1Comparers,
+  ClpCryptoLibComparers,
+  ClpCollectionUtilities,
+  ClpEncoders,
+  ClpX9ObjectIdentifiers,
+  ClpCryptoLibTypes,
+  ClpBigInteger,
+  ClpECCurve,
+  ClpWnafUtilities,
+  ClpIECCore,
+  ClpIAsn1Objects,
+  ClpX9ECAsn1Objects,
+  ClpIX9ECAsn1Objects,
+  ClpX9ECParametersHolder,
+  ClpIX9ECParametersHolder;
+
+type
+  /// <summary>Elliptic curve registry for the curves defined in X.962 EC-DSA.</summary>
+  TX962NamedCurves = class sealed(TObject)
+
+  strict private
+    class var
+      FObjIds: TDictionary<String, IDerObjectIdentifier>;
+      FCurves: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
+      FNames: TDictionary<IDerObjectIdentifier, String>;
+
+    class function GetNames: TCryptoLibStringArray; static; inline;
+    class function FromHex(const AHex: String): TBigInteger; static;
+    class function ConfigureBasepoint(const ACurve: IECCurve;
+      const AEncoding: String): IX9ECPoint; static;
+    class function ConfigureCurve(const ACurve: IECCurve): IECCurve;
+      static; inline;
+    class procedure DefineCurve(const AName: String;
+      const AOid: IDerObjectIdentifier;
+      const AHolder: IX9ECParametersHolder); static;
+
+    class procedure Boot; static;
+    class constructor CreateX962NamedCurves;
+    class destructor DestroyX962NamedCurves;
+
+  public
+    class function GetByName(const AName: String): IX9ECParameters;
+      static; inline;
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder;
+      static; inline;
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
+      static; inline;
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier)
+      : IX9ECParametersHolder; static; inline;
+    class function GetName(const AOid: IDerObjectIdentifier): String;
+      static; inline;
+    class function GetOid(const AName: String): IDerObjectIdentifier;
+      static; inline;
+    class property Names: TCryptoLibStringArray read GetNames;
+
+type
+  TPrime192v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime192v2Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime192v3Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime239v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime239v2Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime239v3Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TPrime256v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb163v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb163v2Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb163v3Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb176w1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb191v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb191v2Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb191v3Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb208w1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb239v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb239v2Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb239v3Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb272w1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb304w1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb359v1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2pnb368w1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  TC2tnb431r1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+  strict protected
+    function CreateParameters(): IX9ECParameters; override;
+  public
+    class function Instance(): IX9ECParametersHolder; static;
+  end;
+
+  end;
+
+implementation
+
+{ TX962NamedCurves }
+
+class function TX962NamedCurves.FromHex(const AHex: String): TBigInteger;
+begin
+  Result := TBigInteger.Create(1, THex.Decode(AHex));
+end;
+
+class function TX962NamedCurves.ConfigureBasepoint(const ACurve: IECCurve;
+  const AEncoding: String): IX9ECPoint;
+begin
+  Result := TX9ECPoint.Create(ACurve, THex.Decode(AEncoding));
+  TWnafUtilities.ConfigureBasepoint(Result.Point);
+end;
+
+class function TX962NamedCurves.ConfigureCurve(const ACurve: IECCurve): IECCurve;
+begin
+  Result := ACurve;
+end;
+
+class procedure TX962NamedCurves.DefineCurve(const AName: String;
+  const AOid: IDerObjectIdentifier;
+  const AHolder: IX9ECParametersHolder);
+var
+  LName: String;
+begin
+  LName := AName;
+  FNames.Add(AOid, LName);
+  FCurves.Add(AOid, AHolder);
+  FObjIds.Add(UpperCase(LName), AOid);
+end;
+
+class procedure TX962NamedCurves.Boot;
+begin
+  FObjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
+  FCurves := TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
+  FNames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
+
+  DefineCurve('prime192v1', TX9ObjectIdentifiers.Prime192v1, TPrime192v1Holder.Instance);
+  DefineCurve('prime192v2', TX9ObjectIdentifiers.Prime192v2, TPrime192v2Holder.Instance);
+  DefineCurve('prime192v3', TX9ObjectIdentifiers.Prime192v3, TPrime192v3Holder.Instance);
+  DefineCurve('prime239v1', TX9ObjectIdentifiers.Prime239v1, TPrime239v1Holder.Instance);
+  DefineCurve('prime239v2', TX9ObjectIdentifiers.Prime239v2, TPrime239v2Holder.Instance);
+  DefineCurve('prime239v3', TX9ObjectIdentifiers.Prime239v3, TPrime239v3Holder.Instance);
+  DefineCurve('prime256v1', TX9ObjectIdentifiers.Prime256v1, TPrime256v1Holder.Instance);
+  DefineCurve('c2pnb163v1', TX9ObjectIdentifiers.C2Pnb163v1, TC2pnb163v1Holder.Instance);
+  DefineCurve('c2pnb163v2', TX9ObjectIdentifiers.C2Pnb163v2, TC2pnb163v2Holder.Instance);
+  DefineCurve('c2pnb163v3', TX9ObjectIdentifiers.C2Pnb163v3, TC2pnb163v3Holder.Instance);
+  DefineCurve('c2pnb176w1', TX9ObjectIdentifiers.C2Pnb176w1, TC2pnb176w1Holder.Instance);
+  DefineCurve('c2tnb191v1', TX9ObjectIdentifiers.C2Tnb191v1, TC2tnb191v1Holder.Instance);
+  DefineCurve('c2tnb191v2', TX9ObjectIdentifiers.C2Tnb191v2, TC2tnb191v2Holder.Instance);
+  DefineCurve('c2tnb191v3', TX9ObjectIdentifiers.C2Tnb191v3, TC2tnb191v3Holder.Instance);
+  DefineCurve('c2pnb208w1', TX9ObjectIdentifiers.C2Pnb208w1, TC2pnb208w1Holder.Instance);
+  DefineCurve('c2tnb239v1', TX9ObjectIdentifiers.C2Tnb239v1, TC2tnb239v1Holder.Instance);
+  DefineCurve('c2tnb239v2', TX9ObjectIdentifiers.C2Tnb239v2, TC2tnb239v2Holder.Instance);
+  DefineCurve('c2tnb239v3', TX9ObjectIdentifiers.C2Tnb239v3, TC2tnb239v3Holder.Instance);
+  DefineCurve('c2pnb272w1', TX9ObjectIdentifiers.C2Pnb272w1, TC2pnb272w1Holder.Instance);
+  DefineCurve('c2pnb304w1', TX9ObjectIdentifiers.C2Pnb304w1, TC2pnb304w1Holder.Instance);
+  DefineCurve('c2tnb359v1', TX9ObjectIdentifiers.C2Tnb359v1, TC2tnb359v1Holder.Instance);
+  DefineCurve('c2pnb368w1', TX9ObjectIdentifiers.C2Pnb368w1, TC2pnb368w1Holder.Instance);
+  DefineCurve('c2tnb431r1', TX9ObjectIdentifiers.C2Tnb431r1, TC2tnb431r1Holder.Instance);
+end;
+
+class constructor TX962NamedCurves.CreateX962NamedCurves;
+begin
+  Boot;
+end;
+
+class destructor TX962NamedCurves.DestroyX962NamedCurves;
+begin
+  FObjIds.Free;
+  FCurves.Free;
+  FNames.Free;
+end;
+
+class function TX962NamedCurves.GetNames: TCryptoLibStringArray;
+begin
+  Result := TCollectionUtilities.Keys<String, IDerObjectIdentifier>(FObjIds);
+end;
+
+class function TX962NamedCurves.GetByName(const AName: String): IX9ECParameters;
+var
+  LOid: IDerObjectIdentifier;
+begin
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOid(LOid);
+end;
+
+class function TX962NamedCurves.GetByNameLazy(const AName: String): IX9ECParametersHolder;
+var
+  LOid: IDerObjectIdentifier;
+begin
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOidLazy(LOid);
+end;
+
+class function TX962NamedCurves.GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
+var
+  LHolder: IX9ECParametersHolder;
+begin
+  LHolder := GetByOidLazy(AOid);
+  if LHolder = nil then
+    Result := nil
+  else
+    Result := LHolder.Parameters;
+end;
+
+class function TX962NamedCurves.GetByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder;
+begin
+  Result := TCollectionUtilities.GetValueOrNull<IDerObjectIdentifier, IX9ECParametersHolder>(FCurves, AOid);
+end;
+
+class function TX962NamedCurves.GetName(const AOid: IDerObjectIdentifier): String;
+begin
+  if not FNames.TryGetValue(AOid, Result) then
+    Result := '';
+end;
+
+class function TX962NamedCurves.GetOid(const AName: String): IDerObjectIdentifier;
+begin
+  if not FObjIds.TryGetValue(UpperCase(AName), Result) then
+    Result := nil;
+end;
+
+{ TX962NamedCurves.TPrime192v1Holder }
+
+function TX962NamedCurves.TPrime192v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LN := TX962NamedCurves.FromHex('ffffffffffffffffffffffff99def836146bc9b1b4d22831');
+  LBaseCurve := TFpCurve.Create(
+    TX962NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF'),
+    TX962NamedCurves.FromHex('fffffffffffffffffffffffffffffffefffffffffffffffc'),
+    TX962NamedCurves.FromHex('64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012');
+  LS := THex.Decode('3045AE6FC8422f64ED579528D38120EAE12196D5');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime192v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime192v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime192v2Holder }
+
+function TX962NamedCurves.TPrime192v2Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LN := TX962NamedCurves.FromHex('fffffffffffffffffffffffe5fb1a724dc80418648d8dd31');
+  LBaseCurve := TFpCurve.Create(
+    TX962NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF'),
+    TX962NamedCurves.FromHex('fffffffffffffffffffffffffffffffefffffffffffffffc'),
+    TX962NamedCurves.FromHex('cc22d6dfb95c6b25e49c0d6364a4e5980c393aa21668d953'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '03eea2bae7e1497842f2de7769cfe9c989c072ad696f48034a');
+  LS := THex.Decode('31a92ee2029fd10d901b113e990710f0d21ac6b6');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime192v2Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime192v2Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime192v3Holder }
+
+function TX962NamedCurves.TPrime192v3Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LN := TX962NamedCurves.FromHex('ffffffffffffffffffffffff7a62d031c83f4294f640ec13');
+  LBaseCurve := TFpCurve.Create(
+    TX962NamedCurves.FromHex('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF'),
+    TX962NamedCurves.FromHex('fffffffffffffffffffffffffffffffefffffffffffffffc'),
+    TX962NamedCurves.FromHex('22123dc2395a05caa7423daeccc94760a7d462256bd56916'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '027d29778100c65a1da1783716588dce2b8b4aee8e228f1896');
+  LS := THex.Decode('c469684435deb378c4b65ca9591e2a5763059a2e');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime192v3Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime192v3Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime239v1Holder }
+
+function TX962NamedCurves.TPrime239v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LQ: TBigInteger;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LQ := TBigInteger.Create('883423532389192164791648750360308885314476597252960362792450860609699839', 10);
+  LN := TX962NamedCurves.FromHex('7fffffffffffffffffffffff7fffff9e5e9a9f5d9071fbd1522688909d0b');
+  LBaseCurve := TFpCurve.Create(LQ,
+    TX962NamedCurves.FromHex('7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc'),
+    TX962NamedCurves.FromHex('6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf');
+  LS := THex.Decode('e43bb460f0b80cc0c0b075798e948060f8321b7d');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime239v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime239v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime239v2Holder }
+
+function TX962NamedCurves.TPrime239v2Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LQ: TBigInteger;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LQ := TBigInteger.Create('883423532389192164791648750360308885314476597252960362792450860609699839', 10);
+  LN := TX962NamedCurves.FromHex('7fffffffffffffffffffffff800000cfa7e8594377d414c03821bc582063');
+  LBaseCurve := TFpCurve.Create(LQ,
+    TX962NamedCurves.FromHex('7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc'),
+    TX962NamedCurves.FromHex('617fab6832576cbbfed50d99f0249c3fee58b94ba0038c7ae84c8c832f2c'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0238af09d98727705120c921bb5e9e26296a3cdcf2f35757a0eafd87b830e7');
+  LS := THex.Decode('e8b4011604095303ca3b8099982be09fcb9ae616');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime239v2Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime239v2Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime239v3Holder }
+
+function TX962NamedCurves.TPrime239v3Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LQ: TBigInteger;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LQ := TBigInteger.Create('883423532389192164791648750360308885314476597252960362792450860609699839', 10);
+  LN := TX962NamedCurves.FromHex('7fffffffffffffffffffffff7fffff975deb41b3a6057c3c432146526551');
+  LBaseCurve := TFpCurve.Create(LQ,
+    TX962NamedCurves.FromHex('7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc'),
+    TX962NamedCurves.FromHex('255705fa2a306654b1f4cb03d6a750a30c250102d4988717d9ba15ab6d3e'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '036768ae8e18bb92cfcf005c949aa2c6d94853d0e660bbf854b1c9505fe95a');
+  LS := THex.Decode('7d7374168ffe3471b60a857686a19475d3bfa2ff');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime239v3Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime239v3Holder.Create();
+end;
+
+{ TX962NamedCurves.TPrime256v1Holder }
+
+function TX962NamedCurves.TPrime256v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LQ: TBigInteger;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LQ := TBigInteger.Create('115792089210356248762697446949407573530086143415290314195533631308867097853951', 10);
+  LN := TX962NamedCurves.FromHex('ffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551');
+  LBaseCurve := TFpCurve.Create(LQ,
+    TX962NamedCurves.FromHex('ffffffff00000001000000000000000000000000fffffffffffffffffffffffc'),
+    TX962NamedCurves.FromHex('5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b'),
+    LN, TBigInteger.One, True);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '036b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296');
+  LS := THex.Decode('c49d360886e704936a6678e1139d26b7819f7e90');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TPrime256v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TPrime256v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb163v1Holder }
+
+function TX962NamedCurves.TC2pnb163v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LN := TX962NamedCurves.FromHex('0400000000000000000001E60FC8821CC74DAEAFC1');
+  LBaseCurve := TF2mCurve.Create(163, 1, 2, 8,
+    TX962NamedCurves.FromHex('072546B5435234A422E0789675F432C89435DE5242'),
+    TX962NamedCurves.FromHex('00C9517D06D5240D3CFF38C74B20B6CD4D6F9DD4D9'),
+    LN, TBigInteger.Two);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0307AF69989546103D79329FCC3D74880F33BBE803CB');
+  LS := THex.Decode('D2C0FB15760860DEF1EEF4D696E6768756151754');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TC2pnb163v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb163v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb163v2Holder }
+
+function TX962NamedCurves.TC2pnb163v2Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('03FFFFFFFFFFFFFFFFFFFDF64DE1151ADBB78F10A7');
+  LBaseCurve := TF2mCurve.Create(163, 1, 2, 8,
+    TX962NamedCurves.FromHex('0108B39E77C4B108BED981ED0E890E117C511CF072'),
+    TX962NamedCurves.FromHex('0667ACEB38AF4E488C407433FFAE4F1C811638DF20'),
+    LN, TBigInteger.Two);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '030024266E4EB5106D0A964D92C4860E2671DB9B6CC5');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb163v2Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb163v2Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb163v3Holder }
+
+function TX962NamedCurves.TC2pnb163v3Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('03FFFFFFFFFFFFFFFFFFFE1AEE140F110AFF961309');
+  LBaseCurve := TF2mCurve.Create(163, 1, 2, 8,
+    TX962NamedCurves.FromHex('07A526C63D3E25A256A007699F5447E32AE456B50E'),
+    TX962NamedCurves.FromHex('03F7061798EB99E238FD6F1BF95B48FEEB4854252B'),
+    LN, TBigInteger.Two);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0202F9F87B7C574D0BDECF8A22E6524775F98CDEBDCB');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb163v3Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb163v3Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb176w1Holder }
+
+function TX962NamedCurves.TC2pnb176w1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('010092537397ECA4F6145799D62B0A19CE06FE26AD');
+  LH := TBigInteger.ValueOf(Int64($FF6E));
+  LBaseCurve := TF2mCurve.Create(176, 1, 2, 43,
+    TX962NamedCurves.FromHex('E4E6DB2995065C407D9D39B8D0967B96704BA8E9C90B'),
+    TX962NamedCurves.FromHex('5DDA470ABE6414DE8EC133AE28E9BBD7FCEC0AE0FFF2'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '038D16C2866798B600F9F08BB4A8E860F3298CE04A5798');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb176w1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb176w1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb191v1Holder }
+
+function TX962NamedCurves.TC2tnb191v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LS: TCryptoLibByteArray;
+begin
+  LN := TX962NamedCurves.FromHex('40000000000000000000000004A20E90C39067C893BBB9A5');
+  LBaseCurve := TF2mCurve.Create(191, 9,
+    TX962NamedCurves.FromHex('2866537B676752636A68F56554E12640276B649EF7526267'),
+    TX962NamedCurves.FromHex('2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC'),
+    LN, TBigInteger.Two);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0236B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D');
+  LS := THex.Decode('4E13CA542744D696E67687561517552F279A8C84');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TX962NamedCurves.TC2tnb191v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb191v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb191v2Holder }
+
+function TX962NamedCurves.TC2tnb191v2Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('20000000000000000000000050508CB89F652824E06B8173');
+  LBaseCurve := TF2mCurve.Create(191, 9,
+    TX962NamedCurves.FromHex('401028774D7777C7B7666D1366EA432071274F89FF01E718'),
+    TX962NamedCurves.FromHex('0620048D28BCBD03B6249C99182B7C8CD19700C362C46A01'),
+    LN, TBigInteger.Four);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '023809B2B7CC1B28CC5A87926AAD83FD28789E81E2C9E3BF10');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb191v2Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb191v2Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb191v3Holder }
+
+function TX962NamedCurves.TC2tnb191v3Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('155555555555555555555555610C0B196812BFB6288A3EA3');
+  LBaseCurve := TF2mCurve.Create(191, 9,
+    TX962NamedCurves.FromHex('6C01074756099122221056911C77D77E77A777E7E7E77FCB'),
+    TX962NamedCurves.FromHex('71FE1AF926CF847989EFEF8DB459F66394D90F32AD3F15E8'),
+    LN, TBigInteger.Six);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '03375D4CE24FDE434489DE8746E71786015009E66E38A926DD');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb191v3Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb191v3Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb208w1Holder }
+
+function TX962NamedCurves.TC2pnb208w1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('0101BAF95C9723C57B6C21DA2EFF2D5ED588BDD5717E212F9D');
+  LH := TBigInteger.ValueOf(Int64($FE48));
+  LBaseCurve := TF2mCurve.Create(208, 1, 2, 83,
+    TBigInteger.Zero,
+    TX962NamedCurves.FromHex('C8619ED45A62E6212E1160349E2BFA844439FAFC2A3FD1638F9E'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0289FDFBE4ABE193DF9559ECF07AC0CE78554E2784EB8C1ED1A57A');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb208w1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb208w1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb239v1Holder }
+
+function TX962NamedCurves.TC2tnb239v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('2000000000000000000000000000000F4D42FFE1492A4993F1CAD666E447');
+  LBaseCurve := TF2mCurve.Create(239, 36,
+    TX962NamedCurves.FromHex('32010857077C5431123A46B808906756F543423E8D27877578125778AC76'),
+    TX962NamedCurves.FromHex('790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16'),
+    LN, TBigInteger.Four);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0257927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+class function TX962NamedCurves.TC2tnb239v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb239v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb239v2Holder }
+
+function TX962NamedCurves.TC2tnb239v2Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('1555555555555555555555555555553C6F2885259C31E3FCDF154624522D');
+  LBaseCurve := TF2mCurve.Create(239, 36,
+    TX962NamedCurves.FromHex('4230017757A767FAE42398569B746325D45313AF0766266479B75654E65F'),
+    TX962NamedCurves.FromHex('5037EA654196CFF0CD82B2C14A2FCF2E3FF8775285B545722F03EACDB74B'),
+    LN, TBigInteger.Six);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0228F9D04E900069C8DC47A08534FE76D2B900B7D7EF31F5709F200C4CA205');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb239v2Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb239v2Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb239v3Holder }
+
+function TX962NamedCurves.TC2tnb239v3Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('0CCCCCCCCCCCCCCCCCCCCCCCCCCCCCAC4912D2D9DF903EF9888B8A0E4CFF');
+  LBaseCurve := TF2mCurve.Create(239, 36,
+    TX962NamedCurves.FromHex('01238774666A67766D6676F778E676B66999176666E687666D8766C66A9F'),
+    TX962NamedCurves.FromHex('6A941977BA9F6A435199ACFC51067ED587F519C5ECB541B8E44111DE1D40'),
+    LN, TBigInteger.Ten);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '0370F6E9D04D289C4E89913CE3530BFDE903977D42B146D539BF1BDE4E9C92');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb239v3Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb239v3Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb272w1Holder }
+
+function TX962NamedCurves.TC2pnb272w1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('0100FAF51354E0E39E4892DF6E319C72C8161603FA45AA7B998A167B8F1E629521');
+  LH := TBigInteger.ValueOf(Int64($FF06));
+  LBaseCurve := TF2mCurve.Create(272, 1, 3, 56,
+    TX962NamedCurves.FromHex('91A091F03B5FBA4AB2CCF49C4EDD220FB028712D42BE752B2C40094DBACDB586FB20'),
+    TX962NamedCurves.FromHex('7167EFC92BB2E3CE7C8AAAFF34E12A9C557003D7C73A6FAF003F99F6CC8482E540F7'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '026108BABB2CEEBCF787058A056CBE0CFE622D7723A289E08A07AE13EF0D10D171DD8D');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb272w1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb272w1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb304w1Holder }
+
+function TX962NamedCurves.TC2pnb304w1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('0101D556572AABAC800101D556572AABAC8001022D5C91DD173F8FB561DA6899164443051D');
+  LH := TBigInteger.ValueOf(Int64($FE2E));
+  LBaseCurve := TF2mCurve.Create(304, 1, 2, 11,
+    TX962NamedCurves.FromHex('FD0D693149A118F651E6DCE6802085377E5F882D1B510B44160074C1288078365A0396C8E681'),
+    TX962NamedCurves.FromHex('BDDB97E555A50A908E43B01C798EA5DAA6788F1EA2794EFCF57166B8C14039601E55827340BE'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '02197B07845E9BE2D96ADB0F5F3C7F2CFFBD7A3EB8B6FEC35C7FD67F26DDF6285A644F740A2614');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb304w1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb304w1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb359v1Holder }
+
+function TX962NamedCurves.TC2tnb359v1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('01AF286BCA1AF286BCA1AF286BCA1AF286BCA1AF286BC9FB8F6B85C556892C20A7EB964FE7719E74F490758D3B');
+  LH := TBigInteger.ValueOf(Int64($4C));
+  LBaseCurve := TF2mCurve.Create(359, 68,
+    TX962NamedCurves.FromHex('5667676A654B20754F356EA92017D946567C46675556F19556A04616B567D223A5E05656FB549016A96656A557'),
+    TX962NamedCurves.FromHex('2472E2D0197C49363F1FE7F5B6DB075D52B6947D135D8CA445805D39BC345626089687742B6329E70680231988'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '033C258EF3047767E7EDE0F1FDAA79DAEE3841366A132E163ACED4ED2401DF9C6BDCDE98E8E707C07A2239B1B097');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb359v1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb359v1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2pnb368w1Holder }
+
+function TX962NamedCurves.TC2pnb368w1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('010090512DA9AF72B08349D98A5DD4C7B0532ECA51CE03E2D10F3B7AC579BD87E909AE40A6F131E9CFCE5BD967');
+  LH := TBigInteger.ValueOf(Int64($FF70));
+  LBaseCurve := TF2mCurve.Create(368, 1, 2, 85,
+    TX962NamedCurves.FromHex('E0D2EE25095206F5E2A4F9ED229F1F256E79A0E2B455970D8D0D865BD94778C576D62F0AB7519CCD2A1A906AE30D'),
+    TX962NamedCurves.FromHex('FC1217D4320A90452C760A58EDCD30C8DD069B3C34453837A34ED50CB54917E1C2112D84D164F444F8F74786046A'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '021085E2755381DCCCE3C1557AFA10C2F0C0C2825646C5B34A394CBCFA8BC16B22E7E789E927BE216F02E1FB136A5F');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2pnb368w1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2pnb368w1Holder.Create();
+end;
+
+{ TX962NamedCurves.TC2tnb431r1Holder }
+
+function TX962NamedCurves.TC2tnb431r1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LN: TBigInteger;
+  LH: TBigInteger;
+begin
+  LN := TX962NamedCurves.FromHex('0340340340340340340340340340340340340340340340340340340323C313FAB50589703B5EC68D3587FEC60D161CC149C1AD4A91');
+  LH := TBigInteger.ValueOf(Int64($2760));
+  LBaseCurve := TF2mCurve.Create(431, 120,
+    TX962NamedCurves.FromHex('1A827EF00DD6FC0E234CAF046C6A5D8A85395B236CC4AD2CF32A0CADBDC9DDF620B0EB9906D0957F6C6FEACD615468DF104DE296CD8F'),
+    TX962NamedCurves.FromHex('10D9B4A3D9047D8B154359ABFB1B7F5485B04CEB868237DDC9DEDA982A679A5A919B626D4E50A8DD731B107A9962381FB5D807BF2618'),
+    LN, LH);
+  LCurve := TX962NamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TX962NamedCurves.ConfigureBasepoint(LCurve, '02120FC05D3C67A99DE161D2F4092622FECA701BE4F50F4758714E8A87BBF2A658EF8C21E7C5EFE965361F6C2999C0C247B0DBD70CE6B7');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
+end;
+
+class function TX962NamedCurves.TC2tnb431r1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TC2tnb431r1Holder.Create();
+end;
+
+end.

CryptoLib/src/Asn1/X9/ClpX9ECParametersHolder.pas

@@ -33,7 +33,7 @@ type
   strict private
   var
     FLock: TCriticalSection;
-    Fparameters: IX9ECParameters;
+    FParameters: IX9ECParameters;
 
   strict protected
 
@@ -67,15 +67,15 @@ function TX9ECParametersHolder.GetParameters: IX9ECParameters;
 begin
   FLock.Acquire;
   try
-    if (Fparameters = Nil) then
+    if (FParameters = Nil) then
     begin
-      Fparameters := CreateParameters();
+      FParameters := CreateParameters();
     end;
 
   finally
     FLock.Release;
   end;
-  Result := Fparameters;
+  Result := FParameters;
 end;
 
 end.

CryptoLib/src/Crypto/EC/ClpCustomNamedCurves.pas

@@ -25,6 +25,7 @@ uses
   SysUtils,
   Generics.Collections,
   ClpAsn1Comparers,
+  ClpCollectionUtilities,
   ClpCryptoLibComparers,
   ClpEncoders,
   ClpGlvTypeBParameters,
@@ -56,150 +57,70 @@ uses
   ClpIGlvTypeBParameters;
 
 type
+  /// <summary>Elliptic curve registry for various customized curve implementations (Custom/Sec subset).</summary>
   TCustomNamedCurves = class sealed(TObject)
 
   strict private
-
-  class var
-    FnameToCurve: TDictionary<String, IX9ECParametersHolder>;
-    FnameToOid: TDictionary<String, IDerObjectIdentifier>;
-    FoidToCurve: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
-    FoidToName: TDictionary<IDerObjectIdentifier, String>;
-
-    Fnames: TList<String>;
+    class var
+      FObjIds: TDictionary<String, IDerObjectIdentifier>;
+      FCurves: TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>;
+      FNames: TDictionary<IDerObjectIdentifier, String>;
 
     class function GetNames: TCryptoLibStringArray; static; inline;
-
-    // class procedure DefineCurve(const name: String;
-    // const holder: IX9ECParametersHolder); static; inline;
-
-    class procedure DefineCurveWithOid(const name: String;
-      const oid: IDerObjectIdentifier; const holder: IX9ECParametersHolder);
+    class procedure DefineCurve(const AName: String;
+      const AOid: IDerObjectIdentifier; const AHolder: IX9ECParametersHolder);
       static; inline;
-
-    class procedure DefineCurveAlias(const name: String;
-      const oid: IDerObjectIdentifier); static; inline;
-
-    class function ConfigureCurve(const curve: IECCurve): IECCurve;
+    class procedure DefineCurveAlias(const AName: String;
+      const AOid: IDerObjectIdentifier); static; inline;
+    class function ConfigureCurve(const ACurve: IECCurve): IECCurve;
       static; inline;
-    class function ConfigureCurveGlv(const c: IECCurve;
-      const p: IGlvTypeBParameters): IECCurve; static; inline;
-
-    class function ConfigureBasepoint(const curve: IECCurve;
-      const encoding: String): IX9ECPoint; static;
-
-    class procedure Boot(); static;
-    class constructor CreateCustomNamedCurves();
-    class destructor DestroyCustomNamedCurves();
+    class function ConfigureCurveGlv(const AC: IECCurve;
+      const AP: IGlvTypeBParameters): IECCurve; static; inline;
+    class function ConfigureBasepoint(const ACurve: IECCurve;
+      const AEncoding: String): IX9ECPoint; static;
+    class procedure Boot; static;
+    class constructor CreateCustomNamedCurves;
+    class destructor DestroyCustomNamedCurves;
 
   public
-    class function GetByName(const name: String): IX9ECParameters;
-      static; inline;
-    // /**
-    // * return the X9ECParameters object for the named curve represented by
-    // * the passed in object identifier. Null if the curve isn't present.
-    // *
-    // * @param oid an object identifier representing a named curve, if present.
-    // */
-    class function GetByOid(const oid: IDerObjectIdentifier): IX9ECParameters;
-      static; inline;
-    // /**
-    // * return the object identifier signified by the passed in name. Null
-    // * if there is no object identifier associated with name.
-    // *
-    // * @return the object identifier associated with name, if present.
-    // */
-    class function GetOid(const name: String): IDerObjectIdentifier;
-      static; inline;
-    // /**
-    // * return the named curve name represented by the given object identifier.
-    // */
-    class function GetName(const oid: IDerObjectIdentifier): String;
-      static; inline;
-    // /**
-    // * returns an enumeration containing the name strings for curves
-    // * contained in this structure.
-    // */
+    class function GetByName(const AName: String): IX9ECParameters; static; inline;
+    class function GetByNameLazy(const AName: String): IX9ECParametersHolder; static; inline;
+    class function GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters; static; inline;
+    class function GetByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder; static; inline;
+    class function GetOid(const AName: String): IDerObjectIdentifier; static; inline;
+    class function GetName(const AOid: IDerObjectIdentifier): String; static; inline;
     class property Names: TCryptoLibStringArray read GetNames;
 
   type
-
-    /// <summary>
-    /// secp256k1
-    /// </summary>
-    TSecP256K1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
+    TSecP256K1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+      strict protected
+        function CreateParameters: IX9ECParameters; override;
+      public
+        class function Instance: IX9ECParametersHolder; static;
     end;
-
-  type
-
-    /// <summary>
-    /// secp256r1
-    /// </summary>
-    TSecP256R1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
+    TSecP256R1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+      strict protected
+        function CreateParameters: IX9ECParameters; override;
+      public
+        class function Instance: IX9ECParametersHolder; static;
     end;
-
-  type
-
-    /// <summary>
-    /// secp384r1
-    /// </summary>
-    TSecP384R1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
+    TSecP384R1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+      strict protected
+        function CreateParameters: IX9ECParameters; override;
+      public
+        class function Instance: IX9ECParametersHolder; static;
     end;
-
-  type
-
-    /// <summary>
-    /// secp521r1
-    /// </summary>
-    TSecP521R1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
+    TSecP521R1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+      strict protected
+        function CreateParameters: IX9ECParameters; override;
+      public
+        class function Instance: IX9ECParametersHolder; static;
     end;
-
-  type
-
-    /// <summary>
-    /// sect283k1
-    /// </summary>
-    TSecT283K1Holder = class sealed(TX9ECParametersHolder,
-      IX9ECParametersHolder)
-
-    strict protected
-      function CreateParameters(): IX9ECParameters; override;
-
-    public
-      class function Instance(): IX9ECParametersHolder; static;
-
+    TSecT283K1Holder = class sealed(TX9ECParametersHolder, IX9ECParametersHolder)
+      strict protected
+        function CreateParameters: IX9ECParameters; override;
+      public
+        class function Instance: IX9ECParametersHolder; static;
     end;
 
   end;
@@ -208,291 +129,250 @@ implementation
 
 { TCustomNamedCurves }
 
-class function TCustomNamedCurves.ConfigureBasepoint(const curve: IECCurve;
-  const encoding: String): IX9ECPoint;
+class function TCustomNamedCurves.ConfigureBasepoint(const ACurve: IECCurve;
+  const AEncoding: String): IX9ECPoint;
 begin
-  result := TX9ECPoint.Create(curve, THex.Decode(encoding));
-  TWnafUtilities.ConfigureBasepoint(result.Point);
+  Result := TX9ECPoint.Create(ACurve, THex.Decode(AEncoding));
+  TWnafUtilities.ConfigureBasepoint(Result.Point);
 end;
 
-// class procedure TCustomNamedCurves.DefineCurve(const name: String;
-// const holder: IX9ECParametersHolder);
-// var
-// LName: string;
-// begin
-// LName := name;
-// Fnames.Add(LName);
-// LName := UpperCase(LName);
-// FnameToCurve.Add(LName, holder);
-// end;
-
-class procedure TCustomNamedCurves.DefineCurveWithOid(const name: String;
-  const oid: IDerObjectIdentifier; const holder: IX9ECParametersHolder);
-var
-  LName: string;
+class procedure TCustomNamedCurves.DefineCurve(const AName: String;
+  const AOid: IDerObjectIdentifier; const AHolder: IX9ECParametersHolder);
 begin
-  LName := name;
-  Fnames.Add(LName);
-  FoidToName.Add(oid, LName);
-  FoidToCurve.Add(oid, holder);
-  LName := UpperCase(LName);
-  FnameToOid.Add(LName, oid);
-  FnameToCurve.Add(LName, holder);
+  FObjIds.Add(AName, AOid);
+  FNames.Add(AOid, AName);
+  FCurves.Add(AOid, AHolder);
 end;
 
-class procedure TCustomNamedCurves.DefineCurveAlias(const name: String;
-  const oid: IDerObjectIdentifier);
-var
-  curve: IX9ECParametersHolder;
-  LName: string;
+class procedure TCustomNamedCurves.DefineCurveAlias(const AName: String;
+  const AOid: IDerObjectIdentifier);
 begin
-  LName := name;
-  if not(FoidToCurve.TryGetValue(oid, curve)) then
-  begin
+  if not FCurves.ContainsKey(AOid) then
     raise EInvalidOperationCryptoLibException.Create('');
-  end;
-  LName := UpperCase(LName);
-  FnameToOid.Add(LName, oid);
-  FnameToCurve.Add(LName, curve);
+  FObjIds.Add(AName, AOid);
 end;
 
-class function TCustomNamedCurves.ConfigureCurve(const curve: IECCurve)
-  : IECCurve;
+class function TCustomNamedCurves.ConfigureCurve(const ACurve: IECCurve): IECCurve;
 begin
-  result := curve;
+  Result := ACurve;
 end;
 
-class function TCustomNamedCurves.ConfigureCurveGlv(const c: IECCurve;
-  const p: IGlvTypeBParameters): IECCurve;
+class function TCustomNamedCurves.ConfigureCurveGlv(const AC: IECCurve;
+  const AP: IGlvTypeBParameters): IECCurve;
 var
-  glv: IGlvTypeBEndomorphism;
+  LGlv: IGlvTypeBEndomorphism;
 begin
-  glv := TGlvTypeBEndomorphism.Create(c, p);
-  result := c.Configure().SetEndomorphism(glv).CreateCurve();
+  LGlv := TGlvTypeBEndomorphism.Create(AC, AP);
+  Result := AC.Configure().SetEndomorphism(LGlv).CreateCurve();
 end;
 
-class function TCustomNamedCurves.GetByOid(const oid: IDerObjectIdentifier)
-  : IX9ECParameters;
+class function TCustomNamedCurves.GetByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
 var
-  holder: IX9ECParametersHolder;
+  LHolder: IX9ECParametersHolder;
 begin
-  if FoidToCurve.TryGetValue(oid, holder) then
-  begin
-    result := holder.Parameters
-  end
+  LHolder := GetByOidLazy(AOid);
+  if LHolder <> nil then
+    Result := LHolder.Parameters
   else
-  begin
-    result := Nil;
-  end;
+    Result := nil;
 end;
 
-class function TCustomNamedCurves.GetOid(const name: String)
-  : IDerObjectIdentifier;
+class function TCustomNamedCurves.GetByNameLazy(const AName: String): IX9ECParametersHolder;
+var
+  LOid: IDerObjectIdentifier;
 begin
-  if not(FnameToOid.TryGetValue(UpperCase(name), result)) then
-  begin
-    result := Nil;
-  end;
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOidLazy(LOid);
 end;
 
-class function TCustomNamedCurves.GetByName(const name: String)
-  : IX9ECParameters;
-var
-  holder: IX9ECParametersHolder;
+class function TCustomNamedCurves.GetByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder;
 begin
-  if FnameToCurve.TryGetValue(UpperCase(name), holder) then
-  begin
-    result := holder.Parameters
-  end
-  else
-  begin
-    result := Nil;
-  end;
+  Result := nil;
+  FCurves.TryGetValue(AOid, Result);
 end;
 
-class function TCustomNamedCurves.GetName
-  (const oid: IDerObjectIdentifier): String;
+class function TCustomNamedCurves.GetOid(const AName: String): IDerObjectIdentifier;
 begin
-  if not(FoidToName.TryGetValue(oid, result)) then
-  begin
-    result := '';
-  end;
+  if not FObjIds.TryGetValue(UpperCase(AName), Result) then
+    Result := nil;
 end;
 
-class function TCustomNamedCurves.GetNames: TCryptoLibStringArray;
+class function TCustomNamedCurves.GetByName(const AName: String): IX9ECParameters;
+var
+  LOid: IDerObjectIdentifier;
 begin
-  result := Fnames.ToArray();
+  LOid := GetOid(AName);
+  if LOid = nil then
+    Result := nil
+  else
+    Result := GetByOid(LOid);
 end;
 
-class constructor TCustomNamedCurves.CreateCustomNamedCurves;
+class function TCustomNamedCurves.GetName(const AOid: IDerObjectIdentifier): String;
 begin
-  TCustomNamedCurves.Boot;
+  if not FNames.TryGetValue(AOid, Result) then
+    Result := '';
 end;
 
-class destructor TCustomNamedCurves.DestroyCustomNamedCurves;
+class function TCustomNamedCurves.GetNames: TCryptoLibStringArray;
 begin
-  FnameToCurve.Free;
-  FnameToOid.Free;
-  FoidToCurve.Free;
-  FoidToName.Free;
-  Fnames.Free;
+  Result := TCollectionUtilities.Keys<String, IDerObjectIdentifier>(FObjIds);
 end;
 
 class procedure TCustomNamedCurves.Boot;
 begin
-  FnameToCurve := TDictionary<String, IX9ECParametersHolder>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
-  FnameToOid := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
-  FoidToCurve := TDictionary<IDerObjectIdentifier,
-    IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
-  FoidToName := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
-
-  Fnames := TList<String>.Create();
-
-  DefineCurveWithOid('secp256k1', TSecObjectIdentifiers.SecP256k1,
-    TSecP256K1Holder.Instance);
+  FObjIds := TDictionary<String, IDerObjectIdentifier>.Create(TCryptoLibComparers.OrdinalIgnoreCaseEqualityComparer);
+  FCurves := TDictionary<IDerObjectIdentifier, IX9ECParametersHolder>.Create(TAsn1Comparers.OidEqualityComparer);
+  FNames := TDictionary<IDerObjectIdentifier, String>.Create(TAsn1Comparers.OidEqualityComparer);
 
-  DefineCurveWithOid('secp256r1', TSecObjectIdentifiers.SecP256r1,
-    TSecP256R1Holder.Instance);
-
-  DefineCurveWithOid('secp384r1', TSecObjectIdentifiers.SecP384r1,
-    TSecP384R1Holder.Instance);
-
-  DefineCurveWithOid('secp521r1', TSecObjectIdentifiers.SecP521r1,
-    TSecP521R1Holder.Instance);
-
-  DefineCurveWithOid('sect283k1', TSecObjectIdentifiers.SecT283k1,
-    TSecT283K1Holder.Instance);
+  DefineCurve('secp256k1', TSecObjectIdentifiers.SecP256k1, TSecP256K1Holder.Instance);
+  DefineCurve('secp256r1', TSecObjectIdentifiers.SecP256r1, TSecP256R1Holder.Instance);
+  DefineCurve('secp384r1', TSecObjectIdentifiers.SecP384r1, TSecP384R1Holder.Instance);
+  DefineCurve('secp521r1', TSecObjectIdentifiers.SecP521r1, TSecP521R1Holder.Instance);
+  DefineCurve('sect283k1', TSecObjectIdentifiers.SecT283k1, TSecT283K1Holder.Instance);
 
   DefineCurveAlias('K-283', TSecObjectIdentifiers.SecT283k1);
-
   DefineCurveAlias('P-256', TSecObjectIdentifiers.SecP256r1);
   DefineCurveAlias('P-384', TSecObjectIdentifiers.SecP384r1);
   DefineCurveAlias('P-521', TSecObjectIdentifiers.SecP521r1);
 end;
 
+class constructor TCustomNamedCurves.CreateCustomNamedCurves;
+begin
+  Boot;
+end;
+
+class destructor TCustomNamedCurves.DestroyCustomNamedCurves;
+begin
+  FObjIds.Free;
+  FCurves.Free;
+  FNames.Free;
+end;
+
 { TCustomNamedCurves.TSecP256K1Holder }
 
 function TCustomNamedCurves.TSecP256K1Holder.CreateParameters: IX9ECParameters;
 var
-  curve: IECCurve;
-  G: IX9ECPoint;
-  S: TCryptoLibByteArray;
-  glv: IGlvTypeBParameters;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LGlv: IGlvTypeBParameters;
 begin
-  S := Nil;
-  glv := TGlvTypeBParameters.Create
-    (TBigInteger.Create
-    ('7ae96a2b657c07106e64479eac3434e99cf0497512f58995c1396c28719501ee', 16),
-    TBigInteger.Create
-    ('5363ad4cc05c30e0a5261c028812645a122e22ea20816678df02967c1b23bd72', 16),
-
-    TScalarSplitParameters.Create(TCryptoLibGenericArray<TBigInteger>.Create
-    (TBigInteger.Create('3086d221a7d46bcde86c90e49284eb15', 16),
-    TBigInteger.Create('-e4437ed6010e88286f547fa90abfe4c3', 16)),
-    TCryptoLibGenericArray<TBigInteger>.Create(TBigInteger.Create
-    ('114ca50f7a8e2f3f657c1108d9d44cfd8', 16),
-    TBigInteger.Create('3086d221a7d46bcde86c90e49284eb15', 16)),
-    TBigInteger.Create('3086d221a7d46bcde86c90e49284eb153dab', 16),
-    TBigInteger.Create('e4437ed6010e88286f547fa90abfe4c42212', 16), 272)
-    as IScalarSplitParameters);
-  curve := ConfigureCurveGlv(TSecP256K1Curve.Create() as ISecP256K1Curve, glv);
-  G := ConfigureBasepoint(curve,
+  LGlv := TGlvTypeBParameters.Create(
+    TBigInteger.Create('7ae96a2b657c07106e64479eac3434e99cf0497512f58995c1396c28719501ee', 16),
+    TBigInteger.Create('5363ad4cc05c30e0a5261c028812645a122e22ea20816678df02967c1b23bd72', 16),
+    TScalarSplitParameters.Create(
+      TCryptoLibGenericArray<TBigInteger>.Create(
+        TBigInteger.Create('3086d221a7d46bcde86c90e49284eb15', 16),
+        TBigInteger.Create('-e4437ed6010e88286f547fa90abfe4c3', 16)),
+      TCryptoLibGenericArray<TBigInteger>.Create(
+        TBigInteger.Create('114ca50f7a8e2f3f657c1108d9d44cfd8', 16),
+        TBigInteger.Create('3086d221a7d46bcde86c90e49284eb15', 16)),
+      TBigInteger.Create('3086d221a7d46bcde86c90e49284eb153dab', 16),
+      TBigInteger.Create('e4437ed6010e88286f547fa90abfe4c42212', 16), 272)
+      as IScalarSplitParameters);
+  LBaseCurve := TSecP256K1Curve.Create();
+  LCurve := TCustomNamedCurves.ConfigureCurveGlv(LBaseCurve, LGlv);
+  LG := TCustomNamedCurves.ConfigureBasepoint(LCurve,
     '0479BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8');
-  result := TX9ECParameters.Create(curve, G, curve.Order, curve.Cofactor, S);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TCustomNamedCurves.TSecP256K1Holder.Instance
-  : IX9ECParametersHolder;
+class function TCustomNamedCurves.TSecP256K1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TSecP256K1Holder.Create();
+  Result := TSecP256K1Holder.Create;
+end;
+
+{ TCustomNamedCurves.TSecP256R1Holder }
+
+function TCustomNamedCurves.TSecP256R1Holder.CreateParameters: IX9ECParameters;
+var
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LS: TCryptoLibByteArray;
+begin
+  LS := THex.Decode('C49D360886E704936A6678E1139D26B7819F7E90');
+  LBaseCurve := TSecP256R1Curve.Create();
+  LCurve := TCustomNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TCustomNamedCurves.ConfigureBasepoint(LCurve,
+    '046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5');
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
+end;
+
+class function TCustomNamedCurves.TSecP256R1Holder.Instance: IX9ECParametersHolder;
+begin
+  Result := TSecP256R1Holder.Create;
 end;
 
 { TCustomNamedCurves.TSecP384R1Holder }
 
 function TCustomNamedCurves.TSecP384R1Holder.CreateParameters: IX9ECParameters;
 var
-  S: TCryptoLibByteArray;
-  curve: IECCurve;
-  G: IX9ECPoint;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LS: TCryptoLibByteArray;
 begin
-  S := THex.Decode('A335926AA319A27A1D00896A6773A4827ACDAC73');
-  curve := ConfigureCurve(TSecP384R1Curve.Create() as ISecP384R1Curve);
-  G := ConfigureBasepoint(curve,
+  LS := THex.Decode('A335926AA319A27A1D00896A6773A4827ACDAC73');
+  LBaseCurve := TSecP384R1Curve.Create();
+  LCurve := TCustomNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TCustomNamedCurves.ConfigureBasepoint(LCurve,
     '04' + 'AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7'
     + '3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F');
-  result := TX9ECParameters.Create(curve, G, curve.Order, curve.Cofactor, S);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
 end;
 
-class function TCustomNamedCurves.TSecP384R1Holder.Instance
-  : IX9ECParametersHolder;
+class function TCustomNamedCurves.TSecP384R1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TSecP384R1Holder.Create();
+  Result := TSecP384R1Holder.Create;
 end;
 
 { TCustomNamedCurves.TSecP521R1Holder }
 
 function TCustomNamedCurves.TSecP521R1Holder.CreateParameters: IX9ECParameters;
 var
-  S: TCryptoLibByteArray;
-  curve: IECCurve;
-  G: IX9ECPoint;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
+  LS: TCryptoLibByteArray;
 begin
-  S := THex.Decode('D09E8800291CB85396CC6717393284AAA0DA64BA');
-  curve := ConfigureCurve(TSecP521R1Curve.Create() as ISecP521R1Curve);
-  G := ConfigureBasepoint(curve,
+  LS := THex.Decode('D09E8800291CB85396CC6717393284AAA0DA64BA');
+  LBaseCurve := TSecP521R1Curve.Create();
+  LCurve := TCustomNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TCustomNamedCurves.ConfigureBasepoint(LCurve,
     '04' + '00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66'
     + '011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650');
-  result := TX9ECParameters.Create(curve, G, curve.Order, curve.Cofactor, S);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor, LS);
 end;
 
-class function TCustomNamedCurves.TSecP521R1Holder.Instance
-  : IX9ECParametersHolder;
+class function TCustomNamedCurves.TSecP521R1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TSecP521R1Holder.Create();
+  Result := TSecP521R1Holder.Create;
 end;
 
 { TCustomNamedCurves.TSecT283K1Holder }
 
 function TCustomNamedCurves.TSecT283K1Holder.CreateParameters: IX9ECParameters;
 var
-  S: TCryptoLibByteArray;
-  curve: IECCurve;
-  G: IX9ECPoint;
+  LBaseCurve: IECCurve;
+  LCurve: IECCurve;
+  LG: IX9ECPoint;
 begin
-  S := Nil;
-  curve := ConfigureCurve(TSecT283K1Curve.Create() as ISecT283K1Curve);
-  G := ConfigureBasepoint(curve,
+  LBaseCurve := TSecT283K1Curve.Create();
+  LCurve := TCustomNamedCurves.ConfigureCurve(LBaseCurve);
+  LG := TCustomNamedCurves.ConfigureBasepoint(LCurve,
     '04' + '0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836'
     + '01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259');
-  result := TX9ECParameters.Create(curve, G, curve.Order, curve.Cofactor, S);
-end;
-
-class function TCustomNamedCurves.TSecT283K1Holder.Instance
-  : IX9ECParametersHolder;
-begin
-  result := TSecT283K1Holder.Create();
-end;
-
-{ TCustomNamedCurves.TSecP256R1Holder }
-
-function TCustomNamedCurves.TSecP256R1Holder.CreateParameters: IX9ECParameters;
-var
-  S: TCryptoLibByteArray;
-  curve: IECCurve;
-  G: IX9ECPoint;
-begin
-  S := THex.Decode('C49D360886E704936A6678E1139D26B7819F7E90');
-  curve := ConfigureCurve(TSecP256R1Curve.Create() as ISecP256R1Curve);
-  G := ConfigureBasepoint(curve,
-    '046B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C2964FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5');
-
-  result := TX9ECParameters.Create(curve, G, curve.Order, curve.Cofactor, S);
+  Result := TX9ECParameters.Create(LCurve, LG, LCurve.Order, LCurve.Cofactor);
 end;
 
-class function TCustomNamedCurves.TSecP256R1Holder.Instance
-  : IX9ECParametersHolder;
+class function TCustomNamedCurves.TSecT283K1Holder.Instance: IX9ECParametersHolder;
 begin
-  result := TSecP256R1Holder.Create();
+  Result := TSecT283K1Holder.Create;
 end;
 
 end.

CryptoLib/src/Crypto/EC/ClpECUtilities.pas

@@ -24,6 +24,7 @@ interface
 uses
   ClpIAsn1Objects,
   ClpIX9ECAsn1Objects,
+  ClpIX9ECParametersHolder,
   ClpCustomNamedCurves,
   ClpECNamedCurveTable;
 
@@ -41,6 +42,13 @@ type
     /// <returns>X9ECParameters or nil if not found.</returns>
     class function FindECCurveByName(const AName: String): IX9ECParameters; static;
 
+    /// <summary>
+    /// Find EC curve holder by name (lazy).
+    /// </summary>
+    /// <param name="AName">The name of the curve.</param>
+    /// <returns>X9ECParametersHolder or nil if not found.</returns>
+    class function FindECCurveByNameLazy(const AName: String): IX9ECParametersHolder; static;
+
     /// <summary>
     /// Find EC curve parameters by OID.
     /// </summary>
@@ -48,6 +56,13 @@ type
     /// <returns>X9ECParameters or nil if not found.</returns>
     class function FindECCurveByOid(const AOid: IDerObjectIdentifier): IX9ECParameters; static;
 
+    /// <summary>
+    /// Find EC curve holder by OID (lazy).
+    /// </summary>
+    /// <param name="AOid">The OID of the curve.</param>
+    /// <returns>X9ECParametersHolder or nil if not found.</returns>
+    class function FindECCurveByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder; static;
+
     /// <summary>
     /// Find EC curve OID by name.
     /// </summary>
@@ -67,33 +82,47 @@ var
 begin
   LResult := TCustomNamedCurves.GetByName(AName);
   if LResult = nil then
-  begin
     LResult := TECNamedCurveTable.GetByName(AName);
-  end;
   Result := LResult;
 end;
 
+class function TECUtilities.FindECCurveByNameLazy(const AName: String): IX9ECParametersHolder;
+var
+  LHolder: IX9ECParametersHolder;
+begin
+  LHolder := TCustomNamedCurves.GetByNameLazy(AName);
+  if LHolder = nil then
+    LHolder := TECNamedCurveTable.GetByNameLazy(AName);
+  Result := LHolder;
+end;
+
 class function TECUtilities.FindECCurveByOid(const AOid: IDerObjectIdentifier): IX9ECParameters;
 var
   LResult: IX9ECParameters;
 begin
   LResult := TCustomNamedCurves.GetByOid(AOid);
   if LResult = nil then
-  begin
     LResult := TECNamedCurveTable.GetByOid(AOid);
-  end;
   Result := LResult;
 end;
 
+class function TECUtilities.FindECCurveByOidLazy(const AOid: IDerObjectIdentifier): IX9ECParametersHolder;
+var
+  LHolder: IX9ECParametersHolder;
+begin
+  LHolder := TCustomNamedCurves.GetByOidLazy(AOid);
+  if LHolder = nil then
+    LHolder := TECNamedCurveTable.GetByOidLazy(AOid);
+  Result := LHolder;
+end;
+
 class function TECUtilities.FindECCurveOid(const AName: String): IDerObjectIdentifier;
 var
   LResult: IDerObjectIdentifier;
 begin
   LResult := TCustomNamedCurves.GetOid(AName);
   if LResult = nil then
-  begin
     LResult := TECNamedCurveTable.GetOid(AName);
-  end;
   Result := LResult;
 end;
 

CryptoLib/src/GeneralUtilities/ClpCollectionUtilities.pas

@@ -44,7 +44,15 @@ type
     /// <summary>
     /// Create a proxy array from an enumerable collection (like TDictionary.Keys).
     /// </summary>
-    class function Proxy<T>(const AEnumerable: IEnumerable<T>): TCryptoLibGenericArray<T>; static;
+    class function Proxy<T>(const AEnumerable: TEnumerable<T>): TCryptoLibGenericArray<T>; static;
+    /// <summary>
+    /// Return all keys of the dictionary as an array.
+    /// </summary>
+    class function Keys<K, V>(const AD: TDictionary<K, V>): TCryptoLibGenericArray<K>; static;
+    /// <summary>
+    /// Return all values of the dictionary as an array.
+    /// </summary>
+    class function Values<K, V>(const AD: TDictionary<K, V>): TCryptoLibGenericArray<V>; static;
     /// <summary>
     /// Get the value for AKey if it exists, otherwise Default(V) (e.g. '' for string, nil for class/interface).
     /// </summary>
@@ -99,7 +107,7 @@ begin
   end;
 end;
 
-class function TCollectionUtilities.Proxy<T>(const AEnumerable: IEnumerable<T>): TCryptoLibGenericArray<T>;
+class function TCollectionUtilities.Proxy<T>(const AEnumerable: TEnumerable<T>): TCryptoLibGenericArray<T>;
 var
   LList: TList<T>;
   LItem: T;
@@ -110,12 +118,22 @@ begin
     begin
       LList.Add(LItem);
     end;
-    Result := LList.ToArray();
+    Result := ToArray<T>(LList);
   finally
     LList.Free;
   end;
 end;
 
+class function TCollectionUtilities.Keys<K, V>(const AD: TDictionary<K, V>): TCryptoLibGenericArray<K>;
+begin
+  Result := Proxy<K>(AD.Keys);
+end;
+
+class function TCollectionUtilities.Values<K, V>(const AD: TDictionary<K, V>): TCryptoLibGenericArray<V>;
+begin
+  Result := Proxy<V>(AD.Values);
+end;
+
 class function TCollectionUtilities.GetValueOrNull<K, V>(const D: TDictionary<K, V>;
   const AKey: K): V;
 begin

CryptoLib/src/Math/EC/ClpECCurve.pas

@@ -254,6 +254,7 @@ type
 
   public
     const F2M_DEFAULT_COORDS = TECCurveConstants.COORD_LAMBDA_PROJECTIVE;
+    constructor Create(AM, AK: Int32; const AA, AB: TBigInteger); overload; deprecated;
     constructor Create(AM, AK: Int32; const AA, AB, AOrder, ACofactor: TBigInteger); overload;
     constructor Create(AM, AK1, AK2, AK3: Int32; const AA, AB, AOrder, ACofactor: TBigInteger); overload;
     constructor Create(AM, AK1, AK2, AK3: Int32; const AA, AB: IECFieldElement;
@@ -1287,6 +1288,11 @@ end;
 
 { TF2mCurve }
 
+constructor TF2mCurve.Create(AM, AK: Int32; const AA, AB: TBigInteger);
+begin
+  Create(AM, AK, 0, 0, AA, AB, TBigInteger.GetDefault(), TBigInteger.GetDefault());
+end;
+
 constructor TF2mCurve.Create(AM, AK: Int32; const AA, AB, AOrder, ACofactor: TBigInteger);
 begin
   Create(AM, AK, 0, 0, AA, AB, AOrder, ACofactor);