some refactorings.

CryptoLib.Tests/src/Math/ECPointTests.pas

@@ -741,9 +741,8 @@ begin
   for i := 0 to System.Pred(System.Length(FpointSource) div 2) do
 
   begin
-    Fp[i] := Fcurve.CreatePoint
-      (TBigInteger.Create(FpointSource[2 * i].ToString()),
-      TBigInteger.Create(FpointSource[2 * i + 1].ToString()));
+    Fp[i] := Fcurve.CreatePoint(TBigInteger.Create(IntToStr(FpointSource[2 * i])
+      ), TBigInteger.Create(IntToStr(FpointSource[2 * i + 1])));
   end;
 end;
 

CryptoLib/src/Asn1/ClpAsn1InputStream.pas

@@ -97,7 +97,7 @@ type
 
   var
     Flimit: Int32;
-    FtmpBuffers: TCryptoLibMatrixGenericArray<Byte>;
+    FtmpBuffers: TCryptoLibMatrixByteArray;
     FStream: TStream;
 
     /// <summary>
@@ -152,12 +152,12 @@ type
     class function ReadLength(s: TStream; limit: Int32): Int32; static;
 
     class function GetBuffer(const defIn: IDefiniteLengthInputStream;
-      tmpBuffers: TCryptoLibMatrixGenericArray<Byte>): TCryptoLibByteArray;
+      tmpBuffers: TCryptoLibMatrixByteArray): TCryptoLibByteArray;
       static; inline;
 
     class function CreatePrimitiveDerObject(tagNo: Int32;
       const defIn: IDefiniteLengthInputStream;
-      tmpBuffers: TCryptoLibMatrixGenericArray<Byte>): IAsn1Object; static;
+      tmpBuffers: TCryptoLibMatrixByteArray): IAsn1Object; static;
   end;
 
 implementation
@@ -202,7 +202,7 @@ begin
 end;
 
 class function TAsn1InputStream.GetBuffer(const defIn
-  : IDefiniteLengthInputStream; tmpBuffers: TCryptoLibMatrixGenericArray<Byte>)
+  : IDefiniteLengthInputStream; tmpBuffers: TCryptoLibMatrixByteArray)
   : TCryptoLibByteArray;
 var
   len: Int32;
@@ -230,7 +230,7 @@ end;
 
 class function TAsn1InputStream.CreatePrimitiveDerObject(tagNo: Int32;
   const defIn: IDefiniteLengthInputStream;
-  tmpBuffers: TCryptoLibMatrixGenericArray<Byte>): IAsn1Object;
+  tmpBuffers: TCryptoLibMatrixByteArray): IAsn1Object;
 var
   bytes: TCryptoLibByteArray;
 begin

CryptoLib/src/Asn1/ClpAsn1StreamParser.pas

@@ -65,7 +65,7 @@ type
   var
     F_in: TStream;
     F_limit: Int32;
-    FtmpBuffers: TCryptoLibMatrixGenericArray<Byte>;
+    FtmpBuffers: TCryptoLibMatrixByteArray;
 
     procedure Set00Check(enabled: Boolean); inline;
 

CryptoLib/src/Asn1/ClpDefiniteLengthInputStream.pas

@@ -34,7 +34,7 @@ resourcestring
   SInvalidBufferLength = 'Buffer Length Not Right For Data';
 
 type
-  TDefiniteLengthInputStream = class sealed(TLimitedInputStream,
+  TDefiniteLengthInputStream = class(TLimitedInputStream,
     IDefiniteLengthInputStream)
 
   strict private

CryptoLib/src/Include/CryptoLib.inc

@@ -107,6 +107,7 @@
  // XE3 and Above
 {$IF CompilerVersion >= 24.0}
 {$DEFINE DELPHIXE3_UP}
+{$DEFINE SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD}
 {$LEGACYIFEND ON}
 {$ZEROBASEDSTRINGS OFF}
 {$IFEND}

CryptoLib/src/Utils/IO/ClpBaseInputStream.pas

@@ -32,15 +32,16 @@ type
   strict protected
     function QueryInterface({$IFDEF FPC}constref {$ELSE}const
 {$ENDIF FPC} IID: TGUID; out Obj): HResult; {$IFDEF MSWINDOWS} stdcall
-    {$ELSE} cdecl {$ENDIF MSWINDOWS};
+{$ELSE} cdecl {$ENDIF MSWINDOWS};
     function _AddRef: Integer; {$IFDEF MSWINDOWS} stdcall {$ELSE} cdecl
-    {$ENDIF MSWINDOWS};
+{$ENDIF MSWINDOWS};
     function _Release: Integer; {$IFDEF MSWINDOWS} stdcall {$ELSE} cdecl
-    {$ENDIF MSWINDOWS};
+{$ENDIF MSWINDOWS};
   public
     function ReadByte: Int32; virtual;
     function Read(Buffer: TCryptoLibByteArray; Offset, Count: Longint): Int32;
-{$IFDEF DELPHI} override {$ELSE} virtual {$ENDIF DELPHI};
+{$IFDEF SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD} override {$ELSE} virtual
+{$ENDIF SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD};
   end;
 
 implementation