iOS compilation fix thanks to Jan Webber Macias on Google Plus Delphi Developer Group. (#6)

iOS compilation fix thanks to Jan Webber Macias on Google Plus Delphi Developer Group.

CryptoLib/src/Asn1/ClpConstructedOctetStream.pas

@@ -40,8 +40,8 @@ type
 
   public
     constructor Create(const parser: IAsn1StreamParser);
-    function Read(buffer: TCryptoLibByteArray; offset, count: Int32)
-      : Int32; override;
+    function Read(buffer: TCryptoLibByteArray; offset, count: LongInt)
+      : LongInt; override;
     function ReadByte(): Int32; override;
   end;
 
@@ -60,7 +60,7 @@ begin
 end;
 
 function TConstructedOctetStream.Read(buffer: TCryptoLibByteArray;
-  offset, count: Int32): Int32;
+  offset, count: LongInt): LongInt;
 var
   s, aos: IAsn1OctetStringParser;
   totalRead, numRead: Int32;

CryptoLib/src/Asn1/ClpDefiniteLengthInputStream.pas

@@ -54,7 +54,7 @@ type
 
     function ReadByte(): Int32; override;
 
-    function Read(buf: TCryptoLibByteArray; off, len: Int32): Int32; override;
+    function Read(buf: TCryptoLibByteArray; off, len: LongInt): LongInt; override;
 
     procedure ReadAllIntoByteArray(var buf: TCryptoLibByteArray);
 
@@ -106,7 +106,7 @@ begin
 end;
 
 function TDefiniteLengthInputStream.Read(buf: TCryptoLibByteArray;
-  off, len: Int32): Int32;
+  off, len: LongInt): LongInt;
 var
   toRead, numRead: Int32;
 

CryptoLib/src/Asn1/ClpIndefiniteLengthInputStream.pas

@@ -44,8 +44,8 @@ type
     constructor Create(inStream: TStream; limit: Int32);
     procedure SetEofOn00(eofOn00: Boolean);
 
-    function Read(buffer: TCryptoLibByteArray; offset, count: Int32)
-      : Int32; override;
+    function Read(buffer: TCryptoLibByteArray; offset, count: LongInt)
+      : LongInt; override;
 
     function ReadByte(): Int32; override;
 
@@ -100,7 +100,7 @@ begin
 end;
 
 function TIndefiniteLengthInputStream.Read(buffer: TCryptoLibByteArray;
-  offset, count: Int32): Int32;
+  offset, count: LongInt): LongInt;
 var
   numRead: Int32;
 begin

CryptoLib/src/Interfaces/ClpIFilterStream.pas

@@ -45,8 +45,8 @@ type
     property Position: Int64 read GetPosition write SetPosition;
 
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64;
-    function Read(var Buffer; Count: Int32): Int32;
-    function Write(const Buffer; Count: Int32): Int32;
+    function Read(var Buffer; Count: LongInt): LongInt;
+    function Write(const Buffer; Count: LongInt): LongInt;
     function ReadByte(): Int32;
     procedure WriteByte(Value: Byte);
 

CryptoLib/src/Utils/IO/ClpBaseInputStream.pas

@@ -60,13 +60,12 @@ type
     function Write(const Buffer; Count: LongInt): LongInt; overload; override;
 
     function Read(Buffer: TCryptoLibByteArray; Offset, Count: LongInt)
-      : Int32; overload;
+      : LongInt; overload;
 {$IFDEF SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD} override {$ELSE} virtual
 {$ENDIF SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD};
 
     function Write(const Buffer: TCryptoLibByteArray; Offset, Count: LongInt)
-      : Int32; overload;
-{$IFDEF SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD} override {$ELSE} virtual
+      : LongInt; overload; {$IFDEF SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD} override {$ELSE} virtual
 {$ENDIF SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD};
 
     function Seek(Offset: LongInt; Origin: Word): LongInt; overload; override;
@@ -171,7 +170,7 @@ begin
 end;
 
 function TBaseInputStream.Read(Buffer: TCryptoLibByteArray;
-  Offset, Count: LongInt): Int32;
+  Offset, Count: LongInt): LongInt;
 var
   &pos, endPoint, b: Int32;
 
@@ -204,7 +203,7 @@ end;
 {$IFNDEF _FIXINSIGHT_}
 
 function TBaseInputStream.Write(const Buffer: TCryptoLibByteArray;
-  Offset, Count: LongInt): Int32;
+  Offset, Count: LongInt): LongInt;
 begin
   raise ENotSupportedCryptoLibException.Create('');
 end;

CryptoLib/src/Utils/IO/ClpFilterStream.pas

@@ -55,8 +55,8 @@ type
     property Position: Int64 read GetPosition write SetPosition;
 
     function Seek(const Offset: Int64; Origin: TSeekOrigin): Int64; override;
-    function Read(var Buffer; Count: Int32): Int32; override;
-    function Write(const Buffer; Count: Int32): Int32; override;
+    function Read(var Buffer; Count: LongInt): LongInt; override;
+    function Write(const Buffer; Count: LongInt): LongInt; override;
 
     function ReadByte(): Int32; inline;
     procedure WriteByte(Value: Byte); inline;
@@ -106,7 +106,7 @@ begin
   Fs.Position := Value;
 end;
 
-function TFilterStream.Write(const Buffer; Count: Int32): Int32;
+function TFilterStream.Write(const Buffer; Count: LongInt): LongInt;
 begin
   Result := Fs.Write(PByte(Buffer), Count);
 end;
@@ -121,7 +121,7 @@ begin
   Result := Fs.Size;
 end;
 
-function TFilterStream.Read(var Buffer; Count: Int32): Int32;
+function TFilterStream.Read(var Buffer; Count: LongInt): LongInt;
 begin
   Result := Fs.Read(PByte(Buffer), Count);
 end;