Browse Source

switched to using customcurves because its faster.

- minor cleanup
Ugochukwu Mmaduekwe 7 years ago
parent
commit
31cbd40e13

+ 8 - 4
CryptoLib.Samples/src/UsageExamples.pas

@@ -82,7 +82,7 @@ uses
   ClpIAsymmetricCipherKeyPairGenerator,
   ClpIAsymmetricCipherKeyPairGenerator,
   ClpArrayUtils,
   ClpArrayUtils,
   ClpHex,
   ClpHex,
-  ClpSecNamedCurves,
+  // ClpSecNamedCurves,
   ClpCustomNamedCurves;
   ClpCustomNamedCurves;
 
 
 type
 type
@@ -377,7 +377,8 @@ begin
   System.Assert(PayloadToEncodeBytes <> Nil,
   System.Assert(PayloadToEncodeBytes <> Nil,
     'PayloadToDecodeBytes Cannot be Nil');
     'PayloadToDecodeBytes Cannot be Nil');
 
 
-  Lcurve := TSecNamedCurves.GetByName(ACurveName);
+  // Lcurve := TSecNamedCurves.GetByName(ACurveName);
+  Lcurve := TCustomNamedCurves.GetByName(ACurveName);
   System.Assert(Lcurve <> Nil, 'Lcurve Cannot be Nil');
   System.Assert(Lcurve <> Nil, 'Lcurve Cannot be Nil');
 
 
   // Set Up Asymmetric Key Pair from known public key ByteArray
   // Set Up Asymmetric Key Pair from known public key ByteArray
@@ -439,7 +440,8 @@ begin
   System.Assert(PayloadToDecodeBytes <> Nil,
   System.Assert(PayloadToDecodeBytes <> Nil,
     'PayloadToDecodeBytes Cannot be Nil');
     'PayloadToDecodeBytes Cannot be Nil');
 
 
-  Lcurve := TSecNamedCurves.GetByName(ACurveName);
+  // Lcurve := TSecNamedCurves.GetByName(ACurveName);
+  Lcurve := TCustomNamedCurves.GetByName(ACurveName);
   System.Assert(Lcurve <> Nil, 'Lcurve Cannot be Nil');
   System.Assert(Lcurve <> Nil, 'Lcurve Cannot be Nil');
 
 
   // Set Up Asymmetric Key Pair from known private key ByteArray
   // Set Up Asymmetric Key Pair from known private key ByteArray
@@ -688,7 +690,8 @@ const
 begin
 begin
   // Full Generation Method
   // Full Generation Method
 
 
-  Lcurve := TSecNamedCurves.GetByName(CurveName);
+  // Lcurve := TSecNamedCurves.GetByName(CurveName);
+  Lcurve := TCustomNamedCurves.GetByName(CurveName);
   KeyPairGeneratorInstance := TGeneratorUtilities.GetKeyPairGenerator('ECDSA');
   KeyPairGeneratorInstance := TGeneratorUtilities.GetKeyPairGenerator('ECDSA');
   domain := TECDomainParameters.Create(Lcurve.Curve, Lcurve.G, Lcurve.N,
   domain := TECDomainParameters.Create(Lcurve.Curve, Lcurve.G, Lcurve.N,
     Lcurve.H, Lcurve.GetSeed);
     Lcurve.H, Lcurve.GetSeed);
@@ -981,6 +984,7 @@ end;
 class constructor TUsageExamples.UsageExamples;
 class constructor TUsageExamples.UsageExamples;
 begin
 begin
   FRandom := TSecureRandom.Create();
   FRandom := TSecureRandom.Create();
+  // FCurve := TSecNamedCurves.GetByName(CurveName);
   FCurve := TCustomNamedCurves.GetByName(CurveName);
   FCurve := TCustomNamedCurves.GetByName(CurveName);
 end;
 end;
 
 

+ 0 - 1
CryptoLib/src/Crypto/EC/ClpCustomNamedCurves.pas

@@ -411,7 +411,6 @@ var
   S: TCryptoLibByteArray;
   S: TCryptoLibByteArray;
   curve: IECCurve;
   curve: IECCurve;
   G: IX9ECPoint;
   G: IX9ECPoint;
-  r: IECPoint;
 begin
 begin
   S := THex.Decode('D09E8800291CB85396CC6717393284AAA0DA64BA');
   S := THex.Decode('D09E8800291CB85396CC6717393284AAA0DA64BA');
   curve := ConfigureCurve(TSecP521R1Curve.Create() as ISecP521R1Curve);
   curve := ConfigureCurve(TSecP521R1Curve.Create() as ISecP521R1Curve);