Browse Source

updated version number.

updated version number and minor cleanup.
Ugochukwu Mmaduekwe 7 years ago
parent
commit
720afc4754

+ 5 - 4
CryptoLib.Tests/src/Math/ECAlgorithmsTests.pas

@@ -99,6 +99,8 @@ procedure TTestECAlgorithms.AddTestCurves(x9s: TList<IX9ECParameters>;
   const x9: IX9ECParameters);
   const x9: IX9ECParameters);
 var
 var
   curve, c: IECCurve;
   curve, c: IECCurve;
+  point: IECPoint;
+  params: IX9ECParameters;
   coord, i: Int32;
   coord, i: Int32;
   coords: TCryptoLibInt32Array;
   coords: TCryptoLibInt32Array;
 begin
 begin
@@ -116,8 +118,9 @@ begin
     else if (curve.SupportsCoordinateSystem(coord)) then
     else if (curve.SupportsCoordinateSystem(coord)) then
     begin
     begin
       c := curve.Configure().SetCoordinateSystem(coord).CreateCurve();
       c := curve.Configure().SetCoordinateSystem(coord).CreateCurve();
-      x9s.Add(TX9ECParameters.Create(c, c.ImportPoint(x9.G), x9.N, x9.H)
-        as IX9ECParameters);
+      point := c.ImportPoint(x9.G);
+      params := TX9ECParameters.Create(c, point, x9.N, x9.H);
+      // x9s.Add(params);
     end;
     end;
   end;
   end;
 end;
 end;
@@ -226,7 +229,6 @@ function TTestECAlgorithms.GetTestCurves
   : TCryptoLibGenericArray<IX9ECParameters>;
   : TCryptoLibGenericArray<IX9ECParameters>;
 var
 var
   name: string;
   name: string;
-var
   x9s: TList<IX9ECParameters>;
   x9s: TList<IX9ECParameters>;
   tempList: TList<String>;
   tempList: TList<String>;
   tempDict: TDictionary<String, String>;
   tempDict: TDictionary<String, String>;
@@ -307,7 +309,6 @@ begin
   begin
   begin
     DoTestSumOfMultiplies(x9);
     DoTestSumOfMultiplies(x9);
   end;
   end;
-
 end;
 end;
 
 
 procedure TTestECAlgorithms.TestSumOfTwoMultiplies;
 procedure TTestECAlgorithms.TestSumOfTwoMultiplies;

+ 0 - 2
CryptoLib/src/Math/EC/Multiplier/ClpWTauNafMultiplier.pas

@@ -50,8 +50,6 @@ type
   const
   const
     PRECOMP_NAME = 'bc_wtnaf';
     PRECOMP_NAME = 'bc_wtnaf';
 
 
-  var
-    Fpre: IWTauNafPreCompInfo;
     // /**
     // /**
     // * Multiplies a {@link org.bouncycastle.math.ec.AbstractF2mPoint AbstractF2mPoint}
     // * Multiplies a {@link org.bouncycastle.math.ec.AbstractF2mPoint AbstractF2mPoint}
     // * by an element <code>&#955;</code> of <code><b>Z</b>[&#964;]</code> using
     // * by an element <code>&#955;</code> of <code><b>Z</b>[&#964;]</code> using

+ 1 - 1
CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.lpk

@@ -24,7 +24,7 @@
 
 
  Acknowledgements: 
  Acknowledgements: 
 Thanks to Sphere 10 Software (http://sphere10.com) for sponsoring the development of this library "/>
 Thanks to Sphere 10 Software (http://sphere10.com) for sponsoring the development of this library "/>
-    <Version Major="1"/>
+    <Version Major="1" Minor="1"/>
     <Files Count="279">
     <Files Count="279">
       <Item1>
       <Item1>
         <Filename Value="..\..\Asn1\ClpAsn1Encodable.pas"/>
         <Filename Value="..\..\Asn1\ClpAsn1Encodable.pas"/>