rename ClpBigIntegers to ClpBigIntegerUtilities

CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.dpr

@@ -45,7 +45,7 @@ uses
   ClpAsymmetricKeyParameter in '..\..\CryptoLib\src\Crypto\Parameters\ClpAsymmetricKeyParameter.pas',
   ClpBaseKdfBytesGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpBaseKdfBytesGenerator.pas',
   ClpBigInteger in '..\..\CryptoLib\src\Math\ClpBigInteger.pas',
-  ClpBigIntegers in '..\..\CryptoLib\src\Math\ClpBigIntegers.pas',
+  ClpBigIntegerUtilities in '..\..\CryptoLib\src\Math\ClpBigIntegerUtilities.pas',
   ClpPrimes in '..\..\CryptoLib\src\Math\ClpPrimes.pas',
   ClpBitConverter in '..\..\CryptoLib\src\Misc\ClpBitConverter.pas',
   ClpCbcBlockCipher in '..\..\CryptoLib\src\Crypto\Ciphers\ClpCbcBlockCipher.pas',

CryptoLib.Tests/src/Math/ECNRTests.pas

@@ -54,7 +54,7 @@ uses
   ClpFixedSecureRandom,
   ClpSignerUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpConverters,
   ClpCryptoLibTypes,
   ClpDigestUtilities,
@@ -530,7 +530,7 @@ begin
   order := (myPair.Public as IECPublicKeyParameters).parameters.n;
 
   signer.Init(true, myPair.Private);
-  msg := TBigIntegers.AsUnsignedByteArray(order.Subtract(TBigInteger.One));
+  msg := TBigIntegerUtilities.AsUnsignedByteArray(order.Subtract(TBigInteger.One));
   sig := signer.GenerateSignature(msg);
 
   signer.Init(false, myPair.getPublic());

CryptoLib.Tests/src/Math/ECPointTests.pas

@@ -40,7 +40,7 @@ uses
   ClpSecureRandom,
   ClpISecureRandom,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpECAlgorithms,
   ClpWNafUtilities,
   ClpIFiniteField,
@@ -408,7 +408,7 @@ begin
     count := 0;
     while (count < 10) do
     begin
-      nonSquare := TBigIntegers.CreateRandomInRange(TBigInteger.Two,
+      nonSquare := TBigIntegerUtilities.CreateRandomInRange(TBigInteger.Two,
         pMinusOne, FRandom);
       if (not nonSquare.ModPow(legendreExponent, p).Equals(TBigInteger.One))
       then

CryptoLib.Tests/src/Math/PrimesTests.pas

@@ -33,7 +33,7 @@ uses
 {$ENDIF FPC}
   ClpPrimes,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpSecureRandom,
   ClpISecureRandom,
   ClpDigestUtilities,
@@ -102,7 +102,7 @@ begin
 
   for LI := 0 to ANumBases - 1 do
   begin
-    LB := TBigIntegers.CreateRandomInRange(TBigInteger.Two, LXSubTwo, FRandom);
+    LB := TBigIntegerUtilities.CreateRandomInRange(TBigInteger.Two, LXSubTwo, FRandom);
     if not TPrimes.IsMRProbablePrimeToBase(AX, LB) then
       Exit(False);
   end;

CryptoLib.Tests/src/Others/ECTests.pas

@@ -52,7 +52,7 @@ uses
   ClpIECCommon,
   ClpIECFieldElement,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpCryptoLibTypes,
   CryptoLibTestBase;
 
@@ -193,7 +193,7 @@ begin
   s := TBigInteger.Create
     ('308992691965804947361541664549085895292153777025772063598');
 
-  kData := TBigIntegers.AsUnsignedByteArray
+  kData := TBigIntegerUtilities.AsUnsignedByteArray
     (TBigInteger.Create
     ('1542725565216523985789236956265265265235675811949404040041'));
 
@@ -277,7 +277,7 @@ begin
   s := TBigInteger.Create
     ('5735822328888155254683894997897571951568553642892029982342');
 
-  kData := TBigIntegers.AsUnsignedByteArray
+  kData := TBigIntegerUtilities.AsUnsignedByteArray
     (TBigInteger.Create
     ('6140507067065001063065065565667405560006161556565665656654'));
 
@@ -361,7 +361,7 @@ begin
   s := TBigInteger.Create
     ('197030374000731686738334997654997227052849804072198819102649413465737174');
 
-  kData := TBigIntegers.AsUnsignedByteArray
+  kData := TBigIntegerUtilities.AsUnsignedByteArray
     (TBigInteger.Create
     ('171278725565216523967285789236956265265265235675811949404040041670216363')
     );
@@ -446,7 +446,7 @@ begin
   s := TBigInteger.Create
     ('144940322424411242416373536877786566515839911620497068645600824084578597');
 
-  kData := TBigIntegers.AsUnsignedByteArray
+  kData := TBigIntegerUtilities.AsUnsignedByteArray
     (TBigInteger.Create
     ('171278725565216523967285789236956265265265235675811949404040041670216363')
     );
@@ -532,7 +532,7 @@ begin
   s := TBigInteger.Create
     ('323813553209797357708078776831250505931891051755007842781978505179448783');
 
-  kData := TBigIntegers.AsUnsignedByteArray
+  kData := TBigIntegerUtilities.AsUnsignedByteArray
     (TBigInteger.Create
     ('700000017569056646655505781757157107570501575775705779575555657156756655')
     );

CryptoLib/src/Asn1/ClpAsn1Objects.pas

@@ -29,7 +29,7 @@ uses
   ClpBitOperations,
   ClpCryptoLibTypes,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpAsn1Tags,
   ClpIAsn1Objects,
   ClpIAsn1Encodings,
@@ -12182,7 +12182,7 @@ class function TDerInteger.GetEncodingLength(const AX: TBigInteger): Int32;
 var
   LByteLength: Int32;
 begin
-  LByteLength := TBigIntegers.GetByteLength(AX);
+  LByteLength := TBigIntegerUtilities.GetByteLength(AX);
   Result := TAsn1OutputStream.GetLengthOfEncodingDL(TAsn1Tags.Integer, LByteLength);
 end;
 

CryptoLib/src/Asn1/Sec/ClpSecECAsn1Objects.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpAsn1Objects,
   ClpIAsn1Objects,
   ClpAsn1Core,
@@ -193,7 +193,7 @@ begin
   if AOrderBitLength < AKey.BitLength then
     raise EArgumentCryptoLibException.Create(SOrderBitLengthTooSmall);
 
-  LPrivateKeyContents := TBigIntegers.AsUnsignedByteArray((AOrderBitLength + 7) div 8, AKey);
+  LPrivateKeyContents := TBigIntegerUtilities.AsUnsignedByteArray((AOrderBitLength + 7) div 8, AKey);
 
   FVersion := TDerInteger.One;
   FPrivateKey := TDerOctetString.Create(LPrivateKeyContents);

CryptoLib/src/Crypto/Engines/ClpIesEngine.pas

@@ -44,7 +44,7 @@ uses
   ClpPack,
   ClpArrayUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpCryptoLibTypes;
 
 resourcestring
@@ -610,7 +610,7 @@ begin
   // Compute the common value and convert to byte array.
   FAgree.Init(FPrivParam);
   LZ := FAgree.CalculateAgreement(FPubParam);
-  BigZ := TBigIntegers.AsUnsignedByteArray(FAgree.GetFieldSize, LZ);
+  BigZ := TBigIntegerUtilities.AsUnsignedByteArray(FAgree.GetFieldSize, LZ);
 
   // Create input to KDF.
   if (System.Length(FV) <> 0) then

CryptoLib/src/Crypto/Engines/ClpPascalCoinIesEngine.pas

@@ -37,7 +37,7 @@ uses
   ClpIESEngine,
   ClpArrayUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpCryptoLibTypes;
 
 resourcestring
@@ -293,7 +293,7 @@ begin
   // Compute the common value and convert to byte array.
   FAgree.Init(FPrivParam);
   LZ := FAgree.CalculateAgreement(FPubParam);
-  LBigZ := TBigIntegers.AsUnsignedByteArray(FAgree.GetFieldSize, LZ);
+  LBigZ := TBigIntegerUtilities.AsUnsignedByteArray(FAgree.GetFieldSize, LZ);
 
   try
     // Initialise the KDF.

CryptoLib/src/Crypto/Engines/ClpRsaBlindedEngine.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpICipherParameters,
   ClpIRsaParameters,
   ClpIRsa,
@@ -155,12 +155,12 @@ begin
     m := crtKey.Modulus;
 
     // Generate random r in range [1, m-1]
-    r := TBigIntegers.CreateRandomInRange(TBigInteger.One, m.Subtract(TBigInteger.One), FRandom);
+    r := TBigIntegerUtilities.CreateRandomInRange(TBigInteger.One, m.Subtract(TBigInteger.One), FRandom);
 
     // blind = r^e mod m
     blind := r.ModPow(e, m);
     // unblind = r^(-1) mod m
-    unblind := TBigIntegers.ModOddInverse(m, r);
+    unblind := TBigIntegerUtilities.ModOddInverse(m, r);
 
     // Blind the input: blindedInput = blind * input mod m
     blindedInput := blind.Multiply(input).&Mod(m);

CryptoLib/src/Crypto/Engines/ClpRsaBlindingEngine.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpICipherParameters,
   ClpIParametersWithRandom,
   ClpIRsaParameters,
@@ -149,7 +149,7 @@ var
   m, blindFactorInverse, res: TBigInteger;
 begin
   m := FKey.Modulus;
-  blindFactorInverse := TBigIntegers.ModOddInverse(m, FBlindingFactor);
+  blindFactorInverse := TBigIntegerUtilities.ModOddInverse(m, FBlindingFactor);
   res := blindedMsg.Multiply(blindFactorInverse);
   Result := res.&Mod(m);
 end;

CryptoLib/src/Crypto/Engines/ClpRsaCoreEngine.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpICipherParameters,
   ClpParameterUtilities,
   ClpIRsaParameters,
@@ -163,11 +163,11 @@ begin
 
   if FForEncryption then
   begin
-    Result := TBigIntegers.AsUnsignedByteArray(GetOutputBlockSize, res);
+    Result := TBigIntegerUtilities.AsUnsignedByteArray(GetOutputBlockSize, res);
   end
   else
   begin
-    Result := TBigIntegers.AsUnsignedByteArray(res);
+    Result := TBigIntegerUtilities.AsUnsignedByteArray(res);
   end;
 end;
 

CryptoLib/src/Crypto/Generators/ClpDHKeyGeneratorHelper.pas

@@ -25,7 +25,7 @@ uses
   ClpISecureRandom,
   ClpBitOperations,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpWNafUtilities,
   ClpIDHParameters;
 
@@ -84,7 +84,7 @@ begin
 
   while True do
   begin
-    LX := TBigIntegers.CreateRandomInRange(LMin, LMax, ARandom);
+    LX := TBigIntegerUtilities.CreateRandomInRange(LMin, LMax, ARandom);
     if TWNafUtilities.GetNafWeight(LX) >= LMinWeight then
     begin
       Result := LX;

CryptoLib/src/Crypto/Generators/ClpDHParametersHelper.pas

@@ -24,7 +24,7 @@ interface
 uses
   ClpISecureRandom,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpWNafUtilities,
   ClpBitOperations,
   ClpCryptoLibTypes;
@@ -222,7 +222,7 @@ begin
   LPMinusTwo := AP.Subtract(TBigInteger.Two);
 
   repeat
-    LH := TBigIntegers.CreateRandomInRange(TBigInteger.Two, LPMinusTwo, ARandom);
+    LH := TBigIntegerUtilities.CreateRandomInRange(TBigInteger.Two, LPMinusTwo, ARandom);
     LG := LH.ModPow(TBigInteger.Two, AP);
   until not LG.Equals(TBigInteger.One);
 

CryptoLib/src/Crypto/Generators/ClpDsaGenerators.pas

@@ -33,7 +33,7 @@ uses
   ClpEncoders,
   ClpDigestUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpBitOperations,
   ClpWNafUtilities,
   ClpAsymmetricCipherKeyPair,
@@ -208,7 +208,7 @@ begin
   LMinWeight := TBitOperations.Asr32(AQ.BitLength, 2);
   while True do
   begin
-    LX := TBigIntegers.CreateRandomInRange(LOne, AQ.Subtract(LOne), ARandom);
+    LX := TBigIntegerUtilities.CreateRandomInRange(LOne, AQ.Subtract(LOne), ARandom);
     if TWNafUtilities.GetNafWeight(LX) >= LMinWeight then
     begin
       Result := LX;
@@ -307,7 +307,7 @@ begin
 
   while True do
   begin
-    LH := TBigIntegers.CreateRandomInRange(TBigInteger.Two, LPSub2, ARandom);
+    LH := TBigIntegerUtilities.CreateRandomInRange(TBigInteger.Two, LPSub2, ARandom);
     LG := LH.ModPow(LE, AP);
     if (LG.BitLength > 1) then
     begin

CryptoLib/src/Crypto/Generators/ClpRsaGenerators.pas

@@ -25,7 +25,7 @@ uses
   SysUtils,
   ClpArrayUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpBitOperations,
   ClpIKeyGenerationParameters,
   ClpIRsaParameters,
@@ -183,7 +183,7 @@ begin
       Continue;
     LDP := LD.Remainder(LPSub1);
     LDQ := LD.Remainder(LQSub1);
-    LQInv := TBigIntegers.ModOddInverse(LP, LQ);
+    LQInv := TBigIntegerUtilities.ModOddInverse(LP, LQ);
     LPubKey := TRsaKeyParameters.Create(False, LN, LE) as IRsaKeyParameters;
     LPrivKey := TRsaPrivateCrtKeyParameters.Create(LN, LE, LD, LP, LQ, LDP, LDQ, LQInv)
       as IRsaPrivateCrtKeyParameters;
@@ -230,7 +230,7 @@ begin
   repeat
     LFactor := TBigInteger.Create(LLen, FRandom);
   until (LFactor.CompareTo(TBigInteger.Two) >= 0) and
-    TBigIntegers.ModOddIsCoprimeVar(LM, LFactor);
+    TBigIntegerUtilities.ModOddIsCoprimeVar(LM, LFactor);
   Result := LFactor;
 end;
 

CryptoLib/src/Crypto/Parameters/ClpRsaParameters.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpIRsaParameters,
   ClpAsymmetricKeyParameter,
   ClpKeyGenerationParameters,
@@ -210,7 +210,7 @@ begin
     LM := AModulus;
     LX := FSmallPrimesProduct;
   end;
-  Result := not TBigIntegers.ModOddIsCoprimeVar(LM, LX);
+  Result := not TBigIntegerUtilities.ModOddIsCoprimeVar(LM, LX);
 end;
 
 class function TRsaKeyParameters.Validate(

CryptoLib/src/Crypto/Signers/ClpECNRSigner.pas

@@ -27,7 +27,7 @@ uses
   ClpIECCommon,
   ClpIECNRSigner,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpISecureRandom,
   ClpIECParameters,
   ClpICipherParameters,
@@ -338,7 +338,7 @@ begin
 
   if (LT.IsInitialized) then
   begin
-    Result := TBigIntegers.AsUnsignedByteArray(LT);
+    Result := TBigIntegerUtilities.AsUnsignedByteArray(LT);
     Exit;
   end;
 

CryptoLib/src/Crypto/Signers/ClpX931Signer.pas

@@ -31,7 +31,7 @@ uses
   ClpIsoTrailers,
   ClpParameterUtilities,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpArrayUtilities,
   ClpCryptoLibTypes;
 
@@ -172,7 +172,7 @@ end;
 
 function TX931Signer.GetMaxSignatureSize: Int32;
 begin
-  Result := TBigIntegers.GetUnsignedByteLength(FKParam.Modulus);
+  Result := TBigIntegerUtilities.GetUnsignedByteLength(FKParam.Modulus);
 end;
 
 function TX931Signer.GenerateSignature: TCryptoLibByteArray;
@@ -188,8 +188,8 @@ begin
 
   LT := LT.Min(FKParam.Modulus.Subtract(LT));
 
-  LSize := TBigIntegers.GetUnsignedByteLength(FKParam.Modulus);
-  Result := TBigIntegers.AsUnsignedByteArray(LSize, LT);
+  LSize := TBigIntegerUtilities.GetUnsignedByteLength(FKParam.Modulus);
+  Result := TBigIntegerUtilities.AsUnsignedByteArray(LSize, LT);
 end;
 
 function TX931Signer.VerifySignature(const ASignature: TCryptoLibByteArray): Boolean;
@@ -228,7 +228,7 @@ begin
   CreateSignatureBlock();
 
   System.SetLength(LFBlock, System.Length(FBlock));
-  LFBlock := TBigIntegers.AsUnsignedByteArray(System.Length(FBlock), LF);
+  LFBlock := TBigIntegerUtilities.AsUnsignedByteArray(System.Length(FBlock), LF);
 
   LRv := TArrayUtilities.FixedTimeEquals(FBlock, LFBlock);
 

CryptoLib/src/Crypto/Signers/SignerCalculators/ClpHMacDsaKCalculator.pas

@@ -28,7 +28,7 @@ uses
   ClpIDigest,
   ClpISecureRandom,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpKeyParameter,
   ClpIKeyParameter,
   ClpIDsaKCalculator,
@@ -130,10 +130,10 @@ begin
   TArrayUtilities.Fill<Byte>(FV, 0, System.Length(FV), Byte($01));
   TArrayUtilities.Fill<Byte>(FK, 0, System.Length(FK), Byte(0));
 
-  LSize := TBigIntegers.GetUnsignedByteLength(AN);
+  LSize := TBigIntegerUtilities.GetUnsignedByteLength(AN);
   System.SetLength(LX, LSize);
 
-  LDVal := TBigIntegers.AsUnsignedByteArray(AD);
+  LDVal := TBigIntegerUtilities.AsUnsignedByteArray(AD);
 
   System.Move(LDVal[0], LX[System.Length(LX) - System.Length(LDVal)],
     System.Length(LDVal));
@@ -147,7 +147,7 @@ begin
     LMInt := LMInt.Subtract(AN);
   end;
 
-  LMVal := TBigIntegers.AsUnsignedByteArray(LMInt);
+  LMVal := TBigIntegerUtilities.AsUnsignedByteArray(LMInt);
 
   System.Move(LMVal[0], LM[System.Length(LM) - System.Length(LMVal)],
     System.Length(LMVal));
@@ -187,7 +187,7 @@ var
   LTOff, LLength: Int32;
 begin
   Result := TBigInteger.GetDefault;
-  System.SetLength(LT, TBigIntegers.GetUnsignedByteLength(FN));
+  System.SetLength(LT, TBigIntegerUtilities.GetUnsignedByteLength(FN));
 
   while True do
 

CryptoLib/src/Crypto/Signers/SignerEncodings/ClpPlainDsaEncoding.pas

@@ -27,7 +27,7 @@ uses
   ClpIDsaEncoding,
   ClpIPlainDsaEncoding,
   ClpArrayUtilities,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpCryptoLibTypes;
 
 resourcestring
@@ -73,7 +73,7 @@ function TPlainDsaEncoding.Decode(const AN: TBigInteger;
 var
   LValueLength: Int32;
 begin
-  LValueLength := TBigIntegers.GetUnsignedByteLength(AN);
+  LValueLength := TBigIntegerUtilities.GetUnsignedByteLength(AN);
   if (System.Length(AEncoding) <> (LValueLength * 2)) then
     raise EArgumentCryptoLibException.CreateResFmt(@SInvalidEncodingLength,
       ['encoding']);
@@ -93,7 +93,7 @@ function TPlainDsaEncoding.Encode(const AN, AR, &AS: TBigInteger)
 var
   LValueLength: Int32;
 begin
-  LValueLength := TBigIntegers.GetUnsignedByteLength(AN);
+  LValueLength := TBigIntegerUtilities.GetUnsignedByteLength(AN);
   System.SetLength(Result, LValueLength * 2);
   EncodeValue(AN, AR, Result, 0, LValueLength);
   EncodeValue(AN, &AS, Result, LValueLength, LValueLength);
@@ -115,7 +115,7 @@ end;
 
 function TPlainDsaEncoding.GetMaxEncodingSize(const AN: TBigInteger): Int32;
 begin
-  Result := TBigIntegers.GetUnsignedByteLength(AN) * 2;
+  Result := TBigIntegerUtilities.GetUnsignedByteLength(AN) * 2;
 end;
 
 class function TPlainDsaEncoding.GetInstance: IPlainDsaEncoding;

CryptoLib/src/Math/ClpBigIntegers.pas → CryptoLib/src/Math/ClpBigIntegerUtilities.pas

@@ -15,7 +15,7 @@
 
 (* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
 
-unit ClpBigIntegers;
+unit ClpBigIntegerUtilities;
 
 {$I ..\Include\CryptoLib.inc}
 
@@ -52,7 +52,7 @@ type
   /// <summary>
   /// BigInteger utilities.
   /// </summary>
-  TBigIntegers = class sealed(TObject)
+  TBigIntegerUtilities = class sealed(TObject)
   strict private
     const
       MaxIterations = 1000;
@@ -199,21 +199,21 @@ begin
   Result := AValue.GetHashCode();
 end;
 
-{ TBigIntegers }
+{ TBigIntegerUtilities }
 
-class constructor TBigIntegers.Create;
+class constructor TBigIntegerUtilities.Create;
 begin
   Zero := TBigInteger.Zero;
   One := TBigInteger.One;
   FBigIntegerEqualityComparer := TBigIntegerEqualityComparer.Create();
 end;
 
-class function TBigIntegers.AsUnsignedByteArray(const AN: TBigInteger): TCryptoLibByteArray;
+class function TBigIntegerUtilities.AsUnsignedByteArray(const AN: TBigInteger): TCryptoLibByteArray;
 begin
   Result := AN.ToByteArrayUnsigned();
 end;
 
-class function TBigIntegers.AsUnsignedByteArray(const ALength: Int32; const AN: TBigInteger): TCryptoLibByteArray;
+class function TBigIntegerUtilities.AsUnsignedByteArray(const ALength: Int32; const AN: TBigInteger): TCryptoLibByteArray;
 var
   LBytes: TCryptoLibByteArray;
   LBytesLength: Int32;
@@ -241,7 +241,7 @@ begin
   System.Move(LBytes[0], Result[ALength - LBytesLength], LBytesLength * System.SizeOf(Byte));
 end;
 
-class procedure TBigIntegers.AsUnsignedByteArray(const AN: TBigInteger; var ABuf: TCryptoLibByteArray; const AOff, ALen: Int32);
+class procedure TBigIntegerUtilities.AsUnsignedByteArray(const AN: TBigInteger; var ABuf: TCryptoLibByteArray; const AOff, ALen: Int32);
 var
   LBytes: TCryptoLibByteArray;
   LBytesLength: Int32;
@@ -264,12 +264,12 @@ begin
   System.Move(LBytes[0], ABuf[AOff + LPadLen], LBytesLength * System.SizeOf(Byte));
 end;
 
-class function TBigIntegers.CreateRandomBigInteger(const ABitLength: Int32; const ASecureRandom: ISecureRandom): TBigInteger;
+class function TBigIntegerUtilities.CreateRandomBigInteger(const ABitLength: Int32; const ASecureRandom: ISecureRandom): TBigInteger;
 begin
   Result := TBigInteger.Create(ABitLength, ASecureRandom);
 end;
 
-class function TBigIntegers.CreateRandomInRange(const AMin, AMax: TBigInteger; const ARandom: ISecureRandom): TBigInteger;
+class function TBigIntegerUtilities.CreateRandomInRange(const AMin, AMax: TBigInteger; const ARandom: ISecureRandom): TBigInteger;
 var
   LCmp: Int32;
   I: Int32;
@@ -305,27 +305,27 @@ begin
   Result := TBigInteger.Create(AMax.Subtract(AMin).BitLength - 1, ARandom).Add(AMin);
 end;
 
-class function TBigIntegers.FromUnsignedByteArray(const ABuf: TCryptoLibByteArray): TBigInteger;
+class function TBigIntegerUtilities.FromUnsignedByteArray(const ABuf: TCryptoLibByteArray): TBigInteger;
 begin
   Result := TBigInteger.Create(1, ABuf);
 end;
 
-class function TBigIntegers.FromUnsignedByteArray(const ABuf: TCryptoLibByteArray; const AOff, ALength: Int32): TBigInteger;
+class function TBigIntegerUtilities.FromUnsignedByteArray(const ABuf: TCryptoLibByteArray; const AOff, ALength: Int32): TBigInteger;
 begin
   Result := TBigInteger.Create(1, ABuf, AOff, ALength);
 end;
 
-class function TBigIntegers.GetByteLength(const AN: TBigInteger): Int32;
+class function TBigIntegerUtilities.GetByteLength(const AN: TBigInteger): Int32;
 begin
   Result := AN.GetLengthofByteArray();
 end;
 
-class function TBigIntegers.GetUnsignedByteLength(const AN: TBigInteger): Int32;
+class function TBigIntegerUtilities.GetUnsignedByteLength(const AN: TBigInteger): Int32;
 begin
   Result := AN.GetLengthofByteArrayUnsigned();
 end;
 
-class procedure TBigIntegers.WriteUnsignedByteArray(const AOutStr: TStream; const AN: TBigInteger);
+class procedure TBigIntegerUtilities.WriteUnsignedByteArray(const AOutStr: TStream; const AN: TBigInteger);
 var
   LBuffer: TCryptoLibByteArray;
 begin
@@ -333,7 +333,7 @@ begin
   AOutStr.Write(LBuffer, 0, System.Length(LBuffer));
 end;
 
-class function TBigIntegers.ModOddInverse(const AM, AX: TBigInteger): TBigInteger;
+class function TBigIntegerUtilities.ModOddInverse(const AM, AX: TBigInteger): TBigInteger;
 var
   LBits, LLen: Int32;
   LReducedX: TBigInteger;
@@ -361,7 +361,7 @@ begin
   Result := TNat.ToBigInteger(LLen, LZ);
 end;
 
-class function TBigIntegers.ModOddInverseVar(const AM, AX: TBigInteger): TBigInteger;
+class function TBigIntegerUtilities.ModOddInverseVar(const AM, AX: TBigInteger): TBigInteger;
 var
   LBits, LLen: Int32;
   LReducedX: TBigInteger;
@@ -401,7 +401,7 @@ begin
   Result := TNat.ToBigInteger(LLen, LZ);
 end;
 
-class function TBigIntegers.ModOddIsCoprime(const AM, AX: TBigInteger): Boolean;
+class function TBigIntegerUtilities.ModOddIsCoprime(const AM, AX: TBigInteger): Boolean;
 var
   LBits: Int32;
   LReducedX: TBigInteger;
@@ -424,7 +424,7 @@ begin
   Result := TMod.ModOddIsCoprime(LM, LX) <> 0;
 end;
 
-class function TBigIntegers.ModOddIsCoprimeVar(const AM, AX: TBigInteger): Boolean;
+class function TBigIntegerUtilities.ModOddIsCoprimeVar(const AM, AX: TBigInteger): Boolean;
 var
   LBits: Int32;
   LReducedX: TBigInteger;

CryptoLib/src/Math/ClpPrimes.pas

@@ -25,7 +25,7 @@ uses
   SysUtils,
   Math,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpPack,
   ClpIDigest,
   ClpISecureRandom,
@@ -280,7 +280,7 @@ begin
 
   for LI := 0 to AIterations - 1 do
   begin
-    LB := TBigIntegers.CreateRandomInRange(FTwo, LWSubTwo, ARandom);
+    LB := TBigIntegerUtilities.CreateRandomInRange(FTwo, LWSubTwo, ARandom);
     LG := LB.Gcd(LW);
 
     if LG.CompareTo(FOne) > 0 then
@@ -366,7 +366,7 @@ begin
 
   for LI := 0 to AIterations - 1 do
   begin
-    LB := TBigIntegers.CreateRandomInRange(FTwo, LWSubTwo, ARandom);
+    LB := TBigIntegerUtilities.CreateRandomInRange(FTwo, LWSubTwo, ARandom);
 
     if not ImplMRProbablePrimeToBase(LW, LWSubOne, LM, LA, LB) then
       Exit(False);

CryptoLib/src/Math/EC/ClpECCurve.pas

@@ -39,7 +39,7 @@ uses
   ClpIPreCompInfo,
   ClpISecureRandom,
   ClpBitOperations,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpECLookupTables,
   ClpECCurveConstants,
   ClpCryptoLibTypes;
@@ -849,7 +849,7 @@ end;
 
 class constructor TAbstractFpCurve.Create;
 begin
-  FKnownPrimes := TDictionary<TBigInteger, Boolean>.Create(TBigIntegers.BigIntegerEqualityComparer);
+  FKnownPrimes := TDictionary<TBigInteger, Boolean>.Create(TBigIntegerUtilities.BigIntegerEqualityComparer);
   FLockPrimes := TCriticalSection.Create;
   FMaxFieldSize := 1042; // 2 * 521
   FCertainty := 100;
@@ -942,7 +942,7 @@ var
   LX: TBigInteger;
 begin
   repeat
-    LX := TBigIntegers.CreateRandomBigInteger(AP.BitLength, ARandom);
+    LX := TBigIntegerUtilities.CreateRandomBigInteger(AP.BitLength, ARandom);
   until LX.CompareTo(AP) < 0;
   Result := LX;
 end;
@@ -953,7 +953,7 @@ var
   LX: TBigInteger;
 begin
   repeat
-    LX := TBigIntegers.CreateRandomBigInteger(AP.BitLength, ARandom);
+    LX := TBigIntegerUtilities.CreateRandomBigInteger(AP.BitLength, ARandom);
   until (LX.SignValue > 0) and (LX.CompareTo(AP) < 0);
   Result := LX;
 end;
@@ -1138,7 +1138,7 @@ var
   LX: TBigInteger;
 begin
   repeat
-    LX := TBigIntegers.CreateRandomBigInteger(AM, ARandom);
+    LX := TBigIntegerUtilities.CreateRandomBigInteger(AM, ARandom);
   until LX.SignValue > 0;
   Result := LX;
 end;
@@ -1177,7 +1177,7 @@ end;
 
 function TAbstractF2mCurve.RandomFieldElement(const ARandom: ISecureRandom): IECFieldElement;
 begin
-  Result := FromBigInteger(TBigIntegers.CreateRandomBigInteger(GetFieldSize(), ARandom));
+  Result := FromBigInteger(TBigIntegerUtilities.CreateRandomBigInteger(GetFieldSize(), ARandom));
 end;
 
 function TAbstractF2mCurve.RandomFieldElementMult(const ARandom: ISecureRandom): IECFieldElement;

CryptoLib/src/Math/EC/ClpECFieldElement.pas

@@ -24,7 +24,7 @@ interface
 uses
   SysUtils,
   ClpBigInteger,
-  ClpBigIntegers,
+  ClpBigIntegerUtilities,
   ClpIECFieldElement,
   ClpLongArray,
   ClpBitOperations,
@@ -267,7 +267,7 @@ end;
 
 function TECFieldElement.GetEncoded: TCryptoLibByteArray;
 begin
-  Result := TBigIntegers.AsUnsignedByteArray(GetEncodedLength(), ToBigInteger);
+  Result := TBigIntegerUtilities.AsUnsignedByteArray(GetEncodedLength(), ToBigInteger);
 end;
 
 function TECFieldElement.GetEncodedLength: Int32;
@@ -277,7 +277,7 @@ end;
 
 procedure TECFieldElement.EncodeTo(var ABuf: TCryptoLibByteArray; AOff: Int32);
 begin
-  TBigIntegers.AsUnsignedByteArray(ToBigInteger, ABuf, AOff, GetEncodedLength());
+  TBigIntegerUtilities.AsUnsignedByteArray(ToBigInteger, ABuf, AOff, GetEncodedLength());
 end;
 
 { TFpFieldElement }
@@ -355,7 +355,7 @@ end;
 
 function TFpFieldElement.ModInverse(const AX: TBigInteger): TBigInteger;
 begin
-  Result := TBigIntegers.ModOddInverse(FQ, AX);
+  Result := TBigIntegerUtilities.ModOddInverse(FQ, AX);
 end;
 
 function TFpFieldElement.ModMult(const AX1, AX2: TBigInteger): TBigInteger;

CryptoLib/src/Math/EC/ClpLongArray.pas

@@ -30,7 +30,7 @@ uses
   ClpInterleave,
   ClpArrayUtilities,
   ClpBigInteger,
-  ClpBigIntegers;
+  ClpBigIntegerUtilities;
 
 resourcestring
   SInvalidF2mFieldValue = 'invalid F2m field value';
@@ -308,7 +308,7 @@ var
 begin
   LUsedLen := GetUsedLength();
   if LUsedLen = 0 then
-    Exit(TBigIntegers.Zero);
+    Exit(TBigIntegerUtilities.Zero);
 
   LHighestInt := FData[LUsedLen - 1];
   System.SetLength(LTemp, 8);

CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.lpk

@@ -1700,8 +1700,8 @@ Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring the devel
         <UnitName Value="ClpECPointMaps"/>
       </Item418>
       <Item419>
-        <Filename Value="..\..\Math\ClpBigIntegers.pas"/>
-        <UnitName Value="ClpBigIntegers"/>
+        <Filename Value="..\..\Math\ClpBigIntegerUtilities.pas"/>
+        <UnitName Value="ClpBigIntegerUtilities"/>
       </Item419>
       <Item420>
         <Filename Value="..\..\Math\Raw\ClpNat448.pas"/>

CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.pas

@@ -140,7 +140,7 @@ uses
   ClpStreams, ClpStreamUtilities, ClpPrimes, ClpECPoint, ClpSecT283K1Custom, 
   ClpWNafUtilities, ClpEndoUtilities, ClpECFieldElement, ClpECCurve, 
   ClpNat576, ClpFixedPointUtilities, ClpECLookupTables, ClpECPointMaps, 
-  ClpBigIntegers, ClpNat448, ClpNat224, ClpNat160, ClpNat128, ClpWnaf, 
+  ClpBigIntegerUtilities, ClpNat448, ClpNat224, ClpNat160, ClpNat128, ClpWnaf, 
   ClpScalarUtilities, ClpScalar25519, ClpBits, ClpCodec, ClpBinaryPrimitives, 
   ClpBitConverter, ClpBitOperations, ClpConverters, ClpCryptoLibComparers, 
   ClpCryptoLibTypes, ClpNullable, ClpPack, ClpWeakRef, ClpIPAddressUtilities,