Re: [edk2] [edk2-test][Patch 3/3] uefi-sct/SctPkg:Add VerifySignature() Conf Test
Hello Supreeth, Thank you for the comments. V2 will be sent out. All clean up will be merged into the patch 1/3 with INF version update. Best Regards Eric -Original Message- From: Supreeth Venkatesh Sent: Saturday, December 1, 2018 6:28 AM To: Jin, Eric ; edk2-devel@lists.01.org Subject: Re: [edk2-test][Patch 3/3] uefi-sct/SctPkg:Add VerifySignature() Conf Test Commit message to mention what this patch is imlementing. In addition, there is cleanup to remove #if 0 block below. Both of this should be in commit message. On Thu, 2018-11-29 at 16:46 +0800, Eric Jin wrote: > Cc: Supreeth Venkatesh > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c | 5 +- > .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h | 16 ++ > .../BlackBoxTest/Pkcs7BBTestConformance.c | 303 > - > .../PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.c | 2 - > 4 files changed, 319 insertions(+), 7 deletions(-) > > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > index 4d433c3..8f6546a 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > @@ -36,7 +36,10 @@ EFI_GUID gPkcs7BBTestConformanceAssertionGuid007 = > EFI_TEST_PKCS7BBTESTCONFORMAN EFI_GUID > gPkcs7BBTestConformanceAssertionGuid008 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_008_GUID; > EFI_GUID gPkcs7BBTestConformanceAssertionGuid009 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_009_GUID; > EFI_GUID gPkcs7BBTestConformanceAssertionGuid010 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_010_GUID; > - > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid011 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid012 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid013 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid014 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID; > > EFI_GUID gPkcs7BBTestFunctionAssertionGuid001 = > EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID; > EFI_GUID gPkcs7BBTestFunctionAssertionGuid002 = > EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_002_GUID; > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > index 32a00f6..f8d1b8f 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > @@ -65,6 +65,22 @@ extern EFI_GUID > gPkcs7BBTestConformanceAssertionGuid009; > { 0xb136e016, 0x4f80, 0x44bd, {0xba, 0xb0, 0x1c, 0x34, 0x8a, 0x2d, > 0xa1, 0x8a }} extern EFI_GUID > gPkcs7BBTestConformanceAssertionGuid010; > > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID \ { > +0xa58f3626, 0xf16e, 0x4cd5, { 0xba, 0x12, 0x7a, 0x9d, 0xd6, 0x9a, > 0x7a, 0x71 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid011; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID \ { > +0xbe4a0bf2, 0x2d46, 0x4d96, { 0xa6, 0x11, 0x21, 0x99, 0xa5, 0x5f, > 0xa4, 0xee }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid012; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID \ { > +0xc0536a27, 0x304e, 0x497a, { 0xa5, 0xe3, 0x94, 0x11, 0x38, 0x53, > 0x6e, 0x40 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid013; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID \ { > +0x8c5aa0e8, 0x17ff, 0x49cd, { 0x8f, 0xec, 0x37, 0xc3, 0xfd, 0x5f, > 0x77, 0x0 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid014; > + > > #define EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID \ { > 0x5c0eec50, 0xa6ea, 0x413c, {0x8a, 0x46, 0x4a, 0xd1, 0x4a, 0x77, 0x76, > 0xf1 }} diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > index b7bc19b..ce7d5bb 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > @@ -278,10 +278,6 @@ BBTestVerifyBufferConformanceTest ( > Status > ); > > - > - > - > - >// Signed data embedded in SignedData but InData is not NULL >AllowedDb[0] = DbEntry1; >RevokedDb[0] = NULL; > @@ -507,4 +503,303 @@ BBTestVerifyBufferConformanceTest ( >return EFI_SUCCESS; > } > > +EFI_STATUS > +BBTestVerifySignatureConformanceTest ( > + IN
Re: [edk2] [edk2-test][Patch 3/3] uefi-sct/SctPkg:Add VerifySignature() Conf Test
Commit message to mention what this patch is imlementing. In addition, there is cleanup to remove #if 0 block below. Both of this should be in commit message. On Thu, 2018-11-29 at 16:46 +0800, Eric Jin wrote: > Cc: Supreeth Venkatesh > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Eric Jin > --- > .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c | 5 +- > .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h | 16 ++ > .../BlackBoxTest/Pkcs7BBTestConformance.c | 303 > - > .../PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.c | 2 - > 4 files changed, 319 insertions(+), 7 deletions(-) > > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > index 4d433c3..8f6546a 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c > @@ -36,7 +36,10 @@ EFI_GUID gPkcs7BBTestConformanceAssertionGuid007 = > EFI_TEST_PKCS7BBTESTCONFORMAN > EFI_GUID gPkcs7BBTestConformanceAssertionGuid008 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_008_GUID; > EFI_GUID gPkcs7BBTestConformanceAssertionGuid009 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_009_GUID; > EFI_GUID gPkcs7BBTestConformanceAssertionGuid010 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_010_GUID; > - > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid011 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid012 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid013 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID; > +EFI_GUID gPkcs7BBTestConformanceAssertionGuid014 = > EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID; > > EFI_GUID gPkcs7BBTestFunctionAssertionGuid001 = > EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID; > EFI_GUID gPkcs7BBTestFunctionAssertionGuid002 = > EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_002_GUID; > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > index 32a00f6..f8d1b8f 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h > @@ -65,6 +65,22 @@ extern EFI_GUID > gPkcs7BBTestConformanceAssertionGuid009; > { 0xb136e016, 0x4f80, 0x44bd, {0xba, 0xb0, 0x1c, 0x34, 0x8a, 0x2d, > 0xa1, 0x8a }} > extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid010; > > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID \ > +{ 0xa58f3626, 0xf16e, 0x4cd5, { 0xba, 0x12, 0x7a, 0x9d, 0xd6, 0x9a, > 0x7a, 0x71 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid011; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID \ > +{ 0xbe4a0bf2, 0x2d46, 0x4d96, { 0xa6, 0x11, 0x21, 0x99, 0xa5, 0x5f, > 0xa4, 0xee }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid012; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID \ > +{ 0xc0536a27, 0x304e, 0x497a, { 0xa5, 0xe3, 0x94, 0x11, 0x38, 0x53, > 0x6e, 0x40 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid013; > + > +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID \ > +{ 0x8c5aa0e8, 0x17ff, 0x49cd, { 0x8f, 0xec, 0x37, 0xc3, 0xfd, 0x5f, > 0x77, 0x0 }} > +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid014; > + > > #define EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID \ > { 0x5c0eec50, 0xa6ea, 0x413c, {0x8a, 0x46, 0x4a, 0xd1, 0x4a, 0x77, > 0x76, 0xf1 }} > diff --git a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > index b7bc19b..ce7d5bb 100644 > --- a/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > +++ b/uefi- > sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7B > BTestConformance.c > @@ -278,10 +278,6 @@ BBTestVerifyBufferConformanceTest ( > Status > ); > > - > - > - > - >// Signed data embedded in SignedData but InData is not NULL >AllowedDb[0] = DbEntry1; >RevokedDb[0] = NULL; > @@ -507,4 +503,303 @@ BBTestVerifyBufferConformanceTest ( >return EFI_SUCCESS; > } > > +EFI_STATUS > +BBTestVerifySignatureConformanceTest ( > + IN EFI_BB_TEST_PROTOCOL*This, > + IN VOID*ClientInterface, > + IN EFI_TEST_LEVEL TestLevel, > + IN EFI_HANDLE SupportHandle > + ) > +{ > + EFI_STANDARD_TEST_LIBRARY_PROTOCOL*StandardLib; > + EFI_STATUSStatus; > + EFI_PKCS7_VERIFY_PROTOCOL *Pkcs7Verify; > + EFI_TEST_ASSERTION
[edk2] [edk2-test][Patch 3/3] uefi-sct/SctPkg:Add VerifySignature() Conf Test
Cc: Supreeth Venkatesh Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Eric Jin --- .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c | 5 +- .../EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h | 16 ++ .../BlackBoxTest/Pkcs7BBTestConformance.c | 303 - .../PKCS7Verify/BlackBoxTest/Pkcs7BBTestMain.c | 2 - 4 files changed, 319 insertions(+), 7 deletions(-) diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c index 4d433c3..8f6546a 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.c @@ -36,7 +36,10 @@ EFI_GUID gPkcs7BBTestConformanceAssertionGuid007 = EFI_TEST_PKCS7BBTESTCONFORMAN EFI_GUID gPkcs7BBTestConformanceAssertionGuid008 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_008_GUID; EFI_GUID gPkcs7BBTestConformanceAssertionGuid009 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_009_GUID; EFI_GUID gPkcs7BBTestConformanceAssertionGuid010 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_010_GUID; - +EFI_GUID gPkcs7BBTestConformanceAssertionGuid011 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID; +EFI_GUID gPkcs7BBTestConformanceAssertionGuid012 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID; +EFI_GUID gPkcs7BBTestConformanceAssertionGuid013 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID; +EFI_GUID gPkcs7BBTestConformanceAssertionGuid014 = EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID; EFI_GUID gPkcs7BBTestFunctionAssertionGuid001 = EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID; EFI_GUID gPkcs7BBTestFunctionAssertionGuid002 = EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_002_GUID; diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h index 32a00f6..f8d1b8f 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Guid.h @@ -65,6 +65,22 @@ extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid009; { 0xb136e016, 0x4f80, 0x44bd, {0xba, 0xb0, 0x1c, 0x34, 0x8a, 0x2d, 0xa1, 0x8a }} extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid010; +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_011_GUID \ +{ 0xa58f3626, 0xf16e, 0x4cd5, { 0xba, 0x12, 0x7a, 0x9d, 0xd6, 0x9a, 0x7a, 0x71 }} +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid011; + +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_012_GUID \ +{ 0xbe4a0bf2, 0x2d46, 0x4d96, { 0xa6, 0x11, 0x21, 0x99, 0xa5, 0x5f, 0xa4, 0xee }} +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid012; + +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_013_GUID \ +{ 0xc0536a27, 0x304e, 0x497a, { 0xa5, 0xe3, 0x94, 0x11, 0x38, 0x53, 0x6e, 0x40 }} +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid013; + +#define EFI_TEST_PKCS7BBTESTCONFORMANCE_ASSERTION_014_GUID \ +{ 0x8c5aa0e8, 0x17ff, 0x49cd, { 0x8f, 0xec, 0x37, 0xc3, 0xfd, 0x5f, 0x77, 0x0 }} +extern EFI_GUID gPkcs7BBTestConformanceAssertionGuid014; + #define EFI_TEST_PKCS7BBTESTFUNCTION_ASSERTION_001_GUID \ { 0x5c0eec50, 0xa6ea, 0x413c, {0x8a, 0x46, 0x4a, 0xd1, 0x4a, 0x77, 0x76, 0xf1 }} diff --git a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c index b7bc19b..ce7d5bb 100644 --- a/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c +++ b/uefi-sct/SctPkg/TestCase/UEFI/EFI/Protocol/PKCS7Verify/BlackBoxTest/Pkcs7BBTestConformance.c @@ -278,10 +278,6 @@ BBTestVerifyBufferConformanceTest ( Status ); - - - - // Signed data embedded in SignedData but InData is not NULL AllowedDb[0] = DbEntry1; RevokedDb[0] = NULL; @@ -507,4 +503,303 @@ BBTestVerifyBufferConformanceTest ( return EFI_SUCCESS; } +EFI_STATUS +BBTestVerifySignatureConformanceTest ( + IN EFI_BB_TEST_PROTOCOL*This, + IN VOID*ClientInterface, + IN EFI_TEST_LEVEL TestLevel, + IN EFI_HANDLE SupportHandle + ) +{ + EFI_STANDARD_TEST_LIBRARY_PROTOCOL*StandardLib; + EFI_STATUSStatus; + EFI_PKCS7_VERIFY_PROTOCOL *Pkcs7Verify; + EFI_TEST_ASSERTIONAssertionType; + Pkcs7Verify = (EFI_PKCS7_VERIFY_PROTOCOL*)ClientInterface; + if (Pkcs7Verify == NULL) +return EFI_UNSUPPORTED; + + // + // Get the Standard Library Interface + // + Status = gtBS->HandleProtocol ( + SupportHandle, + , + (VOID **) + ); + if (EFI_ERROR(Status)) { +return Status; + } + + AllowedDb[0] = DbEntry1; + + // + // Checkpoint 1 -