Browse Source

corrected case sensitivity in filename

Ugochukwu Mmaduekwe 6 years ago
parent
commit
c52d5655be

+ 2 - 2
CryptoLib.Samples/Delphi.Samples/UsageSamples.dpr

@@ -210,8 +210,8 @@ uses
   ClpIHkdfParameters in '..\..\CryptoLib\src\Interfaces\ClpIHkdfParameters.pas',
   ClpDsaParameterGenerationParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpDsaParameterGenerationParameters.pas',
   ClpIDsaParameterGenerationParameters in '..\..\CryptoLib\src\Interfaces\ClpIDsaParameterGenerationParameters.pas',
-  ClpValidityPrecompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPrecompInfo.pas',
-  ClpIValidityPrecompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPrecompInfo.pas',
+  ClpValidityPreCompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPreCompInfo.pas',
+  ClpIValidityPreCompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPreCompInfo.pas',
   ClpDsaParametersGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpDsaParametersGenerator.pas',
   ClpIDsaParametersGenerator in '..\..\CryptoLib\src\Interfaces\ClpIDsaParametersGenerator.pas',
   ClpDsaParameter in '..\..\CryptoLib\src\Asn1\X509\ClpDsaParameter.pas',

+ 2 - 2
CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.TestInsight.dpr

@@ -220,8 +220,8 @@ uses
   ClpIHkdfParameters in '..\..\CryptoLib\src\Interfaces\ClpIHkdfParameters.pas',
   ClpDsaParameterGenerationParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpDsaParameterGenerationParameters.pas',
   ClpIDsaParameterGenerationParameters in '..\..\CryptoLib\src\Interfaces\ClpIDsaParameterGenerationParameters.pas',
-  ClpValidityPrecompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPrecompInfo.pas',
-  ClpIValidityPrecompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPrecompInfo.pas',
+  ClpValidityPreCompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPreCompInfo.pas',
+  ClpIValidityPreCompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPreCompInfo.pas',
   ClpDsaParametersGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpDsaParametersGenerator.pas',
   ClpIDsaParametersGenerator in '..\..\CryptoLib\src\Interfaces\ClpIDsaParametersGenerator.pas',
   ClpDsaParameter in '..\..\CryptoLib\src\Asn1\X509\ClpDsaParameter.pas',

+ 2 - 2
CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.dpr

@@ -223,8 +223,8 @@ uses
   ClpIHkdfParameters in '..\..\CryptoLib\src\Interfaces\ClpIHkdfParameters.pas',
   ClpDsaParameterGenerationParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpDsaParameterGenerationParameters.pas',
   ClpIDsaParameterGenerationParameters in '..\..\CryptoLib\src\Interfaces\ClpIDsaParameterGenerationParameters.pas',
-  ClpValidityPrecompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPrecompInfo.pas',
-  ClpIValidityPrecompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPrecompInfo.pas',
+  ClpValidityPreCompInfo in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpValidityPreCompInfo.pas',
+  ClpIValidityPreCompInfo in '..\..\CryptoLib\src\Interfaces\ClpIValidityPreCompInfo.pas',
   ClpDsaParametersGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpDsaParametersGenerator.pas',
   ClpIDsaParametersGenerator in '..\..\CryptoLib\src\Interfaces\ClpIDsaParametersGenerator.pas',
   ClpDsaParameter in '..\..\CryptoLib\src\Asn1\X509\ClpDsaParameter.pas',

+ 2 - 2
CryptoLib/src/Interfaces/ClpIValidityPrecompInfo.pas

@@ -15,7 +15,7 @@
 
 (* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
 
-unit ClpIValidityPrecompInfo;
+unit ClpIValidityPreCompInfo;
 
 {$I ..\Include\CryptoLib.inc}
 
@@ -25,7 +25,7 @@ uses
   ClpIPreCompInfo;
 
 type
-  IValidityPrecompInfo = interface(IPreCompInfo)
+  IValidityPreCompInfo = interface(IPreCompInfo)
 
     ['{2339F5CA-A4B3-4E95-B358-4D4F4CA97EB3}']
 

+ 12 - 12
CryptoLib/src/Math/EC/Multiplier/ClpValidityPrecompInfo.pas

@@ -15,7 +15,7 @@
 
 (* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
 
-unit ClpValidityPrecompInfo;
+unit ClpValidityPreCompInfo;
 
 {$I ..\..\..\Include\CryptoLib.inc}
 
@@ -23,11 +23,11 @@ interface
 
 uses
   ClpIPreCompInfo,
-  ClpIValidityPrecompInfo;
+  ClpIValidityPreCompInfo;
 
 type
-  TValidityPrecompInfo = class(TInterfacedObject, IPreCompInfo,
-    IValidityPrecompInfo)
+  TValidityPreCompInfo = class(TInterfacedObject, IPreCompInfo,
+    IValidityPreCompInfo)
 
   strict private
 
@@ -52,9 +52,9 @@ type
 
 implementation
 
-{ TValidityPrecompInfo }
+{ TValidityPreCompInfo }
 
-constructor TValidityPrecompInfo.Create;
+constructor TValidityPreCompInfo.Create;
 begin
   Inherited Create();
   Ffailed := False;
@@ -62,32 +62,32 @@ begin
   ForderPassed := False;
 end;
 
-function TValidityPrecompInfo.HasCurveEquationPassed: Boolean;
+function TValidityPreCompInfo.HasCurveEquationPassed: Boolean;
 begin
   result := FcurveEquationPassed;
 end;
 
-function TValidityPrecompInfo.HasFailed: Boolean;
+function TValidityPreCompInfo.HasFailed: Boolean;
 begin
   result := Ffailed;
 end;
 
-function TValidityPrecompInfo.HasOrderPassed: Boolean;
+function TValidityPreCompInfo.HasOrderPassed: Boolean;
 begin
   result := ForderPassed;
 end;
 
-procedure TValidityPrecompInfo.ReportCurveEquationPassed;
+procedure TValidityPreCompInfo.ReportCurveEquationPassed;
 begin
   FcurveEquationPassed := True;
 end;
 
-procedure TValidityPrecompInfo.ReportFailed;
+procedure TValidityPreCompInfo.ReportFailed;
 begin
   Ffailed := True;
 end;
 
-procedure TValidityPrecompInfo.ReportOrderPassed;
+procedure TValidityPreCompInfo.ReportOrderPassed;
 begin
   ForderPassed := True;
 end;

+ 2 - 2
CryptoLib/src/Packages/Delphi/CryptoLib4PascalPackage.dpk

@@ -232,7 +232,7 @@ contains
   ClpIHMacDsaKCalculator in '..\..\Interfaces\ClpIHMacDsaKCalculator.pas',
   ClpInterleave in '..\..\Math\Raw\ClpInterleave.pas',
   ClpIPreCompCallBack in '..\..\Interfaces\ClpIPreCompCallBack.pas',
-  ClpIValidityPrecompInfo in '..\..\Interfaces\ClpIValidityPrecompInfo.pas',
+  ClpIValidityPreCompInfo in '..\..\Interfaces\ClpIValidityPreCompInfo.pas',
   ClpNat192 in '..\..\Math\Raw\ClpNat192.pas',
   ClpNat256 in '..\..\Math\Raw\ClpNat256.pas',
   ClpNat320 in '..\..\Math\Raw\ClpNat320.pas',
@@ -349,7 +349,7 @@ contains
   ClpIECKeyPairGenerator in '..\..\Interfaces\ClpIECKeyPairGenerator.pas',
   ClpIExtensionField in '..\..\Interfaces\ClpIExtensionField.pas',
   ClpOidTokenizer in '..\..\Asn1\ClpOidTokenizer.pas',
-  ClpValidityPrecompInfo in '..\..\Math\EC\Multiplier\ClpValidityPrecompInfo.pas',
+  ClpValidityPreCompInfo in '..\..\Math\EC\Multiplier\ClpValidityPreCompInfo.pas',
   ClpTeleTrusTNamedCurves in '..\..\Asn1\TeleTrust\ClpTeleTrusTNamedCurves.pas',
   ClpAgreementUtilities in '..\..\Security\ClpAgreementUtilities.pas',
   ClpIKdf1BytesGenerator in '..\..\Interfaces\ClpIKdf1BytesGenerator.pas',

+ 340 - 341
CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.lpk

@@ -840,685 +840,684 @@ Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring the devel
         <UnitName Value="ClpIDsaParameterGenerationParameters"/>
       </Item203>
       <Item204>
-        <Filename Value="..\..\Interfaces\ClpIValidityPrecompInfo.pas"/>
-        <UnitName Value="ClpIValidityPrecompInfo"/>
-      </Item204>
-      <Item205>
         <Filename Value="..\..\Crypto\Generators\ClpDsaParametersGenerator.pas"/>
         <UnitName Value="ClpDsaParametersGenerator"/>
-      </Item205>
-      <Item206>
+      </Item204>
+      <Item205>
         <Filename Value="..\..\Asn1\X509\ClpDsaParameter.pas"/>
         <UnitName Value="ClpDsaParameter"/>
-      </Item206>
-      <Item207>
+      </Item205>
+      <Item206>
         <Filename Value="..\..\Interfaces\ClpIDsaParameter.pas"/>
         <UnitName Value="ClpIDsaParameter"/>
-      </Item207>
-      <Item208>
+      </Item206>
+      <Item207>
         <Filename Value="..\..\Interfaces\ClpIKeyEncoder.pas"/>
         <UnitName Value="ClpIKeyEncoder"/>
-      </Item208>
-      <Item209>
+      </Item207>
+      <Item208>
         <Filename Value="..\..\Interfaces\ClpIDsaParametersGenerator.pas"/>
         <UnitName Value="ClpIDsaParametersGenerator"/>
-      </Item209>
-      <Item210>
+      </Item208>
+      <Item209>
         <Filename Value="..\..\Interfaces\ClpIPreCompCallBack.pas"/>
         <UnitName Value="ClpIPreCompCallBack"/>
+      </Item209>
+      <Item210>
+        <Filename Value="..\..\Asn1\Nist\ClpNistNamedCurves.pas"/>
+        <UnitName Value="ClpNistNamedCurves"/>
       </Item210>
       <Item211>
-        <Filename Value="..\..\Math\EC\Multiplier\ClpValidityPrecompInfo.pas"/>
-        <AddToUsesPkgSection Value="False"/>
-        <UnitName Value="ClpValidityPrecompInfo"/>
+        <Filename Value="..\..\Math\Raw\ClpNat256.pas"/>
+        <UnitName Value="ClpNat256"/>
       </Item211>
       <Item212>
-        <Filename Value="..\..\Asn1\Nist\ClpNistNamedCurves.pas"/>
-        <UnitName Value="ClpNistNamedCurves"/>
+        <Filename Value="..\..\Math\Raw\ClpNat320.pas"/>
+        <UnitName Value="ClpNat320"/>
       </Item212>
       <Item213>
-        <Filename Value="..\..\Math\Raw\ClpNat256.pas"/>
-        <UnitName Value="ClpNat256"/>
+        <Filename Value="..\..\Crypto\Engines\ClpAesLightEngine.pas"/>
+        <UnitName Value="ClpAesLightEngine"/>
       </Item213>
       <Item214>
-        <Filename Value="..\..\Math\Raw\ClpNat320.pas"/>
-        <UnitName Value="ClpNat320"/>
+        <Filename Value="..\..\Interfaces\ClpIAesLightEngine.pas"/>
+        <UnitName Value="ClpIAesLightEngine"/>
       </Item214>
       <Item215>
-        <Filename Value="..\..\Crypto\Engines\ClpAesLightEngine.pas"/>
-        <UnitName Value="ClpAesLightEngine"/>
+        <Filename Value="..\..\Crypto\EC\ClpCustomNamedCurves.pas"/>
+        <UnitName Value="ClpCustomNamedCurves"/>
       </Item215>
       <Item216>
-        <Filename Value="..\..\Interfaces\ClpIAesLightEngine.pas"/>
-        <UnitName Value="ClpIAesLightEngine"/>
+        <Filename Value="..\..\Math\Raw\ClpNat384.pas"/>
+        <UnitName Value="ClpNat384"/>
       </Item216>
       <Item217>
-        <Filename Value="..\..\Crypto\EC\ClpCustomNamedCurves.pas"/>
-        <UnitName Value="ClpCustomNamedCurves"/>
+        <Filename Value="..\..\Math\Raw\ClpNat192.pas"/>
+        <UnitName Value="ClpNat192"/>
       </Item217>
       <Item218>
-        <Filename Value="..\..\Math\Raw\ClpNat384.pas"/>
-        <UnitName Value="ClpNat384"/>
+        <Filename Value="..\..\Math\Raw\ClpNat512.pas"/>
+        <UnitName Value="ClpNat512"/>
       </Item218>
       <Item219>
-        <Filename Value="..\..\Math\Raw\ClpNat192.pas"/>
-        <UnitName Value="ClpNat192"/>
+        <Filename Value="..\..\Math\Raw\ClpInterleave.pas"/>
+        <UnitName Value="ClpInterleave"/>
       </Item219>
       <Item220>
-        <Filename Value="..\..\Math\Raw\ClpNat512.pas"/>
-        <UnitName Value="ClpNat512"/>
+        <Filename Value="..\..\Asn1\Bsi\ClpBsiObjectIdentifiers.pas"/>
+        <UnitName Value="ClpBsiObjectIdentifiers"/>
       </Item220>
       <Item221>
-        <Filename Value="..\..\Math\Raw\ClpInterleave.pas"/>
-        <UnitName Value="ClpInterleave"/>
+        <Filename Value="..\..\Asn1\Eac\ClpEacObjectIdentifiers.pas"/>
+        <UnitName Value="ClpEacObjectIdentifiers"/>
       </Item221>
       <Item222>
-        <Filename Value="..\..\Asn1\Bsi\ClpBsiObjectIdentifiers.pas"/>
-        <UnitName Value="ClpBsiObjectIdentifiers"/>
+        <Filename Value="..\..\Interfaces\ClpIDsaExt.pas"/>
+        <UnitName Value="ClpIDsaExt"/>
       </Item222>
       <Item223>
-        <Filename Value="..\..\Asn1\Eac\ClpEacObjectIdentifiers.pas"/>
-        <UnitName Value="ClpEacObjectIdentifiers"/>
+        <Filename Value="..\..\Interfaces\ClpISchnorrDigestSigner.pas"/>
+        <UnitName Value="ClpISchnorrDigestSigner"/>
       </Item223>
       <Item224>
-        <Filename Value="..\..\Interfaces\ClpIDsaExt.pas"/>
-        <UnitName Value="ClpIDsaExt"/>
+        <Filename Value="..\..\Interfaces\ClpIECSchnorrSipaSigner.pas"/>
+        <UnitName Value="ClpIECSchnorrSipaSigner"/>
       </Item224>
       <Item225>
-        <Filename Value="..\..\Interfaces\ClpISchnorrDigestSigner.pas"/>
-        <UnitName Value="ClpISchnorrDigestSigner"/>
+        <Filename Value="..\..\Crypto\Signers\ClpECSchnorrSipaSigner.pas"/>
+        <UnitName Value="ClpECSchnorrSipaSigner"/>
       </Item225>
       <Item226>
-        <Filename Value="..\..\Interfaces\ClpIECSchnorrSipaSigner.pas"/>
-        <UnitName Value="ClpIECSchnorrSipaSigner"/>
+        <Filename Value="..\..\Crypto\Signers\ClpSchnorrDigestSigner.pas"/>
+        <UnitName Value="ClpSchnorrDigestSigner"/>
       </Item226>
       <Item227>
-        <Filename Value="..\..\Crypto\Signers\ClpECSchnorrSipaSigner.pas"/>
-        <UnitName Value="ClpECSchnorrSipaSigner"/>
+        <Filename Value="..\..\Interfaces\ClpISchnorr.pas"/>
+        <UnitName Value="ClpISchnorr"/>
       </Item227>
       <Item228>
-        <Filename Value="..\..\Crypto\Signers\ClpSchnorrDigestSigner.pas"/>
-        <UnitName Value="ClpSchnorrDigestSigner"/>
+        <Filename Value="..\..\Interfaces\ClpISchnorrExt.pas"/>
+        <UnitName Value="ClpISchnorrExt"/>
       </Item228>
       <Item229>
-        <Filename Value="..\..\Interfaces\ClpISchnorr.pas"/>
-        <UnitName Value="ClpISchnorr"/>
+        <Filename Value="..\..\Crypto\Engines\ClpBlowfishEngine.pas"/>
+        <UnitName Value="ClpBlowfishEngine"/>
       </Item229>
       <Item230>
-        <Filename Value="..\..\Interfaces\ClpISchnorrExt.pas"/>
-        <UnitName Value="ClpISchnorrExt"/>
+        <Filename Value="..\..\Interfaces\ClpIBlowfishEngine.pas"/>
+        <UnitName Value="ClpIBlowfishEngine"/>
       </Item230>
       <Item231>
-        <Filename Value="..\..\Crypto\Engines\ClpBlowfishEngine.pas"/>
-        <UnitName Value="ClpBlowfishEngine"/>
+        <Filename Value="..\..\Math\EC\ClpECC.pas"/>
+        <UnitName Value="ClpECC"/>
       </Item231>
       <Item232>
-        <Filename Value="..\..\Interfaces\ClpIBlowfishEngine.pas"/>
-        <UnitName Value="ClpIBlowfishEngine"/>
+        <Filename Value="..\..\Asn1\ClpAsn1Objects.pas"/>
+        <UnitName Value="ClpAsn1Objects"/>
       </Item232>
       <Item233>
-        <Filename Value="..\..\Math\EC\ClpECC.pas"/>
-        <UnitName Value="ClpECC"/>
+        <Filename Value="..\..\Crypto\Signers\SignersEncodings\ClpSignersEncodings.pas"/>
+        <UnitName Value="ClpSignersEncodings"/>
       </Item233>
       <Item234>
-        <Filename Value="..\..\Asn1\ClpAsn1Objects.pas"/>
-        <UnitName Value="ClpAsn1Objects"/>
+        <Filename Value="..\..\Interfaces\ClpISignersEncodings.pas"/>
+        <UnitName Value="ClpISignersEncodings"/>
       </Item234>
       <Item235>
-        <Filename Value="..\..\Crypto\Signers\SignersEncodings\ClpSignersEncodings.pas"/>
-        <UnitName Value="ClpSignersEncodings"/>
+        <Filename Value="..\..\Utils\Encoders\ClpEncoders.pas"/>
+        <UnitName Value="ClpEncoders"/>
       </Item235>
       <Item236>
-        <Filename Value="..\..\Interfaces\ClpISignersEncodings.pas"/>
-        <UnitName Value="ClpISignersEncodings"/>
+        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecT283Custom.pas"/>
+        <UnitName Value="ClpSecT283Custom"/>
       </Item236>
       <Item237>
-        <Filename Value="..\..\Utils\Encoders\ClpEncoders.pas"/>
-        <UnitName Value="ClpEncoders"/>
+        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP521R1Custom.pas"/>
+        <UnitName Value="ClpSecP521R1Custom"/>
       </Item237>
       <Item238>
-        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecT283Custom.pas"/>
-        <UnitName Value="ClpSecT283Custom"/>
+        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP384R1Custom.pas"/>
+        <UnitName Value="ClpSecP384R1Custom"/>
       </Item238>
       <Item239>
-        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP521R1Custom.pas"/>
-        <UnitName Value="ClpSecP521R1Custom"/>
+        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP256R1Custom.pas"/>
+        <UnitName Value="ClpSecP256R1Custom"/>
       </Item239>
       <Item240>
-        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP384R1Custom.pas"/>
-        <UnitName Value="ClpSecP384R1Custom"/>
+        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP256K1Custom.pas"/>
+        <UnitName Value="ClpSecP256K1Custom"/>
       </Item240>
       <Item241>
-        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP256R1Custom.pas"/>
-        <UnitName Value="ClpSecP256R1Custom"/>
+        <Filename Value="..\..\Interfaces\ClpIX9ECC.pas"/>
+        <UnitName Value="ClpIX9ECC"/>
       </Item241>
       <Item242>
-        <Filename Value="..\..\Math\EC\Custom\Sec\ClpSecP256K1Custom.pas"/>
-        <UnitName Value="ClpSecP256K1Custom"/>
+        <Filename Value="..\..\Asn1\X9\ClpX9ECC.pas"/>
+        <UnitName Value="ClpX9ECC"/>
       </Item242>
       <Item243>
-        <Filename Value="..\..\Interfaces\ClpIX9ECC.pas"/>
-        <UnitName Value="ClpIX9ECC"/>
+        <Filename Value="..\..\Interfaces\ClpIAsn1Objects.pas"/>
+        <UnitName Value="ClpIAsn1Objects"/>
       </Item243>
       <Item244>
-        <Filename Value="..\..\Asn1\X9\ClpX9ECC.pas"/>
-        <UnitName Value="ClpX9ECC"/>
+        <Filename Value="..\..\Crypto\Modes\ClpBlockCipherModes.pas"/>
+        <UnitName Value="ClpBlockCipherModes"/>
       </Item244>
       <Item245>
-        <Filename Value="..\..\Interfaces\ClpIAsn1Objects.pas"/>
-        <UnitName Value="ClpIAsn1Objects"/>
+        <Filename Value="..\..\Math\EC\ClpECCurveConstants.pas"/>
+        <UnitName Value="ClpECCurveConstants"/>
       </Item245>
       <Item246>
-        <Filename Value="..\..\Crypto\Modes\ClpBlockCipherModes.pas"/>
-        <UnitName Value="ClpBlockCipherModes"/>
+        <Filename Value="..\..\Interfaces\ClpIBlockCipherModes.pas"/>
+        <UnitName Value="ClpIBlockCipherModes"/>
       </Item246>
       <Item247>
-        <Filename Value="..\..\Math\EC\ClpECCurveConstants.pas"/>
-        <UnitName Value="ClpECCurveConstants"/>
+        <Filename Value="..\..\Interfaces\ClpIPaddingModes.pas"/>
+        <UnitName Value="ClpIPaddingModes"/>
       </Item247>
       <Item248>
-        <Filename Value="..\..\Interfaces\ClpIBlockCipherModes.pas"/>
-        <UnitName Value="ClpIBlockCipherModes"/>
+        <Filename Value="..\..\Interfaces\ClpISecP256K1Custom.pas"/>
+        <UnitName Value="ClpISecP256K1Custom"/>
       </Item248>
       <Item249>
-        <Filename Value="..\..\Interfaces\ClpIPaddingModes.pas"/>
-        <UnitName Value="ClpIPaddingModes"/>
+        <Filename Value="..\..\Interfaces\ClpISecP256R1Custom.pas"/>
+        <UnitName Value="ClpISecP256R1Custom"/>
       </Item249>
       <Item250>
-        <Filename Value="..\..\Interfaces\ClpISecP256K1Custom.pas"/>
-        <UnitName Value="ClpISecP256K1Custom"/>
+        <Filename Value="..\..\Interfaces\ClpISecP384R1Custom.pas"/>
+        <UnitName Value="ClpISecP384R1Custom"/>
       </Item250>
       <Item251>
-        <Filename Value="..\..\Interfaces\ClpISecP256R1Custom.pas"/>
-        <UnitName Value="ClpISecP256R1Custom"/>
+        <Filename Value="..\..\Interfaces\ClpISecP521R1Custom.pas"/>
+        <UnitName Value="ClpISecP521R1Custom"/>
       </Item251>
       <Item252>
-        <Filename Value="..\..\Interfaces\ClpISecP384R1Custom.pas"/>
-        <UnitName Value="ClpISecP384R1Custom"/>
+        <Filename Value="..\..\Interfaces\ClpISecT283Custom.pas"/>
+        <UnitName Value="ClpISecT283Custom"/>
       </Item252>
       <Item253>
-        <Filename Value="..\..\Interfaces\ClpISecP521R1Custom.pas"/>
-        <UnitName Value="ClpISecP521R1Custom"/>
+        <Filename Value="..\..\Crypto\Paddings\ClpPaddingModes.pas"/>
+        <UnitName Value="ClpPaddingModes"/>
       </Item253>
       <Item254>
-        <Filename Value="..\..\Interfaces\ClpISecT283Custom.pas"/>
-        <UnitName Value="ClpISecT283Custom"/>
+        <Filename Value="..\..\Interfaces\ClpIECC.pas"/>
+        <UnitName Value="ClpIECC"/>
       </Item254>
       <Item255>
-        <Filename Value="..\..\Crypto\Paddings\ClpPaddingModes.pas"/>
-        <UnitName Value="ClpPaddingModes"/>
+        <Filename Value="..\..\Interfaces\ClpISpeckEngine.pas"/>
+        <UnitName Value="ClpISpeckEngine"/>
       </Item255>
       <Item256>
-        <Filename Value="..\..\Interfaces\ClpIECC.pas"/>
-        <UnitName Value="ClpIECC"/>
+        <Filename Value="..\..\Crypto\Engines\ClpSpeckEngine.pas"/>
+        <UnitName Value="ClpSpeckEngine"/>
       </Item256>
       <Item257>
-        <Filename Value="..\..\Interfaces\ClpISpeckEngine.pas"/>
-        <UnitName Value="ClpISpeckEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIBufferedStreamCipher.pas"/>
+        <UnitName Value="ClpIBufferedStreamCipher"/>
       </Item257>
       <Item258>
-        <Filename Value="..\..\Crypto\Engines\ClpSpeckEngine.pas"/>
-        <UnitName Value="ClpSpeckEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIChaChaEngine.pas"/>
+        <UnitName Value="ClpIChaChaEngine"/>
       </Item258>
       <Item259>
-        <Filename Value="..\..\Interfaces\ClpIBufferedStreamCipher.pas"/>
-        <UnitName Value="ClpIBufferedStreamCipher"/>
+        <Filename Value="..\..\Interfaces\ClpIXSalsa20Engine.pas"/>
+        <UnitName Value="ClpIXSalsa20Engine"/>
       </Item259>
       <Item260>
-        <Filename Value="..\..\Interfaces\ClpIChaChaEngine.pas"/>
-        <UnitName Value="ClpIChaChaEngine"/>
+        <Filename Value="..\..\Interfaces\ClpISalsa20Engine.pas"/>
+        <UnitName Value="ClpISalsa20Engine"/>
       </Item260>
       <Item261>
-        <Filename Value="..\..\Interfaces\ClpIXSalsa20Engine.pas"/>
-        <UnitName Value="ClpIXSalsa20Engine"/>
+        <Filename Value="..\..\Crypto\ClpBufferedStreamCipher.pas"/>
+        <UnitName Value="ClpBufferedStreamCipher"/>
       </Item261>
       <Item262>
-        <Filename Value="..\..\Interfaces\ClpISalsa20Engine.pas"/>
-        <UnitName Value="ClpISalsa20Engine"/>
+        <Filename Value="..\..\Crypto\Engines\ClpSalsa20Engine.pas"/>
+        <UnitName Value="ClpSalsa20Engine"/>
       </Item262>
       <Item263>
-        <Filename Value="..\..\Crypto\ClpBufferedStreamCipher.pas"/>
-        <UnitName Value="ClpBufferedStreamCipher"/>
+        <Filename Value="..\..\Crypto\Engines\ClpXSalsa20Engine.pas"/>
+        <UnitName Value="ClpXSalsa20Engine"/>
       </Item263>
       <Item264>
-        <Filename Value="..\..\Crypto\Engines\ClpSalsa20Engine.pas"/>
-        <UnitName Value="ClpSalsa20Engine"/>
+        <Filename Value="..\..\Crypto\Engines\ClpChaChaEngine.pas"/>
+        <UnitName Value="ClpChaChaEngine"/>
       </Item264>
       <Item265>
-        <Filename Value="..\..\Crypto\Engines\ClpXSalsa20Engine.pas"/>
-        <UnitName Value="ClpXSalsa20Engine"/>
+        <Filename Value="..\..\Interfaces\ClpIRijndaelEngine.pas"/>
+        <UnitName Value="ClpIRijndaelEngine"/>
       </Item265>
       <Item266>
-        <Filename Value="..\..\Crypto\Engines\ClpChaChaEngine.pas"/>
-        <UnitName Value="ClpChaChaEngine"/>
+        <Filename Value="..\..\Crypto\Engines\ClpRijndaelEngine.pas"/>
+        <UnitName Value="ClpRijndaelEngine"/>
       </Item266>
       <Item267>
-        <Filename Value="..\..\Interfaces\ClpIRijndaelEngine.pas"/>
-        <UnitName Value="ClpIRijndaelEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIIESParameterSpec.pas"/>
+        <UnitName Value="ClpIIESParameterSpec"/>
       </Item267>
       <Item268>
-        <Filename Value="..\..\Crypto\Engines\ClpRijndaelEngine.pas"/>
-        <UnitName Value="ClpRijndaelEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIAlgorithmParameterSpec.pas"/>
+        <UnitName Value="ClpIAlgorithmParameterSpec"/>
       </Item268>
       <Item269>
-        <Filename Value="..\..\Interfaces\ClpIIESParameterSpec.pas"/>
-        <UnitName Value="ClpIIESParameterSpec"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpIESParameterSpec.pas"/>
+        <UnitName Value="ClpIESParameterSpec"/>
       </Item269>
       <Item270>
-        <Filename Value="..\..\Interfaces\ClpIAlgorithmParameterSpec.pas"/>
-        <UnitName Value="ClpIAlgorithmParameterSpec"/>
+        <Filename Value="..\..\Math\EC\Custom\Djb\ClpCurve25519Custom.pas"/>
+        <UnitName Value="ClpCurve25519Custom"/>
       </Item270>
       <Item271>
-        <Filename Value="..\..\Crypto\Parameters\ClpIESParameterSpec.pas"/>
-        <UnitName Value="ClpIESParameterSpec"/>
+        <Filename Value="..\..\Interfaces\ClpICurve25519Custom.pas"/>
+        <UnitName Value="ClpICurve25519Custom"/>
       </Item271>
       <Item272>
-        <Filename Value="..\..\Math\EC\Custom\Djb\ClpCurve25519Custom.pas"/>
-        <UnitName Value="ClpCurve25519Custom"/>
+        <Filename Value="..\..\Crypto\Engines\ClpSpeckLegacyEngine.pas"/>
+        <UnitName Value="ClpSpeckLegacyEngine"/>
       </Item272>
       <Item273>
-        <Filename Value="..\..\Interfaces\ClpICurve25519Custom.pas"/>
-        <UnitName Value="ClpICurve25519Custom"/>
+        <Filename Value="..\..\Interfaces\ClpISpeckLegacyEngine.pas"/>
+        <UnitName Value="ClpISpeckLegacyEngine"/>
       </Item273>
       <Item274>
-        <Filename Value="..\..\Crypto\Engines\ClpSpeckLegacyEngine.pas"/>
-        <UnitName Value="ClpSpeckLegacyEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519.pas"/>
+        <UnitName Value="ClpIEd25519"/>
       </Item274>
       <Item275>
-        <Filename Value="..\..\Interfaces\ClpISpeckLegacyEngine.pas"/>
-        <UnitName Value="ClpISpeckLegacyEngine"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2B.pas"/>
+        <UnitName Value="ClpIEd25519Blake2B"/>
       </Item275>
       <Item276>
-        <Filename Value="..\..\Interfaces\ClpIEd25519.pas"/>
-        <UnitName Value="ClpIEd25519"/>
+        <Filename Value="..\..\Math\EC\Rfc7748\ClpX25519Field.pas"/>
+        <UnitName Value="ClpX25519Field"/>
       </Item276>
       <Item277>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2B.pas"/>
-        <UnitName Value="ClpIEd25519Blake2B"/>
+        <Filename Value="..\..\Math\EC\Rfc8032\ClpEd25519.pas"/>
+        <UnitName Value="ClpEd25519"/>
       </Item277>
       <Item278>
-        <Filename Value="..\..\Math\EC\Rfc7748\ClpX25519Field.pas"/>
-        <UnitName Value="ClpX25519Field"/>
+        <Filename Value="..\..\Math\EC\Rfc8032\ClpEd25519Blake2B.pas"/>
+        <UnitName Value="ClpEd25519Blake2B"/>
       </Item278>
       <Item279>
-        <Filename Value="..\..\Math\EC\Rfc8032\ClpEd25519.pas"/>
-        <UnitName Value="ClpEd25519"/>
+        <Filename Value="..\..\Math\EC\Rfc7748\ClpX25519.pas"/>
+        <UnitName Value="ClpX25519"/>
       </Item279>
       <Item280>
-        <Filename Value="..\..\Math\EC\Rfc8032\ClpEd25519Blake2B.pas"/>
-        <UnitName Value="ClpEd25519Blake2B"/>
+        <Filename Value="..\..\Asn1\Edec\ClpEdECObjectIdentifiers.pas"/>
+        <UnitName Value="ClpEdECObjectIdentifiers"/>
       </Item280>
       <Item281>
-        <Filename Value="..\..\Math\EC\Rfc7748\ClpX25519.pas"/>
-        <UnitName Value="ClpX25519"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519CtxBlake2BSigner.pas"/>
+        <UnitName Value="ClpIEd25519CtxBlake2BSigner"/>
       </Item281>
       <Item282>
-        <Filename Value="..\..\Asn1\Edec\ClpEdECObjectIdentifiers.pas"/>
-        <UnitName Value="ClpEdECObjectIdentifiers"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519PhBlake2BSigner.pas"/>
+        <UnitName Value="ClpIEd25519PhBlake2BSigner"/>
       </Item282>
       <Item283>
-        <Filename Value="..\..\Interfaces\ClpIEd25519CtxBlake2BSigner.pas"/>
-        <UnitName Value="ClpIEd25519CtxBlake2BSigner"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519PhSigner.pas"/>
+        <UnitName Value="ClpIEd25519PhSigner"/>
       </Item283>
       <Item284>
-        <Filename Value="..\..\Interfaces\ClpIEd25519PhBlake2BSigner.pas"/>
-        <UnitName Value="ClpIEd25519PhBlake2BSigner"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519CtxSigner.pas"/>
+        <UnitName Value="ClpIEd25519CtxSigner"/>
       </Item284>
       <Item285>
-        <Filename Value="..\..\Interfaces\ClpIEd25519PhSigner.pas"/>
-        <UnitName Value="ClpIEd25519PhSigner"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BSigner.pas"/>
+        <UnitName Value="ClpIEd25519Blake2BSigner"/>
       </Item285>
       <Item286>
-        <Filename Value="..\..\Interfaces\ClpIEd25519CtxSigner.pas"/>
-        <UnitName Value="ClpIEd25519CtxSigner"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Signer.pas"/>
+        <UnitName Value="ClpIEd25519Signer"/>
       </Item286>
       <Item287>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BSigner.pas"/>
-        <UnitName Value="ClpIEd25519Blake2BSigner"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BKeyGenerationParameters.pas"/>
+        <UnitName Value="ClpIEd25519Blake2BKeyGenerationParameters"/>
       </Item287>
       <Item288>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Signer.pas"/>
-        <UnitName Value="ClpIEd25519Signer"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519KeyGenerationParameters.pas"/>
+        <UnitName Value="ClpIEd25519KeyGenerationParameters"/>
       </Item288>
       <Item289>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BKeyGenerationParameters.pas"/>
-        <UnitName Value="ClpIEd25519Blake2BKeyGenerationParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIX25519KeyGenerationParameters.pas"/>
+        <UnitName Value="ClpIX25519KeyGenerationParameters"/>
       </Item289>
       <Item290>
-        <Filename Value="..\..\Interfaces\ClpIEd25519KeyGenerationParameters.pas"/>
-        <UnitName Value="ClpIEd25519KeyGenerationParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BKeyPairGenerator.pas"/>
+        <UnitName Value="ClpIEd25519Blake2BKeyPairGenerator"/>
       </Item290>
       <Item291>
-        <Filename Value="..\..\Interfaces\ClpIX25519KeyGenerationParameters.pas"/>
-        <UnitName Value="ClpIX25519KeyGenerationParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519KeyPairGenerator.pas"/>
+        <UnitName Value="ClpIEd25519KeyPairGenerator"/>
       </Item291>
       <Item292>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BKeyPairGenerator.pas"/>
-        <UnitName Value="ClpIEd25519Blake2BKeyPairGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIX25519KeyPairGenerator.pas"/>
+        <UnitName Value="ClpIX25519KeyPairGenerator"/>
       </Item292>
       <Item293>
-        <Filename Value="..\..\Interfaces\ClpIEd25519KeyPairGenerator.pas"/>
-        <UnitName Value="ClpIEd25519KeyPairGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BPrivateKeyParameters.pas"/>
+        <UnitName Value="ClpIEd25519Blake2BPrivateKeyParameters"/>
       </Item293>
       <Item294>
-        <Filename Value="..\..\Interfaces\ClpIX25519KeyPairGenerator.pas"/>
-        <UnitName Value="ClpIX25519KeyPairGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BPublicKeyParameters.pas"/>
+        <UnitName Value="ClpIEd25519Blake2BPublicKeyParameters"/>
       </Item294>
       <Item295>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BPrivateKeyParameters.pas"/>
-        <UnitName Value="ClpIEd25519Blake2BPrivateKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519PrivateKeyParameters.pas"/>
+        <UnitName Value="ClpIEd25519PrivateKeyParameters"/>
       </Item295>
       <Item296>
-        <Filename Value="..\..\Interfaces\ClpIEd25519Blake2BPublicKeyParameters.pas"/>
-        <UnitName Value="ClpIEd25519Blake2BPublicKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIEd25519PublicKeyParameters.pas"/>
+        <UnitName Value="ClpIEd25519PublicKeyParameters"/>
       </Item296>
       <Item297>
-        <Filename Value="..\..\Interfaces\ClpIEd25519PrivateKeyParameters.pas"/>
-        <UnitName Value="ClpIEd25519PrivateKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIX25519PublicKeyParameters.pas"/>
+        <UnitName Value="ClpIX25519PublicKeyParameters"/>
       </Item297>
       <Item298>
-        <Filename Value="..\..\Interfaces\ClpIEd25519PublicKeyParameters.pas"/>
-        <UnitName Value="ClpIEd25519PublicKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIX25519PrivateKeyParameters.pas"/>
+        <UnitName Value="ClpIX25519PrivateKeyParameters"/>
       </Item298>
       <Item299>
-        <Filename Value="..\..\Interfaces\ClpIX25519PublicKeyParameters.pas"/>
-        <UnitName Value="ClpIX25519PublicKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIX25519Agreement.pas"/>
+        <UnitName Value="ClpIX25519Agreement"/>
       </Item299>
       <Item300>
-        <Filename Value="..\..\Interfaces\ClpIX25519PrivateKeyParameters.pas"/>
-        <UnitName Value="ClpIX25519PrivateKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIRawAgreement.pas"/>
+        <UnitName Value="ClpIRawAgreement"/>
       </Item300>
       <Item301>
-        <Filename Value="..\..\Interfaces\ClpIX25519Agreement.pas"/>
-        <UnitName Value="ClpIX25519Agreement"/>
+        <Filename Value="..\..\Crypto\Agreement\ClpX25519Agreement.pas"/>
+        <UnitName Value="ClpX25519Agreement"/>
       </Item301>
       <Item302>
-        <Filename Value="..\..\Interfaces\ClpIRawAgreement.pas"/>
-        <UnitName Value="ClpIRawAgreement"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BKeyGenerationParameters.pas"/>
+        <UnitName Value="ClpEd25519Blake2BKeyGenerationParameters"/>
       </Item302>
       <Item303>
-        <Filename Value="..\..\Crypto\Agreement\ClpX25519Agreement.pas"/>
-        <UnitName Value="ClpX25519Agreement"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519KeyGenerationParameters.pas"/>
+        <UnitName Value="ClpEd25519KeyGenerationParameters"/>
       </Item303>
       <Item304>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BKeyGenerationParameters.pas"/>
-        <UnitName Value="ClpEd25519Blake2BKeyGenerationParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpX25519KeyGenerationParameters.pas"/>
+        <UnitName Value="ClpX25519KeyGenerationParameters"/>
       </Item304>
       <Item305>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519KeyGenerationParameters.pas"/>
-        <UnitName Value="ClpEd25519KeyGenerationParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BPrivateKeyParameters.pas"/>
+        <UnitName Value="ClpEd25519Blake2BPrivateKeyParameters"/>
       </Item305>
       <Item306>
-        <Filename Value="..\..\Crypto\Parameters\ClpX25519KeyGenerationParameters.pas"/>
-        <UnitName Value="ClpX25519KeyGenerationParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BPublicKeyParameters.pas"/>
+        <UnitName Value="ClpEd25519Blake2BPublicKeyParameters"/>
       </Item306>
       <Item307>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BPrivateKeyParameters.pas"/>
-        <UnitName Value="ClpEd25519Blake2BPrivateKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519PublicKeyParameters.pas"/>
+        <UnitName Value="ClpEd25519PublicKeyParameters"/>
       </Item307>
       <Item308>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519Blake2BPublicKeyParameters.pas"/>
-        <UnitName Value="ClpEd25519Blake2BPublicKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpEd25519PrivateKeyParameters.pas"/>
+        <UnitName Value="ClpEd25519PrivateKeyParameters"/>
       </Item308>
       <Item309>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519PublicKeyParameters.pas"/>
-        <UnitName Value="ClpEd25519PublicKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpX25519PublicKeyParameters.pas"/>
+        <UnitName Value="ClpX25519PublicKeyParameters"/>
       </Item309>
       <Item310>
-        <Filename Value="..\..\Crypto\Parameters\ClpEd25519PrivateKeyParameters.pas"/>
-        <UnitName Value="ClpEd25519PrivateKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpX25519PrivateKeyParameters.pas"/>
+        <UnitName Value="ClpX25519PrivateKeyParameters"/>
       </Item310>
       <Item311>
-        <Filename Value="..\..\Crypto\Parameters\ClpX25519PublicKeyParameters.pas"/>
-        <UnitName Value="ClpX25519PublicKeyParameters"/>
+        <Filename Value="..\..\Crypto\Generators\ClpEd25519Blake2BKeyPairGenerator.pas"/>
+        <UnitName Value="ClpEd25519Blake2BKeyPairGenerator"/>
       </Item311>
       <Item312>
-        <Filename Value="..\..\Crypto\Parameters\ClpX25519PrivateKeyParameters.pas"/>
-        <UnitName Value="ClpX25519PrivateKeyParameters"/>
+        <Filename Value="..\..\Crypto\Generators\ClpEd25519KeyPairGenerator.pas"/>
+        <UnitName Value="ClpEd25519KeyPairGenerator"/>
       </Item312>
       <Item313>
-        <Filename Value="..\..\Crypto\Generators\ClpEd25519Blake2BKeyPairGenerator.pas"/>
-        <UnitName Value="ClpEd25519Blake2BKeyPairGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpX25519KeyPairGenerator.pas"/>
+        <UnitName Value="ClpX25519KeyPairGenerator"/>
       </Item313>
       <Item314>
-        <Filename Value="..\..\Crypto\Generators\ClpEd25519KeyPairGenerator.pas"/>
-        <UnitName Value="ClpEd25519KeyPairGenerator"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519PhBlake2BSigner.pas"/>
+        <UnitName Value="ClpEd25519PhBlake2BSigner"/>
       </Item314>
       <Item315>
-        <Filename Value="..\..\Crypto\Generators\ClpX25519KeyPairGenerator.pas"/>
-        <UnitName Value="ClpX25519KeyPairGenerator"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519PhSigner.pas"/>
+        <UnitName Value="ClpEd25519PhSigner"/>
       </Item315>
       <Item316>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519PhBlake2BSigner.pas"/>
-        <UnitName Value="ClpEd25519PhBlake2BSigner"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519Signer.pas"/>
+        <UnitName Value="ClpEd25519Signer"/>
       </Item316>
       <Item317>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519PhSigner.pas"/>
-        <UnitName Value="ClpEd25519PhSigner"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519CtxBlake2BSigner.pas"/>
+        <UnitName Value="ClpEd25519CtxBlake2BSigner"/>
       </Item317>
       <Item318>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519Signer.pas"/>
-        <UnitName Value="ClpEd25519Signer"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519CtxSigner.pas"/>
+        <UnitName Value="ClpEd25519CtxSigner"/>
       </Item318>
       <Item319>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519CtxBlake2BSigner.pas"/>
-        <UnitName Value="ClpEd25519CtxBlake2BSigner"/>
+        <Filename Value="..\..\Crypto\Signers\ClpEd25519Blake2BSigner.pas"/>
+        <UnitName Value="ClpEd25519Blake2BSigner"/>
       </Item319>
       <Item320>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519CtxSigner.pas"/>
-        <UnitName Value="ClpEd25519CtxSigner"/>
+        <Filename Value="..\..\Asn1\TeleTrust\ClpTeleTrusTNamedCurves.pas"/>
+        <UnitName Value="ClpTeleTrusTNamedCurves"/>
       </Item320>
       <Item321>
-        <Filename Value="..\..\Crypto\Signers\ClpEd25519Blake2BSigner.pas"/>
-        <UnitName Value="ClpEd25519Blake2BSigner"/>
+        <Filename Value="..\..\Security\ClpAgreementUtilities.pas"/>
+        <UnitName Value="ClpAgreementUtilities"/>
       </Item321>
       <Item322>
-        <Filename Value="..\..\Asn1\TeleTrust\ClpTeleTrusTNamedCurves.pas"/>
-        <UnitName Value="ClpTeleTrusTNamedCurves"/>
+        <Filename Value="..\..\Interfaces\ClpIKdf1BytesGenerator.pas"/>
+        <UnitName Value="ClpIKdf1BytesGenerator"/>
       </Item322>
       <Item323>
-        <Filename Value="..\..\Security\ClpAgreementUtilities.pas"/>
-        <UnitName Value="ClpAgreementUtilities"/>
+        <Filename Value="..\..\Crypto\Generators\ClpKdf1BytesGenerator.pas"/>
+        <UnitName Value="ClpKdf1BytesGenerator"/>
       </Item323>
       <Item324>
-        <Filename Value="..\..\Interfaces\ClpIKdf1BytesGenerator.pas"/>
-        <UnitName Value="ClpIKdf1BytesGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIArgon2ParametersGenerator.pas"/>
+        <UnitName Value="ClpIArgon2ParametersGenerator"/>
       </Item324>
       <Item325>
-        <Filename Value="..\..\Crypto\Generators\ClpKdf1BytesGenerator.pas"/>
-        <UnitName Value="ClpKdf1BytesGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpArgon2ParametersGenerator.pas"/>
+        <UnitName Value="ClpArgon2ParametersGenerator"/>
       </Item325>
       <Item326>
-        <Filename Value="..\..\Interfaces\ClpIArgon2ParametersGenerator.pas"/>
-        <UnitName Value="ClpIArgon2ParametersGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIScryptParametersGenerator.pas"/>
+        <UnitName Value="ClpIScryptParametersGenerator"/>
       </Item326>
       <Item327>
-        <Filename Value="..\..\Crypto\Generators\ClpArgon2ParametersGenerator.pas"/>
-        <UnitName Value="ClpArgon2ParametersGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpScryptParametersGenerator.pas"/>
+        <UnitName Value="ClpScryptParametersGenerator"/>
       </Item327>
       <Item328>
-        <Filename Value="..\..\Interfaces\ClpIScryptParametersGenerator.pas"/>
-        <UnitName Value="ClpIScryptParametersGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIDHAgreement.pas"/>
+        <UnitName Value="ClpIDHAgreement"/>
       </Item328>
       <Item329>
-        <Filename Value="..\..\Crypto\Generators\ClpScryptParametersGenerator.pas"/>
-        <UnitName Value="ClpScryptParametersGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIDHBasicAgreement.pas"/>
+        <UnitName Value="ClpIDHBasicAgreement"/>
       </Item329>
       <Item330>
-        <Filename Value="..\..\Interfaces\ClpIDHAgreement.pas"/>
-        <UnitName Value="ClpIDHAgreement"/>
+        <Filename Value="..\..\Interfaces\ClpIDHBasicKeyPairGenerator.pas"/>
+        <UnitName Value="ClpIDHBasicKeyPairGenerator"/>
       </Item330>
       <Item331>
-        <Filename Value="..\..\Interfaces\ClpIDHBasicAgreement.pas"/>
-        <UnitName Value="ClpIDHBasicAgreement"/>
+        <Filename Value="..\..\Interfaces\ClpIDHKeyPairGenerator.pas"/>
+        <UnitName Value="ClpIDHKeyPairGenerator"/>
       </Item331>
       <Item332>
-        <Filename Value="..\..\Interfaces\ClpIDHBasicKeyPairGenerator.pas"/>
-        <UnitName Value="ClpIDHBasicKeyPairGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIDHPrivateKeyParameters.pas"/>
+        <UnitName Value="ClpIDHPrivateKeyParameters"/>
       </Item332>
       <Item333>
-        <Filename Value="..\..\Interfaces\ClpIDHKeyPairGenerator.pas"/>
-        <UnitName Value="ClpIDHKeyPairGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIDHPublicKeyParameters.pas"/>
+        <UnitName Value="ClpIDHPublicKeyParameters"/>
       </Item333>
       <Item334>
-        <Filename Value="..\..\Interfaces\ClpIDHPrivateKeyParameters.pas"/>
-        <UnitName Value="ClpIDHPrivateKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHParametersGenerator.pas"/>
+        <UnitName Value="ClpIDHParametersGenerator"/>
       </Item334>
       <Item335>
-        <Filename Value="..\..\Interfaces\ClpIDHPublicKeyParameters.pas"/>
-        <UnitName Value="ClpIDHPublicKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHKeyGenerationParameters.pas"/>
+        <UnitName Value="ClpIDHKeyGenerationParameters"/>
       </Item335>
       <Item336>
-        <Filename Value="..\..\Interfaces\ClpIDHParametersGenerator.pas"/>
-        <UnitName Value="ClpIDHParametersGenerator"/>
+        <Filename Value="..\..\Interfaces\ClpIDHParameters.pas"/>
+        <UnitName Value="ClpIDHParameters"/>
       </Item336>
       <Item337>
-        <Filename Value="..\..\Interfaces\ClpIDHKeyGenerationParameters.pas"/>
-        <UnitName Value="ClpIDHKeyGenerationParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHKeyGeneratorHelper.pas"/>
+        <UnitName Value="ClpIDHKeyGeneratorHelper"/>
       </Item337>
       <Item338>
-        <Filename Value="..\..\Interfaces\ClpIDHParameters.pas"/>
-        <UnitName Value="ClpIDHParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHKeyParameters.pas"/>
+        <UnitName Value="ClpIDHKeyParameters"/>
       </Item338>
       <Item339>
-        <Filename Value="..\..\Interfaces\ClpIDHKeyGeneratorHelper.pas"/>
-        <UnitName Value="ClpIDHKeyGeneratorHelper"/>
+        <Filename Value="..\..\Interfaces\ClpIDHValidationParameters.pas"/>
+        <UnitName Value="ClpIDHValidationParameters"/>
       </Item339>
       <Item340>
-        <Filename Value="..\..\Interfaces\ClpIDHKeyParameters.pas"/>
-        <UnitName Value="ClpIDHKeyParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHDomainParameters.pas"/>
+        <UnitName Value="ClpIDHDomainParameters"/>
       </Item340>
       <Item341>
-        <Filename Value="..\..\Interfaces\ClpIDHValidationParameters.pas"/>
-        <UnitName Value="ClpIDHValidationParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIDHValidationParams.pas"/>
+        <UnitName Value="ClpIDHValidationParams"/>
       </Item341>
       <Item342>
-        <Filename Value="..\..\Interfaces\ClpIDHDomainParameters.pas"/>
-        <UnitName Value="ClpIDHDomainParameters"/>
+        <Filename Value="..\..\Crypto\Agreement\ClpDHAgreement.pas"/>
+        <UnitName Value="ClpDHAgreement"/>
       </Item342>
       <Item343>
-        <Filename Value="..\..\Interfaces\ClpIDHValidationParams.pas"/>
-        <UnitName Value="ClpIDHValidationParams"/>
+        <Filename Value="..\..\Crypto\Agreement\ClpDHBasicAgreement.pas"/>
+        <UnitName Value="ClpDHBasicAgreement"/>
       </Item343>
       <Item344>
-        <Filename Value="..\..\Crypto\Agreement\ClpDHAgreement.pas"/>
-        <UnitName Value="ClpDHAgreement"/>
+        <Filename Value="..\..\Crypto\Generators\ClpDHBasicKeyPairGenerator.pas"/>
+        <UnitName Value="ClpDHBasicKeyPairGenerator"/>
       </Item344>
       <Item345>
-        <Filename Value="..\..\Crypto\Agreement\ClpDHBasicAgreement.pas"/>
-        <UnitName Value="ClpDHBasicAgreement"/>
+        <Filename Value="..\..\Crypto\Generators\ClpDHKeyPairGenerator.pas"/>
+        <UnitName Value="ClpDHKeyPairGenerator"/>
       </Item345>
       <Item346>
-        <Filename Value="..\..\Crypto\Generators\ClpDHBasicKeyPairGenerator.pas"/>
-        <UnitName Value="ClpDHBasicKeyPairGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpDHParametersGenerator.pas"/>
+        <UnitName Value="ClpDHParametersGenerator"/>
       </Item346>
       <Item347>
-        <Filename Value="..\..\Crypto\Generators\ClpDHKeyPairGenerator.pas"/>
-        <UnitName Value="ClpDHKeyPairGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpDHKeyGeneratorHelper.pas"/>
+        <UnitName Value="ClpDHKeyGeneratorHelper"/>
       </Item347>
       <Item348>
-        <Filename Value="..\..\Crypto\Generators\ClpDHParametersGenerator.pas"/>
-        <UnitName Value="ClpDHParametersGenerator"/>
+        <Filename Value="..\..\Crypto\Generators\ClpDHParametersHelper.pas"/>
+        <UnitName Value="ClpDHParametersHelper"/>
       </Item348>
       <Item349>
-        <Filename Value="..\..\Crypto\Generators\ClpDHKeyGeneratorHelper.pas"/>
-        <UnitName Value="ClpDHKeyGeneratorHelper"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHPrivateKeyParameters.pas"/>
+        <UnitName Value="ClpDHPrivateKeyParameters"/>
       </Item349>
       <Item350>
-        <Filename Value="..\..\Crypto\Generators\ClpDHParametersHelper.pas"/>
-        <UnitName Value="ClpDHParametersHelper"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHPublicKeyParameters.pas"/>
+        <UnitName Value="ClpDHPublicKeyParameters"/>
       </Item350>
       <Item351>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHPrivateKeyParameters.pas"/>
-        <UnitName Value="ClpDHPrivateKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHKeyGenerationParameters.pas"/>
+        <UnitName Value="ClpDHKeyGenerationParameters"/>
       </Item351>
       <Item352>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHPublicKeyParameters.pas"/>
-        <UnitName Value="ClpDHPublicKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHKeyParameters.pas"/>
+        <UnitName Value="ClpDHKeyParameters"/>
       </Item352>
       <Item353>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHKeyGenerationParameters.pas"/>
-        <UnitName Value="ClpDHKeyGenerationParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHValidationParameters.pas"/>
+        <UnitName Value="ClpDHValidationParameters"/>
       </Item353>
       <Item354>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHKeyParameters.pas"/>
-        <UnitName Value="ClpDHKeyParameters"/>
+        <Filename Value="..\..\Crypto\Parameters\ClpDHParameters.pas"/>
+        <UnitName Value="ClpDHParameters"/>
       </Item354>
       <Item355>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHValidationParameters.pas"/>
-        <UnitName Value="ClpDHValidationParameters"/>
+        <Filename Value="..\..\Asn1\X9\ClpDHDomainParameters.pas"/>
+        <UnitName Value="ClpDHDomainParameters"/>
       </Item355>
       <Item356>
-        <Filename Value="..\..\Crypto\Parameters\ClpDHParameters.pas"/>
-        <UnitName Value="ClpDHParameters"/>
+        <Filename Value="..\..\Asn1\X9\ClpDHValidationParams.pas"/>
+        <UnitName Value="ClpDHValidationParams"/>
       </Item356>
       <Item357>
-        <Filename Value="..\..\Asn1\X9\ClpDHDomainParameters.pas"/>
-        <UnitName Value="ClpDHDomainParameters"/>
+        <Filename Value="..\..\Utils\Randoms\ClpAESPRNGRandom.pas"/>
+        <UnitName Value="ClpAESPRNGRandom"/>
       </Item357>
       <Item358>
-        <Filename Value="..\..\Asn1\X9\ClpDHValidationParams.pas"/>
-        <UnitName Value="ClpDHValidationParams"/>
+        <Filename Value="..\..\Asn1\CryptLib\ClpCryptLibObjectIdentifiers.pas"/>
+        <UnitName Value="ClpCryptLibObjectIdentifiers"/>
       </Item358>
       <Item359>
-        <Filename Value="..\..\Utils\Randoms\ClpAESPRNGRandom.pas"/>
-        <UnitName Value="ClpAESPRNGRandom"/>
+        <Filename Value="..\..\Interfaces\ClpIEndoPreCompInfo.pas"/>
+        <UnitName Value="ClpIEndoPreCompInfo"/>
       </Item359>
       <Item360>
-        <Filename Value="..\..\Asn1\CryptLib\ClpCryptLibObjectIdentifiers.pas"/>
-        <UnitName Value="ClpCryptLibObjectIdentifiers"/>
+        <Filename Value="..\..\Math\EC\Endo\ClpEndoPreCompInfo.pas"/>
+        <UnitName Value="ClpEndoPreCompInfo"/>
       </Item360>
       <Item361>
-        <Filename Value="..\..\Interfaces\ClpIEndoPreCompInfo.pas"/>
-        <UnitName Value="ClpIEndoPreCompInfo"/>
+        <Filename Value="..\..\Math\EC\ClpScaleXNegateYPointMap.pas"/>
+        <UnitName Value="ClpScaleXNegateYPointMap"/>
       </Item361>
       <Item362>
-        <Filename Value="..\..\Math\EC\Endo\ClpEndoPreCompInfo.pas"/>
-        <UnitName Value="ClpEndoPreCompInfo"/>
+        <Filename Value="..\..\Math\EC\ClpScaleYNegateXPointMap.pas"/>
+        <UnitName Value="ClpScaleYNegateXPointMap"/>
       </Item362>
       <Item363>
-        <Filename Value="..\..\Math\EC\ClpScaleXNegateYPointMap.pas"/>
-        <UnitName Value="ClpScaleXNegateYPointMap"/>
+        <Filename Value="..\..\Math\EC\Endo\ClpGlvTypeAEndomorphism.pas"/>
+        <UnitName Value="ClpGlvTypeAEndomorphism"/>
       </Item363>
       <Item364>
-        <Filename Value="..\..\Math\EC\ClpScaleYNegateXPointMap.pas"/>
-        <UnitName Value="ClpScaleYNegateXPointMap"/>
+        <Filename Value="..\..\Math\EC\Endo\ClpGlvTypeAParameters.pas"/>
+        <UnitName Value="ClpGlvTypeAParameters"/>
       </Item364>
       <Item365>
-        <Filename Value="..\..\Math\EC\Endo\ClpGlvTypeAEndomorphism.pas"/>
-        <UnitName Value="ClpGlvTypeAEndomorphism"/>
+        <Filename Value="..\..\Math\EC\Endo\ClpScalarSplitParameters.pas"/>
+        <UnitName Value="ClpScalarSplitParameters"/>
       </Item365>
       <Item366>
-        <Filename Value="..\..\Math\EC\Endo\ClpGlvTypeAParameters.pas"/>
-        <UnitName Value="ClpGlvTypeAParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIGlvTypeAParameters.pas"/>
+        <UnitName Value="ClpIGlvTypeAParameters"/>
       </Item366>
       <Item367>
-        <Filename Value="..\..\Math\EC\Endo\ClpScalarSplitParameters.pas"/>
-        <UnitName Value="ClpScalarSplitParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIGlvTypeAEndomorphism.pas"/>
+        <UnitName Value="ClpIGlvTypeAEndomorphism"/>
       </Item367>
       <Item368>
-        <Filename Value="..\..\Interfaces\ClpIGlvTypeAParameters.pas"/>
-        <UnitName Value="ClpIGlvTypeAParameters"/>
+        <Filename Value="..\..\Interfaces\ClpIScaleXNegateYPointMap.pas"/>
+        <UnitName Value="ClpIScaleXNegateYPointMap"/>
       </Item368>
       <Item369>
-        <Filename Value="..\..\Interfaces\ClpIGlvTypeAEndomorphism.pas"/>
-        <UnitName Value="ClpIGlvTypeAEndomorphism"/>
+        <Filename Value="..\..\Interfaces\ClpIScaleYNegateXPointMap.pas"/>
+        <UnitName Value="ClpIScaleYNegateXPointMap"/>
       </Item369>
       <Item370>
-        <Filename Value="..\..\Interfaces\ClpIScaleXNegateYPointMap.pas"/>
-        <UnitName Value="ClpIScaleXNegateYPointMap"/>
+        <Filename Value="..\..\Interfaces\ClpIScalarSplitParameters.pas"/>
+        <UnitName Value="ClpIScalarSplitParameters"/>
       </Item370>
       <Item371>
-        <Filename Value="..\..\Interfaces\ClpIScaleYNegateXPointMap.pas"/>
-        <UnitName Value="ClpIScaleYNegateXPointMap"/>
+        <Filename Value="..\..\Math\EC\ClpECCompUtilities.pas"/>
+        <UnitName Value="ClpECCompUtilities"/>
       </Item371>
       <Item372>
-        <Filename Value="..\..\Interfaces\ClpIScalarSplitParameters.pas"/>
-        <UnitName Value="ClpIScalarSplitParameters"/>
+        <Filename Value="..\..\Math\EC\Multiplier\ClpValidityPreCompInfo.pas"/>
+        <UnitName Value="ClpValidityPreCompInfo"/>
       </Item372>
       <Item373>
-        <Filename Value="..\..\Math\EC\ClpECCompUtilities.pas"/>
-        <UnitName Value="ClpECCompUtilities"/>
+        <Filename Value="..\..\Interfaces\ClpIValidityPreCompInfo.pas"/>
+        <UnitName Value="ClpIValidityPreCompInfo"/>
       </Item373>
     </Files>
     <RequiredPkgs Count="3">

+ 8 - 7
CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.pas

@@ -74,12 +74,12 @@ uses
   ClpIECDHCBasicAgreement, ClpHMacDsaKCalculator, ClpIHMacDsaKCalculator, 
   ClpHkdfBytesGenerator, ClpIHkdfBytesGenerator, ClpHkdfParameters, 
   ClpIHkdfParameters, ClpDsaParameterGenerationParameters, 
-  ClpIDsaParameterGenerationParameters, ClpIValidityPrecompInfo, 
-  ClpDsaParametersGenerator, ClpDsaParameter, ClpIDsaParameter, 
-  ClpIKeyEncoder, ClpIDsaParametersGenerator, ClpIPreCompCallBack, 
-  ClpNistNamedCurves, ClpNat256, ClpNat320, ClpAesLightEngine, 
-  ClpIAesLightEngine, ClpCustomNamedCurves, ClpNat384, ClpNat192, ClpNat512, 
-  ClpInterleave, ClpBsiObjectIdentifiers, ClpEacObjectIdentifiers, ClpIDsaExt, 
+  ClpIDsaParameterGenerationParameters, ClpDsaParametersGenerator, 
+  ClpDsaParameter, ClpIDsaParameter, ClpIKeyEncoder, 
+  ClpIDsaParametersGenerator, ClpIPreCompCallBack, ClpNistNamedCurves, 
+  ClpNat256, ClpNat320, ClpAesLightEngine, ClpIAesLightEngine, 
+  ClpCustomNamedCurves, ClpNat384, ClpNat192, ClpNat512, ClpInterleave, 
+  ClpBsiObjectIdentifiers, ClpEacObjectIdentifiers, ClpIDsaExt, 
   ClpISchnorrDigestSigner, ClpIECSchnorrSipaSigner, ClpECSchnorrSipaSigner, 
   ClpSchnorrDigestSigner, ClpISchnorr, ClpISchnorrExt, ClpBlowfishEngine, 
   ClpIBlowfishEngine, ClpECC, ClpAsn1Objects, ClpSignersEncodings, 
@@ -133,7 +133,8 @@ uses
   ClpScaleYNegateXPointMap, ClpGlvTypeAEndomorphism, ClpGlvTypeAParameters, 
   ClpScalarSplitParameters, ClpIGlvTypeAParameters, ClpIGlvTypeAEndomorphism, 
   ClpIScaleXNegateYPointMap, ClpIScaleYNegateXPointMap, 
-  ClpIScalarSplitParameters, ClpECCompUtilities;
+  ClpIScalarSplitParameters, ClpECCompUtilities, ClpValidityPreCompInfo, 
+  ClpIValidityPreCompInfo;
 
 implementation