Browse Source

fixed some unused unit hint in FPC.

Ugochukwu Mmaduekwe 7 years ago
parent
commit
306f37edc6

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

@@ -24,7 +24,6 @@ interface
 uses
   SysUtils,
   ClpCryptoLibTypes,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpIProxiedInterface,

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

@@ -24,7 +24,6 @@ interface
 uses
   SysUtils,
   ClpAsn1Tags,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpDerNull,

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

@@ -30,7 +30,6 @@ uses
   ClpIProxiedInterface,
   ClpIAsn1Sequence,
   ClpAsn1Tags,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpIBerOctetString,

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

@@ -27,7 +27,6 @@ uses
   ClpIProxiedInterface,
   ClpAsn1Tags,
   ClpDerSequence,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpIAsn1EncodableVector,

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

@@ -27,7 +27,6 @@ uses
   ClpAsn1Tags,
   ClpDerSet,
   ClpIBerSet,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpIProxiedInterface,

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

@@ -31,7 +31,6 @@ uses
 {$ENDIF DELPHI}
   ClpAsn1Tags,
   ClpBerSequence,
-  ClpDerOutputStream,
   ClpAsn1OutputStream,
   ClpBerOutputStream,
   ClpIAsn1OctetString,

+ 0 - 3
CryptoLib/src/Asn1/ClpDerApplicationSpecific.pas

@@ -28,9 +28,6 @@ uses
   ClpArrayUtils,
   ClpAsn1TaggedObject,
   ClpAsn1Tags,
-  ClpDerOutputStream,
-  ClpAsn1OutputStream,
-  ClpBerOutputStream,
   ClpIProxiedInterface,
   ClpIDerApplicationSpecific,
   ClpIAsn1EncodableVector,

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

@@ -28,7 +28,6 @@ uses
   ClpBits,
   ClpArrayUtils,
   ClpDerStringBase,
-  ClpDerOutputStream,
   ClpAsn1Tags,
   ClpBigInteger,
   ClpAsn1Object,

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

@@ -24,7 +24,6 @@ interface
 uses
   SysUtils,
   ClpAsn1Tags,
-  ClpDerOutputStream,
   ClpIAsn1OctetString,
   ClpIDerBoolean,
   ClpCryptoLibTypes,

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

@@ -26,7 +26,6 @@ uses
   ClpCryptoLibTypes,
   ClpArrayUtils,
   ClpBigInteger,
-  ClpDerOutputStream,
   ClpIAsn1OctetString,
   ClpAsn1Tags,
   ClpIProxiedInterface,

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

@@ -29,7 +29,6 @@ uses
   ClpIAsn1TaggedObject,
   ClpDerTaggedObject,
   ClpAsn1Tags,
-  ClpDerOutputStream,
   ClpIAsn1EncodableVector,
   ClpIDerTaggedObject,
   ClpIProxiedInterface,

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

@@ -27,7 +27,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1OctetString,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -28,7 +28,6 @@ uses
   ClpAsn1Object,
   ClpAsn1Tags,
   ClpAsn1OctetString,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpIDerGraphicString,
   ClpIAsn1TaggedObject,

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

@@ -28,7 +28,6 @@ uses
   ClpAsn1OctetString,
   ClpAsn1Object,
   ClpStringUtils,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -26,7 +26,6 @@ uses
   ClpCryptoLibTypes,
   ClpBigInteger,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpIAsn1TaggedObject,
   ClpAsn1OctetString,

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

@@ -27,7 +27,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1OctetString,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -32,7 +32,6 @@ uses
   ClpStreamHelper,
   ClpBigInteger,
   ClpCryptoLibTypes,
-  ClpDerOutputStream,
   ClpAsn1Tags,
   ClpOidTokenizer,
   ClpIOidTokenizer,

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

@@ -27,7 +27,6 @@ uses
   ClpDerStringBase,
   ClpAsn1Tags,
   ClpAsn1OctetString,
-  ClpDerOutputStream,
   ClpAsn1Object,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,

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

@@ -27,7 +27,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1OctetString,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -28,7 +28,6 @@ uses
 {$IFDEF DELPHI}
   ClpIDerSequence,
 {$ENDIF DELPHI}
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpAsn1TaggedObject,
   ClpIDerTaggedObject;

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

@@ -29,7 +29,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1OctetString,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -27,7 +27,6 @@ uses
   ClpAsn1Tags,
   ClpAsn1OctetString,
   ClpAsn1Object,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

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

@@ -28,7 +28,6 @@ uses
   ClpAsn1Object,
   ClpAsn1Tags,
   ClpAsn1OctetString,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpIDerVideotexString,
   ClpIAsn1TaggedObject,

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

@@ -28,7 +28,6 @@ uses
   ClpAsn1Object,
   ClpIAsn1OctetString,
   ClpStringUtils,
-  ClpDerOutputStream,
   ClpIProxiedInterface,
   ClpCryptoLibTypes,
   ClpIAsn1TaggedObject,

+ 0 - 1
CryptoLib/src/Interfaces/ClpIAsn1EncodableVector.pas

@@ -22,7 +22,6 @@ unit ClpIAsn1EncodableVector;
 interface
 
 uses
-  Generics.Collections,
   ClpIProxiedInterface,
   ClpCryptoLibTypes;
 

+ 0 - 1
CryptoLib/src/Interfaces/ClpIAsn1Sequence.pas

@@ -22,7 +22,6 @@ unit ClpIAsn1Sequence;
 interface
 
 uses
-  Generics.Collections,
   ClpIProxiedInterface,
   ClpIAsn1SequenceParser,
   ClpCryptoLibTypes;

+ 0 - 1
CryptoLib/src/Interfaces/ClpIAsn1Set.pas

@@ -22,7 +22,6 @@ unit ClpIAsn1Set;
 interface
 
 uses
-  Generics.Collections,
   ClpCryptoLibTypes,
   ClpIProxiedInterface,
   ClpIAsn1SetParser;

+ 0 - 1
CryptoLib/src/Math/ClpBigInteger.pas

@@ -27,7 +27,6 @@ uses
   SysUtils,
   StrUtils,
   Generics.Collections,
-  ClpBits,
   ClpNumberStyles,
   ClpISecureRandom,
   ClpIRandom,

+ 10 - 4
CryptoLib/src/Utils/IO/ClpBaseInputStream.pas

@@ -28,14 +28,20 @@ uses
 type
   TBaseInputStream = class abstract(TStream)
 
-  strict private
+{$IFDEF DELPHI}
+  private
 
     function GetPosition: Int64; inline;
     procedure SetPosition(const Pos: Int64); inline;
     procedure SetSize64(const NewSize: Int64); inline;
-
-  strict protected
-
+{$ENDIF DELPHI}
+  protected
+
+{$IFDEF FPC}
+    function GetPosition: Int64; override;
+    procedure SetPosition(const Pos: Int64); override;
+    procedure SetSize64(const NewSize: Int64); override;
+{$ENDIF FPC}
     function GetSize: Int64; override;
     procedure SetSize(NewSize: LongInt); overload; override;
     procedure SetSize(const NewSize: Int64); overload; override;