]> git.proxmox.com Git - mirror_edk2.git/blobdiff - CryptoPkg/Test/UnitTest/Library/BaseCryptLib/Pkcs7EkuTests.c
CryptoPkg: Apply uncrustify changes
[mirror_edk2.git] / CryptoPkg / Test / UnitTest / Library / BaseCryptLib / Pkcs7EkuTests.c
index b5ae4f6a89e07a76b6447b00c76c906fc5528607..7e3dcdc4e6a1b6646c160a7a5ba01b8c60bca088 100644 (file)
 EFI_STATUS\r
 EFIAPI\r
 VerifyEKUsInPkcs7Signature (\r
-  IN CONST UINT8  *Pkcs7Signature,\r
+  IN CONST UINT8   *Pkcs7Signature,\r
   IN CONST UINT32  SignatureSize,\r
-  IN CONST CHAR8  *RequiredEKUs[],\r
+  IN CONST CHAR8   *RequiredEKUs[],\r
   IN CONST UINT32  RequiredEKUsSize,\r
   IN BOOLEAN       RequireAllPresent\r
   );\r
 \r
-///================================================================================================\r
-///================================================================================================\r
+/// ================================================================================================\r
+/// ================================================================================================\r
 ///\r
 /// TEST CASES\r
 ///\r
-///================================================================================================\r
-///================================================================================================\r
-\r
-CONST CHAR8 FIRMWARE_SIGNER_EKU[] = "1.3.6.1.4.1.311.76.9.21.1";\r
+/// ================================================================================================\r
+/// ================================================================================================\r
 \r
+CONST CHAR8  FIRMWARE_SIGNER_EKU[] = "1.3.6.1.4.1.311.76.9.21.1";\r
 \r
 /**\r
   TestVerifyEKUsInSignature()\r
@@ -85,24 +84,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsInSignature (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
-  CONST CHAR8RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
 \r
-  Status = VerifyEKUsInPkcs7Signature(ProductionECCSignature,\r
-                                      ARRAY_SIZE(ProductionECCSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             ProductionECCSignature,\r
+             ARRAY_SIZE (ProductionECCSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsInSignature()\r
 \r
-\r
 /**\r
   TestVerifyEKUsWith3CertsInSignature()\r
 \r
@@ -120,18 +120,20 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith3CertsInSignature (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
-  CONST CHAR8RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
 \r
-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith3CertsInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith3CertsInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith3CertsInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith3CertsInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
@@ -153,24 +155,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith2CertsInSignature (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
-  CONST CHAR8RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
 \r
-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith2CertsInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith2CertsInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith2CertsInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith2CertsInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith2CertsInSignature()\r
 \r
-\r
 /**\r
   TestVerifyEKUsWith1CertInSignature()\r
 \r
@@ -187,24 +190,25 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWith1CertInSignature (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
-  CONST CHAR8RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
+  CONST CHAR8  *RequiredEKUs[] = { FIRMWARE_SIGNER_EKU };\r
 \r
-  Status = VerifyEKUsInPkcs7Signature(TestSignEKUsWith1CertInSignature,\r
-                                      ARRAY_SIZE(TestSignEKUsWith1CertInSignature),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignEKUsWith1CertInSignature,\r
+             ARRAY_SIZE (TestSignEKUsWith1CertInSignature),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWith1CertInSignature()\r
 \r
-\r
 /**\r
   TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r
@@ -224,25 +228,28 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestVerifyEKUsWithMultipleEKUsInCert (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
-\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1",\r
-                                  "1.3.6.1.4.1.311.76.9.21.1.2" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithMultipleEKUsInCert,\r
-                                      ARRAY_SIZE(TestSignedWithMultipleEKUsInCert),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
+\r
+  CONST CHAR8  *RequiredEKUs[] = {\r
+    "1.3.6.1.4.1.311.76.9.21.1",\r
+    "1.3.6.1.4.1.311.76.9.21.1.2"\r
+  };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithMultipleEKUsInCert,\r
+             ARRAY_SIZE (TestSignedWithMultipleEKUsInCert),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestVerifyEKUsWithMultipleEKUsInCert()\r
 \r
-\r
 /**\r
   TestEkusNotPresentInSignature()\r
 \r
@@ -259,21 +266,23 @@ static
 UNIT_TEST_STATUS\r
 EFIAPI\r
 TestEkusNotPresentInSignature (\r
-  IN UNIT_TEST_CONTEXT           Context\r
+  IN UNIT_TEST_CONTEXT  Context\r
   )\r
 {\r
-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
   //\r
   // This EKU is not in the signature.\r
   //\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.3" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithMultipleEKUsInCert,\r
-                                      ARRAY_SIZE(TestSignedWithMultipleEKUsInCert),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.3" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithMultipleEKUsInCert,\r
+             ARRAY_SIZE (TestSignedWithMultipleEKUsInCert),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
@@ -292,33 +301,35 @@ TestEkusNotPresentInSignature (
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
-\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
-TestProductId10001PresentInSignature(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestProductId10001PresentInSignature (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r
 {\r
-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
   //\r
   // These EKU's are present in the leaf signer certificate.\r
   //\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1",\r
-                                  "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = {\r
+    "1.3.6.1.4.1.311.76.9.21.1",\r
+    "1.3.6.1.4.1.311.76.9.21.1.10001"\r
+  };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestProductId10001PresentInSignature()\r
 \r
-\r
 /**\r
   TestOnlyOneEkuInListRequired()\r
 \r
@@ -337,27 +348,28 @@ TestProductId10001PresentInSignature(
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
-\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
-TestOnlyOneEkuInListRequired(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestOnlyOneEkuInListRequired (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r
 {\r
-  EFI_STATUS       Status = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
   //\r
   // This will test the flag that specifies it is OK to succeed if\r
   // any one of the EKU's passed in is found.\r
   //\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      FALSE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1.10001" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             FALSE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
@@ -376,32 +388,32 @@ TestOnlyOneEkuInListRequired(
   @retval UNIT_TEST_PASSED            - The required EKUs were found in the signature.\r
   @retval UNIT_TEST_ERROR_TEST_FAILED - Something failed, check the debug output.\r
 **/\r
-\r
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
-TestNoEKUsInSignature(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestNoEKUsInSignature (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
   //\r
   // This EKU is not in the certificate, so it should fail.\r
   //\r
-  CONST CHAR8* RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignatureWithNoEKUsPresent,\r
-                                      ARRAY_SIZE(TestSignatureWithNoEKUsPresent),\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignatureWithNoEKUsPresent,\r
+             ARRAY_SIZE (TestSignatureWithNoEKUsPresent),\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestNoEKUsInSignature()\r
 \r
-\r
 /**\r
   TestInvalidParameters()\r
 \r
@@ -416,38 +428,41 @@ TestNoEKUsInSignature(
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
-TestInvalidParameters(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestInvalidParameters (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
-  CONST CHAR8RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
+  CONST CHAR8  *RequiredEKUs[] = { "1.3.6.1.4.1.311.76.9.21.1" };\r
 \r
   //\r
   // Check bad signature.\r
   //\r
-  Status = VerifyEKUsInPkcs7Signature(NULL,\r
-                                      0,\r
-                                      (CONST CHAR8**)RequiredEKUs,\r
-                                      ARRAY_SIZE(RequiredEKUs),\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             NULL,\r
+             0,\r
+             (CONST CHAR8 **)RequiredEKUs,\r
+             ARRAY_SIZE (RequiredEKUs),\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   //\r
   // Check invalid EKU's\r
   //\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignatureWithNoEKUsPresent,\r
-                                      ARRAY_SIZE(TestSignatureWithNoEKUsPresent),\r
-                                      (CONST CHAR8**)NULL,\r
-                                      0,\r
-                                      TRUE);\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignatureWithNoEKUsPresent,\r
+             ARRAY_SIZE (TestSignatureWithNoEKUsPresent),\r
+             (CONST CHAR8 **)NULL,\r
+             0,\r
+             TRUE\r
+             );\r
   UT_ASSERT_STATUS_EQUAL (Status, EFI_INVALID_PARAMETER);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestInvalidParameters()\r
 \r
-\r
 /**\r
   TestEKUSubStringFails()\r
 \r
@@ -463,11 +478,11 @@ TestInvalidParameters(
 static\r
 UNIT_TEST_STATUS\r
 EFIAPI\r
-TestEKUSubsetSupersetFails(\r
-  IN UNIT_TEST_CONTEXT           Context\r
-)\r
+TestEKUSubsetSupersetFails (\r
+  IN UNIT_TEST_CONTEXT  Context\r
+  )\r
 {\r
-  EFI_STATUS       Status     = EFI_SUCCESS;\r
+  EFI_STATUS  Status = EFI_SUCCESS;\r
 \r
   //\r
   // This signature has an EKU of:\r
@@ -476,13 +491,15 @@ TestEKUSubsetSupersetFails(
   // "1.3.6.1.4.1.311.76.9.21"\r
   // does not pass.\r
   //\r
-  CONST CHAR8* RequiredEKUs1[] = { "1.3.6.1.4.1.311.76.9.21" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs1,\r
-                                      ARRAY_SIZE(RequiredEKUs1),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs1[] = { "1.3.6.1.4.1.311.76.9.21" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs1,\r
+             ARRAY_SIZE (RequiredEKUs1),\r
+             TRUE\r
+             );\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   //\r
@@ -492,33 +509,35 @@ TestEKUSubsetSupersetFails(
   // "1.3.6.1.4.1.311.76.9.21.1.10001.1"\r
   // does not pass.\r
   //\r
-  CONST CHAR8* RequiredEKUs2[] = { "1.3.6.1.4.1.311.76.9.21.1.10001.1" };\r
-\r
-  Status = VerifyEKUsInPkcs7Signature(TestSignedWithProductId10001,\r
-                                      ARRAY_SIZE(TestSignedWithProductId10001),\r
-                                      (CONST CHAR8**)RequiredEKUs2,\r
-                                      ARRAY_SIZE(RequiredEKUs2),\r
-                                      TRUE);\r
+  CONST CHAR8  *RequiredEKUs2[] = { "1.3.6.1.4.1.311.76.9.21.1.10001.1" };\r
+\r
+  Status = VerifyEKUsInPkcs7Signature (\r
+             TestSignedWithProductId10001,\r
+             ARRAY_SIZE (TestSignedWithProductId10001),\r
+             (CONST CHAR8 **)RequiredEKUs2,\r
+             ARRAY_SIZE (RequiredEKUs2),\r
+             TRUE\r
+             );\r
   UT_ASSERT_NOT_EQUAL (Status, EFI_SUCCESS);\r
 \r
   return UNIT_TEST_PASSED;\r
 }// TestEKUSubsetSupersetFails()\r
 \r
-TEST_DESC mPkcs7EkuTest[] = {\r
-    //\r
-    // -----Description--------------------------------Class----------------------------Function------------------------------Pre---Post--Context\r
-    //\r
-    {"TestVerifyEKUsInSignature()",            "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsInSignature,            NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith3CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith3CertsInSignature,  NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith2CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith2CertsInSignature,  NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWith1CertInSignature()",   "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWith1CertInSignature,   NULL, NULL, NULL},\r
-    {"TestVerifyEKUsWithMultipleEKUsInCert()", "CryptoPkg.BaseCryptLib.Eku",   TestVerifyEKUsWithMultipleEKUsInCert, NULL, NULL, NULL},\r
-    {"TestEkusNotPresentInSignature()",        "CryptoPkg.BaseCryptLib.Eku",   TestEkusNotPresentInSignature,        NULL, NULL, NULL},\r
-    {"TestProductId10001PresentInSignature()", "CryptoPkg.BaseCryptLib.Eku",   TestProductId10001PresentInSignature, NULL, NULL, NULL},\r
-    {"TestOnlyOneEkuInListRequired()",         "CryptoPkg.BaseCryptLib.Eku",   TestOnlyOneEkuInListRequired,         NULL, NULL, NULL},\r
-    {"TestNoEKUsInSignature()",                "CryptoPkg.BaseCryptLib.Eku",   TestNoEKUsInSignature,                NULL, NULL, NULL},\r
-    {"TestInvalidParameters()",                "CryptoPkg.BaseCryptLib.Eku",   TestInvalidParameters,                NULL, NULL, NULL},\r
-    {"TestEKUSubsetSupersetFails()",           "CryptoPkg.BaseCryptLib.Eku",   TestEKUSubsetSupersetFails,           NULL, NULL, NULL},\r
+TEST_DESC  mPkcs7EkuTest[] = {\r
+  //\r
+  // -----Description--------------------------------Class----------------------------Function------------------------------Pre---Post--Context\r
+  //\r
+  { "TestVerifyEKUsInSignature()",            "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsInSignature,            NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith3CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith3CertsInSignature,  NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith2CertsInSignature()",  "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith2CertsInSignature,  NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWith1CertInSignature()",   "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWith1CertInSignature,   NULL, NULL, NULL },\r
+  { "TestVerifyEKUsWithMultipleEKUsInCert()", "CryptoPkg.BaseCryptLib.Eku", TestVerifyEKUsWithMultipleEKUsInCert, NULL, NULL, NULL },\r
+  { "TestEkusNotPresentInSignature()",        "CryptoPkg.BaseCryptLib.Eku", TestEkusNotPresentInSignature,        NULL, NULL, NULL },\r
+  { "TestProductId10001PresentInSignature()", "CryptoPkg.BaseCryptLib.Eku", TestProductId10001PresentInSignature, NULL, NULL, NULL },\r
+  { "TestOnlyOneEkuInListRequired()",         "CryptoPkg.BaseCryptLib.Eku", TestOnlyOneEkuInListRequired,         NULL, NULL, NULL },\r
+  { "TestNoEKUsInSignature()",                "CryptoPkg.BaseCryptLib.Eku", TestNoEKUsInSignature,                NULL, NULL, NULL },\r
+  { "TestInvalidParameters()",                "CryptoPkg.BaseCryptLib.Eku", TestInvalidParameters,                NULL, NULL, NULL },\r
+  { "TestEKUSubsetSupersetFails()",           "CryptoPkg.BaseCryptLib.Eku", TestEKUSubsetSupersetFails,           NULL, NULL, NULL },\r
 };\r
 \r
-UINTN mPkcs7EkuTestNum = ARRAY_SIZE(mPkcs7EkuTest);\r
+UINTN  mPkcs7EkuTestNum = ARRAY_SIZE (mPkcs7EkuTest);\r