瀏覽代碼

update lpk and lpr

Ugochukwu Mmaduekwe 20 小時之前
父節點
當前提交
0deb94662d

+ 3 - 7
CryptoLib.Tests/FreePascal.Tests/CryptoLib.Tests.lpi

@@ -23,7 +23,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="..\src\Asn1;..\src\Math;..\src\Math\EC\Custom\Sec;..\src\Others;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net;..\src\Asn1\backup"/>
+            <OtherUnitFiles Value="..\src\Asn1;..\src\Math;..\src\Math\EC\Custom\Sec;..\src\Others;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -79,7 +79,7 @@
         <PackageName Value="FCL"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="101">
+    <Units Count="100">
       <Unit0>
         <Filename Value="CryptoLib.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -481,10 +481,6 @@
         <Filename Value="..\src\Utils\Net\IPAddressUtilitiesTests.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit99>
-      <Unit100>
-        <Filename Value="..\src\Asn1\backup\DerUtf8StringTests.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit100>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -495,7 +491,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\src\Asn1;..\src\Math;..\src\Math\EC\Custom\Sec;..\src\Others;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net;..\src\Asn1\backup"/>
+      <OtherUnitFiles Value="..\src\Asn1;..\src\Math;..\src\Math\EC\Custom\Sec;..\src\Others;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <CodeGeneration>

+ 25 - 24
CryptoLib.Tests/FreePascal.Tests/CryptoLib.lpr

@@ -3,30 +3,31 @@ program CryptoLib.Tests;
 {$mode objfpc}{$H+}
 
 uses
-  Interfaces, Forms, GuiTestRunner, Asn1SequenceParserTests,
-  EqualsAndHashCodeTests, OIDTests, EnumeratedTests, ParsingTests, ParseTests,
-  StringTests, TagTests, BigIntegerTests, ECAlgorithmsTests, ECPointTests,
-  SecP256R1FieldTests, SecP384R1FieldTests, ECDsa5Tests, ECTests,
-  NamedCurveTests, SignerUtilitiesTests, SecureRandomTests,
-  DigestRandomNumberTests, FixedPointTests, AESTests, BlockCipherVectorTests,
-  BlockCipherMonteCarloTests, AESTestVectors, BlowfishTestVectors,
-  SpeckTestVectors, RijndaelTestVectors, AESSICTests, SPECKTests,
-  IESCipherTests, MD5HMacTests, SHA1HMacTests, SHA224HMacTests, SHA256HMacTests,
-  SHA384HMacTests, SHA512HMacTests, RIPEMD128HMacTests, RIPEMD160HMacTests,
-  HMacTests, Pkcs5Tests, HkdfGeneratorTests, ECIESTests, PascalCoinECIESTests,
-  ECNRTests, PrimesTests, PaddingTests, DSATests, DeterministicDsaTests,
-  Salsa20Tests, XSalsa20Tests, ChaChaTests, StreamCipherResetTests, CTSTests,
-  X25519Tests, Ed25519Tests, X25519HigherLevelTests, Ed25519HigherLevelTests,
-  ShortenedDigestTests, Kdf1GeneratorTests, Kdf2GeneratorTests, Argon2Tests,
-  ScryptTests, DigestTests, CertTests, DigestUtilitiesTests, DHTests,
-  Asn1IntegerTests, BitStringTests, DerUtf8StringTests, GeneralizedTimeTests,
-  OctetStringTests, RelativeOidTests, UtcTimeTests, InputStreamTests, SetTests,
-  X9Tests, PrivateKeyInfoTests, Pkcs10CertRequestTests, DeltaCertificateTests,
-  CertificateTests, X509AltTests, X509ExtensionsTests, X509NameTests,
-  SubjectKeyIdentifierTests, KeyUsageTests, GeneralNameTests, KMacTests,
-  RSATests, PssTests, ISO9796Tests, RSABlindedTests, RSADigestSignerTests,
-  X931SignerTests, CryptoLibTestBase, X509CertGenTests, ClpFixedSecureRandom,
-  ClpShortenedDigest, IPAddressUtilitiesTests, PemReaderTests;
+  Interfaces, Forms, GuiTestRunner,
+  Asn1SequenceParserTests, EqualsAndHashCodeTests, OIDTests, EnumeratedTests,
+  ParsingTests, ParseTests, StringTests, TagTests, BigIntegerTests,
+  ECAlgorithmsTests, ECPointTests, SecP256R1FieldTests, SecP384R1FieldTests,
+  ECDsa5Tests, ECTests, NamedCurveTests, SignerUtilitiesTests,
+  SecureRandomTests, DigestRandomNumberTests, FixedPointTests, AESTests,
+  BlockCipherVectorTests, BlockCipherMonteCarloTests, AESTestVectors,
+  BlowfishTestVectors, SpeckTestVectors, RijndaelTestVectors, AESSICTests,
+  SPECKTests, IESCipherTests, MD5HMacTests, SHA1HMacTests, SHA224HMacTests,
+  SHA256HMacTests, SHA384HMacTests, SHA512HMacTests, RIPEMD128HMacTests,
+  RIPEMD160HMacTests, HMacTests, Pkcs5Tests, HkdfGeneratorTests, ECIESTests,
+  PascalCoinECIESTests, ECNRTests, PrimesTests, PaddingTests, DSATests,
+  DeterministicDsaTests, Salsa20Tests, XSalsa20Tests, ChaChaTests,
+  StreamCipherResetTests, CTSTests, X25519Tests, Ed25519Tests,
+  X25519HigherLevelTests, Ed25519HigherLevelTests, ShortenedDigestTests,
+  Kdf1GeneratorTests, Kdf2GeneratorTests, Argon2Tests, ScryptTests, DigestTests,
+  CertTests, DigestUtilitiesTests, DHTests, Asn1IntegerTests, BitStringTests,
+  GeneralizedTimeTests, OctetStringTests, RelativeOidTests,
+  UtcTimeTests, InputStreamTests, SetTests, X9Tests, PrivateKeyInfoTests,
+  Pkcs10CertRequestTests, DeltaCertificateTests, CertificateTests, X509AltTests,
+  X509ExtensionsTests, X509NameTests, SubjectKeyIdentifierTests, KeyUsageTests,
+  GeneralNameTests, KMacTests, RSATests, PssTests, ISO9796Tests,
+  RSABlindedTests, RSADigestSignerTests, X931SignerTests, CryptoLibTestBase,
+  X509CertGenTests, ClpFixedSecureRandom, ClpShortenedDigest,
+  IPAddressUtilitiesTests, PemReaderTests;
 
 {$R *.res}
 

+ 2 - 6
CryptoLib.Tests/FreePascal.Tests/CryptoLibConsole.lpi

@@ -39,7 +39,7 @@
         <PackageName Value="FCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="101">
+    <Units Count="100">
       <Unit0>
         <Filename Value="CryptoLibConsole.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -440,10 +440,6 @@
         <Filename Value="..\src\Utils\Net\IPAddressUtilitiesTests.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit99>
-      <Unit100>
-        <Filename Value="..\src\Asn1\backup\DerUtf8StringTests.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit100>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -454,7 +450,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
-      <OtherUnitFiles Value="..\src\Others;..\src\Asn1;..\src\Math\EC\Custom\Sec;..\src\Math;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net;..\src\Asn1\backup"/>
+      <OtherUnitFiles Value="..\src\Others;..\src\Asn1;..\src\Math\EC\Custom\Sec;..\src\Math;..\src\Security;..\src\Utils;..\src\Crypto;..\src\Math\EC;..\src\Math\EC\Rfc7748;..\src\Math\EC\Rfc8032;..\src;..\src\Asn1\X509;..\src\X509;..\src\Asn1\Pkcs;..\src\Utils\Pem;..\src\Utils\Net"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
   </CompilerOptions>

+ 1 - 1
CryptoLib.Tests/FreePascal.Tests/CryptoLibConsole.lpr

@@ -19,7 +19,7 @@ uses
   X25519HigherLevelTests, Ed25519HigherLevelTests, ShortenedDigestTests,
   Kdf1GeneratorTests, Kdf2GeneratorTests, Argon2Tests, ScryptTests, DigestTests,
   CertTests, DigestUtilitiesTests, DHTests, Asn1IntegerTests,
-  DerUtf8StringTests, GeneralizedTimeTests, BitStringTests, InputStreamTests,
+  GeneralizedTimeTests, BitStringTests, InputStreamTests,
   UtcTimeTests, RelativeOidTests, OctetStringTests, SetTests, X9Tests,
   PrivateKeyInfoTests, Pkcs10CertRequestTests, DeltaCertificateTests,
   CertificateTests, X509AltTests, X509ExtensionsTests, X509NameTests,

+ 21 - 1
CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.lpk

@@ -25,7 +25,7 @@
  Acknowledgements: 
 Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring the development of this library "/>
     <Version Major="3" Minor="3"/>
-    <Files Count="469">
+    <Files Count="474">
       <Item1>
         <Filename Value="..\..\Asn1\ClpOidTokenizer.pas"/>
         <UnitName Value="ClpOidTokenizer"/>
@@ -1903,6 +1903,26 @@ Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring the devel
         <Filename Value="..\..\Rngs\Providers\ClpBaseRandomProvider.pas"/>
         <UnitName Value="ClpBaseRandomProvider"/>
       </Item469>
+      <Item470>
+        <Filename Value="..\..\Asn1\Cms\ClpCmsAsn1Objects.pas"/>
+        <UnitName Value="ClpCmsAsn1Objects"/>
+      </Item470>
+      <Item471>
+        <Filename Value="..\..\Asn1\Cms\ClpCmsObjectIdentifiers.pas"/>
+        <UnitName Value="ClpCmsObjectIdentifiers"/>
+      </Item471>
+      <Item472>
+        <Filename Value="..\..\Asn1\Cms\ClpCmsParsers.pas"/>
+        <UnitName Value="ClpCmsParsers"/>
+      </Item472>
+      <Item473>
+        <Filename Value="..\..\Interfaces\Asn1\Cms\ClpICmsAsn1Objects.pas"/>
+        <UnitName Value="ClpICmsAsn1Objects"/>
+      </Item473>
+      <Item474>
+        <Filename Value="..\..\Interfaces\Asn1\Cms\ClpICmsParsers.pas"/>
+        <UnitName Value="ClpICmsParsers"/>
+      </Item474>
     </Files>
     <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="3">

+ 3 - 1
CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.pas

@@ -154,7 +154,9 @@ uses
   ClpX509AttrCertParser, ClpAttributeCertificateIssuer, 
   ClpAttributeCertificateHolder, ClpX509Utilities, ClpX509Generators, 
   ClpDeltaCertificateTool, ClpX509Attribute, ClpX509ExtensionBase, 
-  ClpX509ExtensionUtilities, ClpDevRandomReader, ClpBaseRandomProvider;
+  ClpX509ExtensionUtilities, ClpDevRandomReader, ClpBaseRandomProvider, 
+  ClpCmsAsn1Objects, ClpCmsObjectIdentifiers, ClpCmsParsers, 
+  ClpICmsAsn1Objects, ClpICmsParsers;
 
 implementation