Sfoglia il codice sorgente

enable some cert tests

Ugochukwu Mmaduekwe 4 giorni fa
parent
commit
2b7cba3088

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

@@ -482,6 +482,15 @@ uses
   ClpNat512 in '..\..\CryptoLib\src\Math\Raw\ClpNat512.pas',
   ClpNat576 in '..\..\CryptoLib\src\Math\Raw\ClpNat576.pas',
   ClpNullable in '..\..\CryptoLib\src\Misc\ClpNullable.pas',
+  ClpECPoint in '..\..\CryptoLib\src\Math\EC\ClpECPoint.pas',
+  ClpECFieldElement in '..\..\CryptoLib\src\Math\EC\ClpECFieldElement.pas',
+  ClpECLookupTables in '..\..\CryptoLib\src\Math\EC\ClpECLookupTables.pas',
+  ClpECCore in '..\..\CryptoLib\src\Math\EC\ClpECCore.pas',
+  ClpEndoUtilities in '..\..\CryptoLib\src\Math\EC\Endo\ClpEndoUtilities.pas',
+  ClpWNafUtilities in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpWNafUtilities.pas',
+  ClpCustomNamedCurves in '..\..\CryptoLib\src\Crypto\EC\ClpCustomNamedCurves.pas',
+  ClpECUtilities in '..\..\CryptoLib\src\Crypto\EC\ClpECUtilities.pas',
+  ClpX962NamedCurves in '..\..\CryptoLib\src\Asn1\X9\ClpX962NamedCurves.pas',
   ClpFixedSecureRandom in '..\src\Utils\ClpFixedSecureRandom.pas',
   ClpShortenedDigest in '..\src\Utils\ClpShortenedDigest.pas',
   BlowfishTestVectors in '..\src\Crypto\BlowfishTestVectors.pas',
@@ -579,16 +588,7 @@ uses
   DeltaCertificateTests in '..\src\Asn1\X509\DeltaCertificateTests.pas',
   X509CertGenTests in '..\src\X509\X509CertGenTests.pas',
   CertTests in '..\src\Others\CertTests.pas',
-  CryptoLibTestBase in '..\src\CryptoLibTestBase.pas',
-  ClpECPoint in '..\..\CryptoLib\src\Math\EC\ClpECPoint.pas',
-  ClpECFieldElement in '..\..\CryptoLib\src\Math\EC\ClpECFieldElement.pas',
-  ClpECLookupTables in '..\..\CryptoLib\src\Math\EC\ClpECLookupTables.pas',
-  ClpECCore in '..\..\CryptoLib\src\Math\EC\ClpECCore.pas',
-  ClpEndoUtilities in '..\..\CryptoLib\src\Math\EC\Endo\ClpEndoUtilities.pas',
-  ClpWNafUtilities in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpWNafUtilities.pas',
-  ClpCustomNamedCurves in '..\..\CryptoLib\src\Crypto\EC\ClpCustomNamedCurves.pas',
-  ClpECUtilities in '..\..\CryptoLib\src\Crypto\EC\ClpECUtilities.pas',
-  ClpX962NamedCurves in '..\..\CryptoLib\src\Asn1\X9\ClpX962NamedCurves.pas';
+  CryptoLibTestBase in '..\src\CryptoLibTestBase.pas';
 
 begin
 

+ 1 - 1
CryptoLib.Tests/src/Others/CertTests.pas

@@ -125,7 +125,6 @@ type
 
   protected
     procedure SetUp; override;
-    procedure TestCreation3; // Enable when we implement prime239v1 curve in TECNamedCurveTable
 
   published
     procedure TestCert1;
@@ -143,6 +142,7 @@ type
     procedure TestEmptyDNCert;
     procedure TestCreation1;
     procedure TestCreation2;
+    procedure TestCreation3;
     procedure TestCreation5;
     procedure TestCrlCreation1;
     procedure TestCrlCreation2;

+ 5 - 3
CryptoLib.Tests/src/X509/X509CertGenTests.pas

@@ -48,11 +48,13 @@ uses
   ClpDsaParameters,
   ClpIDsaParameters,
   ClpIECParameters,
+  ClpECParameters,
   ClpIX9ECAsn1Objects,
   ClpRsaDigestSigner,
   ClpIRsaDigestSigner,
   ClpDigestUtilities,
   ClpIAsn1Objects,
+  ClpECNamedCurveTable,
   ClpCryptoLibTypes,
   ClpAsn1Comparers,
   CryptoLibTestBase;
@@ -76,11 +78,11 @@ type
 
   protected
     procedure SetUp; override;
-    procedure TestCreationECDSA; // Enable when we implement prime239v1 curve in TECNamedCurveTable
   published
     procedure TestRsaDigestSigner;
     procedure TestCreationRSA;
     procedure TestCreationDSA;
+    procedure TestCreationECDSA;
     procedure TestCertLoading;
 
   end;
@@ -137,7 +139,7 @@ begin
   FDsaPriv := TDsaPrivateKeyParameters.Create(LDsaPrivateX, FDsaPara);
   FDsaPub := TDsaPublicKeyParameters.Create(LDSAPublicY, FDsaPara);
 
- (* // EC parameters (prime239v1)
+  // EC parameters (prime239v1)
   LX9 := TECNamedCurveTable.GetByName('prime239v1');
   LECParraGX := TBigInteger.Create(1, DecodeBase64('D/qWPNyogWzMM7hkK+35BcPTWFc9Pyf7vTs8uaqv'));
   LECParraGY := TBigInteger.Create(1, DecodeBase64('AhQXGxb1olGRv6s1LPRfuatMF+cx3ZTGgzSE/Q5R'));
@@ -151,7 +153,7 @@ begin
     LX9.Curve.ValidatePoint(LECParraGX, LECParraGY), LECParraN, LECParraH);
   FEcPub := TECPublicKeyParameters.Create('ECDSA',
     LX9.Curve.ValidatePoint(LECPubQX, LECPubQY), FEcDomain);
-  FEcPriv := TECPrivateKeyParameters.Create('ECDSA', LECPrivD, FEcDomain); *)
+  FEcPriv := TECPrivateKeyParameters.Create('ECDSA', LECPrivD, FEcDomain);
 end;
 
 function TX509CertGenTest.CreateX509Name: IX509Name;