some fixes

CryptoLib.Tests/src/Others/CertTests.pas

@@ -1393,6 +1393,7 @@ var
   LKp: IAsymmetricCipherKeyPair;
   LCrlGen: IX509V2CrlGenerator;
   LCrl, LNewCrl, LReadCrl: IX509Crl;
+  LCrlParser: IX509CrlParser;
   LEntry: IX509CrlEntry;
   LExtOids: TList<IDerObjectIdentifier>;
   LExtValues: TList<IX509Extension>;
@@ -1496,11 +1497,12 @@ begin
     if not (LOneFound and LTwoFound) then
       Fail('wrong CRLs found in copied list');
 
-    LReadCrl := TX509CrlParser.Create.ReadCrl(LNewCrl.GetEncoded());
+    LCrlParser := TX509CrlParser.Create;
+    LReadCrl := LCrlParser.ReadCrl(LNewCrl.GetEncoded());
     if LReadCrl = nil then
       Fail('crl not returned!');
 
-    LCol := TX509CrlParser.Create.ReadCrls(LNewCrl.GetEncoded());
+    LCol := LCrlParser.ReadCrls(LNewCrl.GetEncoded());
     if Length(LCol) <> 1 then
       Fail('wrong number of CRLs found in collection');
   finally

CryptoLib/src/Crypto/Engines/ClpIesEngine.pas

@@ -554,21 +554,21 @@ end;
 function TIesEngine.ProcessBlock(const AIn: TCryptoLibByteArray;
   AInOff, AInLen: Int32): TCryptoLibByteArray;
 var
-  ephKeyPair: IEphemeralKeyPair;
-  bIn: TBytesStream;
-  encLength: Int32;
-  z: TBigInteger;
+  LEphKeyPair: IEphemeralKeyPair;
+  LBIn: TBytesStream;
+  LEncLength: Int32;
+  LZ: TBigInteger;
   BigZ, VZ: TCryptoLibByteArray;
-  kdfParam: IKDFParameters;
+  LKdfParam: IKDFParameters;
 begin
   if (FForEncryption) then
   begin
     if (FKeyPairGenerator <> nil) then
     begin
-      ephKeyPair := FKeyPairGenerator.Generate;
+      LEphKeyPair := FKeyPairGenerator.Generate;
 
-      FPrivParam := ephKeyPair.GetKeyPair.Private;
-      FV := ephKeyPair.GetEncodedPublicKey;
+      FPrivParam := LEphKeyPair.GetKeyPair.Private;
+      FV := LEphKeyPair.GetEncodedPublicKey;
     end
   end
   else
@@ -576,13 +576,13 @@ begin
     if (FKeyParser <> nil) then
     begin
       // used TBytesStream here for one pass creation and population with byte array :)
-      bIn := TBytesStream.Create(System.Copy(AIn, AInOff, AInLen));
+      LBIn := TBytesStream.Create(System.Copy(AIn, AInOff, AInLen));
 
       try
-        bIn.Position := 0;
+        LBIn.Position := 0;
 
         try
-          FPubParam := FKeyParser.ReadKey(bIn);
+          FPubParam := FKeyParser.ReadKey(LBIn);
         except
           on e: EIOCryptoLibException do
           begin
@@ -598,19 +598,19 @@ begin
 
         end;
 
-        encLength := (AInLen - (bIn.Size - bIn.Position));
-        FV := TArrayUtilities.CopyOfRange<Byte>(AIn, AInOff, AInOff + encLength);
+        LEncLength := (AInLen - (LBIn.Size - LBIn.Position));
+        FV := TArrayUtilities.CopyOfRange<Byte>(AIn, AInOff, AInOff + LEncLength);
 
       finally
-        bIn.Free;
+        LBIn.Free;
       end;
     end;
   end;
 
   // Compute the common value and convert to byte array.
   FAgree.Init(FPrivParam);
-  z := FAgree.CalculateAgreement(FPubParam);
-  BigZ := TBigIntegers.AsUnsignedByteArray(FAgree.GetFieldSize, z);
+  LZ := FAgree.CalculateAgreement(FPubParam);
+  BigZ := TBigIntegers.AsUnsignedByteArray(FAgree.GetFieldSize, LZ);
 
   // Create input to KDF.
   if (System.Length(FV) <> 0) then
@@ -622,8 +622,8 @@ begin
 
   try
     // Initialise the KDF.
-    kdfParam := TKDFParameters.Create(BigZ, FParam.GetDerivationV);
-    FKdf.Init(kdfParam);
+    LKdfParam := TKDFParameters.Create(BigZ, FParam.GetDerivationV);
+    FKdf.Init(LKdfParam);
 
     if FForEncryption then
     begin

CryptoLib/src/IO/ClpStreamUtilities.pas

@@ -239,7 +239,7 @@ begin
 end;
 
 class function TStreamUtilities.WriteBufTo(const ABuf: TMemoryStream;
-  const AOutput: TBytes; AOffset: Integer): Integer;
+  const AOutput: TCryptoLibByteArray; AOffset: Integer): Integer;
 begin
   Result := ABuf.Size;
 

CryptoLib/src/Math/EC/ClpECCurve.pas

@@ -68,7 +68,7 @@ type
   TDefaultLookupTable = class sealed(TAbstractECLookupTable, IECLookupTable)
   strict private
     FOuter: IECCurve;
-    FTable: TBytes;
+    FTable: TCryptoLibByteArray;
     FSize: Int32;
     function CreatePoint(const AX, AY: TCryptoLibByteArray): IECPoint;
   public
@@ -302,7 +302,7 @@ function TECCurve.TDefaultLookupTable.Lookup(AIndex: Int32): IECPoint;
 var
   LFeBytes, LPos, I, J: Int32;
   LMask: Byte;
-  LX, LY: TBytes;
+  LX, LY: TCryptoLibByteArray;
 begin
   LFeBytes := FOuter.GetFieldElementEncodingLength();
   SetLength(LX, LFeBytes);
@@ -324,7 +324,7 @@ end;
 function TECCurve.TDefaultLookupTable.LookupVar(AIndex: Int32): IECPoint;
 var
   LFeBytes, LPos, J: Int32;
-  LX, LY: TBytes;
+  LX, LY: TCryptoLibByteArray;
 begin
   LFeBytes := FOuter.GetFieldElementEncodingLength();
   SetLength(LX, LFeBytes);
@@ -338,7 +338,7 @@ begin
   Result := CreatePoint(LX, LY);
 end;
 
-function TECCurve.TDefaultLookupTable.CreatePoint(const AX, AY: TBytes): IECPoint;
+function TECCurve.TDefaultLookupTable.CreatePoint(const AX, AY: TCryptoLibByteArray): IECPoint;
 var
   LX, LY: IECFieldElement;
 begin
@@ -549,7 +549,7 @@ function TECCurve.CreateCacheSafeLookupTable(const APoints: TCryptoLibGenericArr
   AOff, ALen: Int32): IECLookupTable;
 var
   LFeBytes, LPos, I: Int32;
-  LTable: TBytes;
+  LTable: TCryptoLibByteArray;
   LP: IECPoint;
 begin
   LFeBytes := GetFieldElementEncodingLength();

CryptoLib/src/Math/EC/ClpECPoint.pas

@@ -784,7 +784,7 @@ var
   LC: IECCurve;
   LP: IECPoint;
 begin
-  LC := GetCurve();
+  LC := Curve;
   if LC = nil then
     Result := 0
   else
@@ -1771,7 +1771,7 @@ begin
   if IsInfinity then
     Exit(Self as IAbstractF2mPoint);
 
-  LCurve := GetCurve;
+  LCurve := Curve;
   LCoord := LCurve.CoordinateSystem;
 
   LX1 := RawXCoord;
@@ -1805,7 +1805,7 @@ begin
   if IsInfinity then
     Exit(Self as IAbstractF2mPoint);
 
-  LCurve := GetCurve;
+  LCurve := Curve;
   LCoord := LCurve.CoordinateSystem;
 
   LX1 := RawXCoord;

CryptoLib/src/Math/Raw/ClpNat320.pas

@@ -117,7 +117,7 @@ end;
 
 class function TNat320.ToBigInteger64(const AX: TCryptoLibUInt64Array): TBigInteger;
 var
-  LBs: TBytes;
+  LBs: TCryptoLibByteArray;
   LX_i: UInt64;
   LI: Int32;
 begin

CryptoLib/src/Math/Raw/ClpNat576.pas

@@ -118,7 +118,7 @@ end;
 
 class function TNat576.ToBigInteger64(const AX: TCryptoLibUInt64Array): TBigInteger;
 var
-  LBs: TBytes;
+  LBs: TCryptoLibByteArray;
   LI: Int32;
   LXI: UInt64;
 begin

CryptoLib/src/Misc/ClpWeakRef.pas

@@ -29,7 +29,7 @@ type
   public
     procedure Assign(const AValue: T); inline;
     procedure Clear; inline;
-    function TryGetTarget(out target: T): Boolean; inline;
+    function TryGetTarget(out ATarget: T): Boolean; inline;
     function IsAlive: Boolean; inline;
 
     property Target: T read GetTarget;
@@ -57,13 +57,13 @@ begin
   Result := T(IInterface(FTarget));
 end;
 
-function TWeakRef<T>.TryGetTarget(out target: T): Boolean;
+function TWeakRef<T>.TryGetTarget(out ATarget: T): Boolean;
 begin
   Result := FTarget <> nil;
   if Result then
-    target := T(IInterface(FTarget))
+    ATarget := T(IInterface(FTarget))
   else
-    target := Default(T);
+    ATarget := Default(T);
 end;
 
 function TWeakRef<T>.IsAlive: Boolean;
@@ -73,7 +73,7 @@ end;
 
 class operator TWeakRef<T>.Implicit(const AValue: T): TWeakRef<T>;
 begin
-  Result.FTarget := Pointer(IInterface(AValue));
+  Result.Assign(AValue);
 end;
 
 class operator TWeakRef<T>.Implicit(const A: TWeakRef<T>): T;