some code refactorings

CryptoLib.Tests/src/Asn1/StringTests.pas

@@ -152,10 +152,6 @@ begin
     Fail('DerT61String.GetString() result incorrect');
   end;
 
-  if (not(t61.ToString() = (t61String))) then
-  begin
-    Fail('DerT61String.ToString() result incorrect');
-  end;
 end;
 
 initialization

CryptoLib/src/Asn1/ClpDerApplicationSpecific.pas

@@ -317,7 +317,7 @@ end;
 class function TDerApplicationSpecific.ReplaceTagNumber(newTag: Int32;
   const input: TCryptoLibByteArray): TCryptoLibByteArray;
 var
-  tagNo, index, b: Int32;
+  tagNo, index, b, remaining: Int32;
   tmp: TCryptoLibByteArray;
 begin
   tagNo := input[0] and $1F;
@@ -327,35 +327,29 @@ begin
   //
   if (tagNo = $1F) then
   begin
-    // tagNo := 0;
 
-    b := input[index] and $FF;
+    b := input[index];
     System.Inc(index);
 
     // X.690-0207 8.1.2.4.2
     // "c) bits 7 to 1 of the first subsequent octet shall not all be zero."
     if ((b and $7F) = 0) then // Note: -1 will pass
     begin
-      raise EInvalidOperationCryptoLibException.CreateRes(@SCorruptedStream);
+      raise EIOCryptoLibException.CreateRes(@SCorruptedStream);
     end;
 
-    while ((b >= 0) and ((b and $80) <> 0)) do
+    while ((b and $80) <> 0) do
     begin
-      // tagNo := tagNo or ((b and $7F));
-      // tagNo := tagNo shl 7;
-      b := input[index] and $FF;
+      b := input[index];
       System.Inc(index);
     end;
 
-    // tagNo := tagNo or (b and $7F);
   end;
 
-  System.SetLength(tmp, System.Length(input) - index + 1);
-
-  System.Move(input[index], tmp[1], System.Length(tmp) - 1 *
-    System.SizeOf(Byte));
-
+  remaining := System.Length(input) - index;
+  System.SetLength(tmp, 1 + remaining);
   tmp[0] := Byte(newTag);
+  System.Move(input[index], tmp[1], remaining * System.SizeOf(Byte));
 
   result := tmp;
 end;

CryptoLib/src/Math/EC/Multiplier/ClpFixedPointCombMultiplier.pas

@@ -22,6 +22,7 @@ unit ClpFixedPointCombMultiplier;
 interface
 
 uses
+  ClpBits,
   ClpBigInteger,
   ClpNat,
   ClpCryptoLibTypes,
@@ -68,7 +69,8 @@ function TFixedPointCombMultiplier.MultiplyPositive(const p: IECPoint;
 var
   c: IECCurve;
   R, add: IECPoint;
-  size, width, d, top, i, j, secretIndex, fullComb: Int32;
+  size, width, d, top, i, j, fullComb: Int32;
+  secretIndex, secretBit: UInt32;
   info: IFixedPointPreCompInfo;
   lookupTable: IECLookupTable;
   LK: TCryptoLibUInt32Array;
@@ -108,14 +110,15 @@ begin
     while j >= 0 do
     begin
 
+      secretBit := LK[TBits.Asr32(j, 5)] shr (j and $1F);
+      secretIndex := secretIndex xor (secretBit shr 1);
       secretIndex := secretIndex shl 1;
-
-      secretIndex := secretIndex or Int32(TNat.GetBit(LK, j));
+      secretIndex := secretIndex xor secretBit;
 
       System.Dec(j, d);
     end;
 
-    add := lookupTable.Lookup(secretIndex);
+    add := lookupTable.Lookup(Int32(secretIndex));
     R := R.TwicePlus(add);
 
   end;

CryptoLib/src/Math/Raw/ClpNat.pas

@@ -155,6 +155,10 @@ type
       const y: TCryptoLibUInt32Array; yOff: Int32;
       const zz: TCryptoLibUInt32Array; zzOff: Int32); overload; static;
 
+    class procedure Mul(const x: TCryptoLibUInt32Array; xOff, xLen: Int32;
+      const y: TCryptoLibUInt32Array; yOff, yLen: Int32;
+      const zz: TCryptoLibUInt32Array; zzOff: Int32); overload; static;
+
     class function Mul31BothAdd(len: Int32; a: UInt32;
       const x: TCryptoLibUInt32Array; b: UInt32;
       const y, z: TCryptoLibUInt32Array; zOff: Int32): UInt32; static;
@@ -1152,12 +1156,12 @@ class procedure TNat.Mul(len: Int32; const x, y, zz: TCryptoLibUInt32Array);
 var
   I: Int32;
 begin
-  zz[len] := UInt32(MulWord(len, x[0], y, zz));
+  zz[len] := MulWord(len, x[0], y, zz);
 
   for I := 1 to System.Pred(len) do
 
   begin
-    zz[I + len] := UInt32(MulWordAddTo(len, x[I], y, 0, zz, I));
+    zz[I + len] := MulWordAddTo(len, x[I], y, 0, zz, I);
   end;
 end;
 
@@ -1167,12 +1171,27 @@ class procedure TNat.Mul(len: Int32; const x: TCryptoLibUInt32Array;
 var
   I: Int32;
 begin
-  zz[zzOff + len] := UInt32(MulWord(len, x[xOff], y, yOff, zz, zzOff));
+  zz[zzOff + len] := MulWord(len, x[xOff], y, yOff, zz, zzOff);
 
   for I := 1 to System.Pred(len) do
   begin
-    zz[zzOff + I + len] := UInt32(MulWordAddTo(len, x[xOff + I], y, yOff, zz,
-      zzOff + I));
+    zz[zzOff + I + len] := MulWordAddTo(len, x[xOff + I], y, yOff, zz,
+      zzOff + I);
+  end;
+end;
+
+class procedure TNat.Mul(const x: TCryptoLibUInt32Array; xOff, xLen: Int32;
+  const y: TCryptoLibUInt32Array; yOff, yLen: Int32;
+  const zz: TCryptoLibUInt32Array; zzOff: Int32);
+var
+  I: Int32;
+begin
+  zz[zzOff + yLen] := MulWord(yLen, x[xOff], y, yOff, zz, zzOff);
+
+  for I := 1 to System.Pred(xLen) do
+  begin
+    zz[zzOff + I + yLen] := MulWordAddTo(yLen, x[xOff + I], y, yOff, zz,
+      zzOff + I);
   end;
 end;