CryptoPkg: Update RsaPkcs7Tests for TCBZ3925

Update TestVerifyPkcs7SignVerifyNonSelfIssued to pass the raw DER
certificate data (TestCert2) directly to Pkcs7Sign instead of
constructing an X509 certificate object first. Remove the
associated SignCert variable, X509ConstructCertificate call, and
X509Free cleanup.

Signed-off-by: Doug Flick <dougflick@microsoft.com>

Author: Flickdm

CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c

@@ -606,17 +606,20 @@ TestVerifyPkcs7SignVerifyNonSelfIssued (
   BOOLEAN  Status;
   UINT8    *P7SignedData;
   UINTN    P7SignedDataSize;
-  UINT8    *SignCert;
+
+  // UINT8    *SignCert;  // MU_CHANGE [TCBZ3925] - Pkcs7Sign is broken
 
   P7SignedData = NULL;
-  SignCert     = NULL;
+  // SignCert     = NULL; // MU_CHANGE [TCBZ3925] - Pkcs7Sign is broken
 
+  // MU_CHANGE [TCBZ3925] [BEGIN] - Pkcs7Sign is broken
   //
   // Construct Signer Certificate from RAW data.
   //
-  Status = X509ConstructCertificate (TestCert2, sizeof (TestCert2), (UINT8 **)&SignCert);
-  UT_ASSERT_TRUE (Status);
-  UT_ASSERT_NOT_NULL (SignCert);
+  // Status = X509ConstructCertificate (TestCert2, sizeof (TestCert2), (UINT8 **)&SignCert);
+  // UT_ASSERT_TRUE (Status);
+  // UT_ASSERT_NOT_NULL (SignCert);
+  // MU_CHANGE [TCBZ3925] [END] - Pkcs7Sign is broken
 
   //
   // Create PKCS#7 signedData on Payload.
@@ -628,10 +631,8 @@ TestVerifyPkcs7SignVerifyNonSelfIssued (
              (CONST UINT8 *)TestKeyCert2PemPass,
              (UINT8 *)Payload,
              AsciiStrLen (Payload),
-             SignCert,
-             // MU_CHANGE # [TCBZ3925] - Pkcs7Sign is broken
-             sizeof (TestCert2),
-             // MU_CHANGE # [TCBZ3925] - Pkcs7Sign is broken
+             TestCert2,            // MU_CHANGE [TCBZ3925] - Pkcs7Sign is broken
+             sizeof (TestCert2),   // MU_CHANGE [TCBZ3925] - Pkcs7Sign is broken
              NULL,
              &P7SignedData,
              &P7SignedDataSize
@@ -653,9 +654,11 @@ TestVerifyPkcs7SignVerifyNonSelfIssued (
     FreePool (P7SignedData);
   }
 
-  if (SignCert != NULL) {
-    X509Free (SignCert);
-  }
+  // MU_CHANGE [TCBZ3925] [BEGIN] - Pkcs7Sign is broken
+  // if (SignCert != NULL) {
+  //   X509Free (SignCert);
+  // }
+  // MU_CHANGE [TCBZ3925] [END] - Pkcs7Sign is broken
 
   return UNIT_TEST_PASSED;
 }