Browse Source

removed some unused units.

* fixed some compiler warnings.
Ugochukwu Mmaduekwe 7 years ago
parent
commit
3ce05a7488

+ 0 - 1
CryptoLib/src/Asn1/ClpBerGenerator.pas

@@ -29,7 +29,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1Tags,
   ClpAsn1Generator,
   ClpAsn1Generator,
   ClpBerOutputStream,
   ClpBerOutputStream,
-  ClpIBerOutputStream,
   ClpIBerGenerator;
   ClpIBerGenerator;
 
 
 type
 type

+ 1 - 1
CryptoLib/src/Asn1/X9/ClpECNamedCurveTable.pas

@@ -25,7 +25,7 @@ uses
   Generics.Collections,
   Generics.Collections,
   ClpCryptoLibTypes,
   ClpCryptoLibTypes,
   // ClpX962NamedCurves,
   // ClpX962NamedCurves,
-  ClpECGost3410NamedCurves,
+  // ClpECGost3410NamedCurves,
   ClpX9ECParameters,
   ClpX9ECParameters,
   ClpSecNamedCurves,
   ClpSecNamedCurves,
   ClpIECDomainParameters,
   ClpIECDomainParameters,

+ 0 - 5
CryptoLib/src/Crypto/Signers/ClpECSchnorrSigner.pas

@@ -23,7 +23,6 @@ interface
 
 
 uses
 uses
   SysUtils,
   SysUtils,
-  Math,
   Generics.Collections,
   Generics.Collections,
   HlpIHash,
   HlpIHash,
   ClpISigner,
   ClpISigner,
@@ -31,10 +30,8 @@ uses
   ClpISecureRandom,
   ClpISecureRandom,
   ClpICipherParameters,
   ClpICipherParameters,
   ClpIECSchnorrSigner,
   ClpIECSchnorrSigner,
-  ClpIAsymmetricKeyParameter,
   ClpIParametersWithRandom,
   ClpIParametersWithRandom,
   ClpDerSequence,
   ClpDerSequence,
-  ClpIDerSequence,
   ClpDerInteger,
   ClpDerInteger,
   ClpIDerInteger,
   ClpIDerInteger,
   ClpAsn1Object,
   ClpAsn1Object,
@@ -300,7 +297,6 @@ function TECSchnorrSigner.Do_Sign(const pv_key: IECPrivateKeyParameters;
 var
 var
   curve: IECCurve;
   curve: IECCurve;
   n, r, s, h, tempK: TBigInteger;
   n, r, s, h, tempK: TBigInteger;
-  size: Int32;
   G, q: IECPoint;
   G, q: IECPoint;
   xQ, yQ, rQ, tempR, tempH: TCryptoLibByteArray;
   xQ, yQ, rQ, tempR, tempH: TCryptoLibByteArray;
 begin
 begin
@@ -312,7 +308,6 @@ begin
   curve := pv_key.parameters.curve;
   curve := pv_key.parameters.curve;
   n := curve.order;
   n := curve.order;
   G := pv_key.parameters.G;
   G := pv_key.parameters.G;
-  size := TBits.Asr32(curve.FieldSize, 3);
 
 
   q := G.Multiply(k);
   q := G.Multiply(k);
 
 

+ 3 - 4
CryptoLib/src/Math/ClpBigInteger.pas

@@ -616,7 +616,6 @@ var
   i: UInt32;
   i: UInt32;
   primeList: TCryptoLibInt32Array;
   primeList: TCryptoLibInt32Array;
   product, j: Int32;
   product, j: Int32;
-  b: TBigInteger;
 begin
 begin
 
 
   System.SetLength(FZeroEncoding, 0);
   System.SetLength(FZeroEncoding, 0);
@@ -2010,18 +2009,18 @@ end;
 
 
 function TBigInteger.IsEqualMagnitude(const x: TBigInteger): Boolean;
 function TBigInteger.IsEqualMagnitude(const x: TBigInteger): Boolean;
 var
 var
-  xMag: TCryptoLibInt32Array;
   i: Integer;
   i: Integer;
+  xMag: TCryptoLibInt32Array;
 begin
 begin
   xMag := x.Fmagnitude;
   xMag := x.Fmagnitude;
-  if (System.length(Fmagnitude) <> System.length(x.Fmagnitude)) then
+  if (System.length(Fmagnitude) <> System.length(xMag)) then
   begin
   begin
     Result := false;
     Result := false;
     Exit;
     Exit;
   end;
   end;
   for i := 0 to System.Pred(System.length(Fmagnitude)) do
   for i := 0 to System.Pred(System.length(Fmagnitude)) do
   begin
   begin
-    if (Fmagnitude[i] <> x.Fmagnitude[i]) then
+    if (Fmagnitude[i] <> xMag[i]) then
     begin
     begin
       Result := false;
       Result := false;
       Exit;
       Exit;

+ 0 - 1
CryptoLib/src/Math/EC/ClpECCurve.pas

@@ -25,7 +25,6 @@ uses
   SyncObjs,
   SyncObjs,
   SysUtils,
   SysUtils,
   Generics.Collections,
   Generics.Collections,
-  ClpSetWeakRef,
   ClpECPoint,
   ClpECPoint,
   ClpCryptoLibTypes,
   ClpCryptoLibTypes,
   ClpBigInteger,
   ClpBigInteger,

+ 0 - 1
CryptoLib/src/Security/ClpSignerUtilities.pas

@@ -29,7 +29,6 @@ uses
   HlpIHash,
   HlpIHash,
   ClpDsaDigestSigner,
   ClpDsaDigestSigner,
   ClpECSchnorrSigner,
   ClpECSchnorrSigner,
-  ClpIECSchnorrSigner,
   ClpX9ObjectIdentifiers,
   ClpX9ObjectIdentifiers,
   ClpTeleTrusTObjectIdentifiers,
   ClpTeleTrusTObjectIdentifiers,
   ClpCryptoProObjectIdentifiers,
   ClpCryptoProObjectIdentifiers,

+ 2 - 5
CryptoLib/src/Utils/Encoders/ClpBase64.pas

@@ -30,17 +30,14 @@ type
 
 
   public
   public
     class function Encode(Input: TCryptoLibByteArray): String; static;
     class function Encode(Input: TCryptoLibByteArray): String; static;
-    class function Decode(const Input:
-{$IFDEF FPC}UnicodeString{$ELSE}String{$ENDIF FPC})
-      : TCryptoLibByteArray; static;
+    class function Decode(const Input: String): TCryptoLibByteArray; static;
   end;
   end;
 
 
 implementation
 implementation
 
 
 { TBase64 }
 { TBase64 }
 
 
-class function TBase64.Decode(const Input:
-{$IFDEF FPC}UnicodeString{$ELSE}String{$ENDIF FPC}): TCryptoLibByteArray;
+class function TBase64.Decode(const Input: String): TCryptoLibByteArray;
 begin
 begin
   result := SbpBase64.TBase64.Default.Decode(Input);
   result := SbpBase64.TBase64.Default.Decode(Input);
 end;
 end;