some tests refactorings

CryptoLib.Tests/src/Asn1/X509/DeltaCertificateTests.pas

@@ -187,7 +187,7 @@ begin
   Check(LBaseCert.IsSignatureValid(LEcRootCert.GetPublicKey), 'base signed by ec_dsa_root');
   LDeltaCert := TDeltaCertificateTool.ExtractDeltaCertificate(LBaseCert);
   LExtCert := ReadCert(FDeltaEcDsaDualSigEe);
-  Check(TArrayUtilities.AreEqual<Byte>(LExtCert.GetEncoded, LDeltaCert.GetEncoded), 'delta equals ec_dsa_dual_sig_ee');
+  Check(AreEqual(LExtCert.GetEncoded, LDeltaCert.GetEncoded), 'delta equals ec_dsa_dual_sig_ee');
   Check(LDeltaCert.IsSignatureValid(LEcRootCert.GetPublicKey), 'delta signed by ec_dsa_root');
 end;
 

CryptoLib.Tests/src/Crypto/PssTests.pas

@@ -286,7 +286,7 @@ begin
   eng.BlockUpdate(msg, 0, System.Length(msg));
   s := eng.GenerateSignature();
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(s, sig),
+  CheckTrue(AreEqual(s, sig),
     Format('Test %d: PSS signature generation failed', [id]));
 
   eng.Init(False, pub);

CryptoLib.Tests/src/Crypto/RSATests.pas

@@ -209,7 +209,7 @@ begin
   engine.Init(False, privParams);
   decrypted := engine.ProcessBlock(encrypted, 0, System.Length(encrypted));
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(input, decrypted), 'RSA round-trip failed');
+  CheckTrue(AreEqual(input, decrypted), 'RSA round-trip failed');
 end;
 
 procedure TTestRSA.DoTestPkcs1Encoding;
@@ -235,7 +235,7 @@ begin
   engine.Init(False, privParams);
   decrypted := engine.ProcessBlock(encrypted, 0, System.Length(encrypted));
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(input, decrypted), 'PKCS1 round-trip failed');
+  CheckTrue(AreEqual(input, decrypted), 'PKCS1 round-trip failed');
 end;
 
 procedure TTestRSA.DoTestOaepEncoding;
@@ -261,7 +261,7 @@ begin
   engine.Init(False, privParams);
   decrypted := engine.ProcessBlock(encrypted, 0, System.Length(encrypted));
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(input, decrypted), 'OAEP round-trip failed');
+  CheckTrue(AreEqual(input, decrypted), 'OAEP round-trip failed');
 end;
 
 procedure TTestRSA.DoTestKeyGeneration;
@@ -302,7 +302,7 @@ begin
   engine.Init(False, privKey);
   decrypted := engine.ProcessBlock(encrypted, 0, System.Length(encrypted));
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(input, decrypted), 'Generated key round-trip failed');
+  CheckTrue(AreEqual(input, decrypted), 'Generated key round-trip failed');
 end;
 
 procedure TTestRSA.DoTestRsaSignature;

CryptoLib.Tests/src/Crypto/X931SignerTests.pas

@@ -227,7 +227,7 @@ begin
 
   LS := LSigner.GenerateSignature();
 
-  CheckTrue(TArrayUtilities.AreEqual<Byte>(LSig, LS), 'RSA X931 sig test 3 failed.');
+  CheckTrue(AreEqual(LSig, LS), 'RSA X931 sig test 3 failed.');
 
   LSigner.Init(False, LRsaPublic);
 

CryptoLib.Tests/src/CryptoLibTestBase.pas

@@ -36,6 +36,7 @@ type
     procedure ZeroFill(const data: TBytes);
     function Prepend(const data: TBytes; b: Byte): TBytes;
     function AreEqual(const A, b: TBytes): Boolean;
+    function CopyOfRange(const AData: TBytes; AFrom, ATo: Int32): TBytes;
 
   end;
 
@@ -74,4 +75,9 @@ begin
   result := TArrayUtilities.AreEqual<Byte>(A, b);
 end;
 
+function TCryptoLibAlgorithmTestCase.CopyOfRange(const AData: TBytes; AFrom, ATo: Int32): TBytes;
+begin
+  Result := TArrayUtilities.CopyOfRange<Byte>(AData, AFrom, ATo);
+end;
+
 end.

CryptoLib.Tests/src/Math/PrimesTests.pas

@@ -225,14 +225,14 @@ begin
         LSt2 := TPrimes.GenerateSTRandomPrime(LDigest, PRIME_BITS, LInputSeed);
         CheckTrue(LSt.Prime.Equals(LSt2.Prime), 'same seed -> same prime');
         CheckEquals(LSt.PrimeGenCounter, LSt2.PrimeGenCounter, 'same seed -> same counter');
-        CheckTrue(TArrayUtilities.AreEqual<Byte>(LSt.PrimeSeed, LSt2.PrimeSeed), 'same seed -> same PrimeSeed');
+        CheckTrue(AreEqual(LSt.PrimeSeed, LSt2.PrimeSeed), 'same seed -> same PrimeSeed');
 
         for LI := 0 to System.Length(LInputSeed) - 1 do
           LInputSeed[LI] := LInputSeed[LI] xor $FF;
 
         LSt3 := TPrimes.GenerateSTRandomPrime(LDigest, PRIME_BITS, LInputSeed);
         CheckTrue(not LSt.Prime.Equals(LSt3.Prime), 'different seed -> different prime');
-        CheckFalse(TArrayUtilities.AreEqual<Byte>(LSt.PrimeSeed, LSt3.PrimeSeed), 'different seed -> different PrimeSeed');
+        CheckFalse(AreEqual(LSt.PrimeSeed, LSt3.PrimeSeed), 'different seed -> different PrimeSeed');
 
         if LSt.PrimeGenCounter = LSt3.PrimeGenCounter then
           Inc(LCoincidenceCount);

CryptoLib.Tests/src/Others/Ed25519HigherLevelTests.pas

@@ -923,9 +923,9 @@ begin
       Fail('x509PubBytes too short');
     if System.Length(LX509PrivBytes) < 16 then
       Fail('x509PrivBytes too short');
-    LPubBytes := TArrayUtilities.CopyOfRange<Byte>(LX509PubBytes, 12,
+    LPubBytes := CopyOfRange(LX509PubBytes, 12,
       System.Length(LX509PubBytes));
-    LPrivBytes := TArrayUtilities.CopyOfRange<Byte>(LX509PrivBytes, 16,
+    LPrivBytes := CopyOfRange(LX509PrivBytes, 16,
       System.Length(LX509PrivBytes));
 
     LPub := TEd25519PublicKeyParameters.Create(LPubBytes);

CryptoLib/src/Asn1/X509/ClpX509NameTokenizer.pas

@@ -28,7 +28,7 @@ uses
 
 type
   /// <summary>
-  /// Class for breaking up an X500 Name into its component tokens, ala java.util.StringTokenizer.
+  /// Class for breaking up an X500 Name into its component tokens.
   /// </summary>
   TX509NameTokenizer = class sealed(TInterfacedObject, IX509NameTokenizer)