Signed-off-by: Yi Li <yi1...@intel.com>
---
.../Library/BaseCryptLib/RsaPkcs7Tests.c | 145 +++++++++++++++---
1 file changed, 120 insertions(+), 25 deletions(-)
diff --git a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
index 8b464cb694..ecf88778c1 100644
--- a/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
+++ b/CryptoPkg/Test/UnitTest/Library/BaseCryptLib/RsaPkcs7Tests.c
@@ -240,6 +240,113 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UINT8 MsgHash[] = {
//
GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 *Payload = "Payload Data for PKCS#7
Signing";
+UINT8 RsaPrivKeyN[128] = {
+ 0x9F, 0xEF, 0x1B, 0x46, 0x45, 0x55, 0x33, 0x4B, 0xEE, 0x95, 0x14, 0xD3,
+ 0x5A, 0x3E, 0xD9, 0x29, 0xFB, 0xD9, 0x29, 0x4E, 0x8B, 0xF1, 0xF5, 0x68,
+ 0x7C, 0x58, 0x86, 0x0C, 0xDA, 0xD7, 0xE0, 0xD2, 0x9A, 0xE8, 0x37, 0x16,
+ 0x4D, 0x54, 0x92, 0x18, 0x20, 0x4C, 0x09, 0xA1, 0xCF, 0xE1, 0xAA, 0x7A,
+ 0x5A, 0x64, 0x7E, 0x5C, 0xEB, 0x4E, 0x15, 0x8E, 0x40, 0xD1, 0xCB, 0x7D,
+ 0x01, 0x71, 0x15, 0x11, 0xD2, 0xC7, 0xDB, 0x6B, 0x00, 0xDC, 0x02, 0xCB,
+ 0x5A, 0x6D, 0x2B, 0x2A, 0x75, 0xB6, 0x3F, 0xEC, 0xC1, 0x9D, 0xBF, 0xDA,
+ 0xE5, 0x3A, 0x77, 0x4B, 0x21, 0x1C, 0x99, 0x42, 0x84, 0x5E, 0x27, 0x53,
+ 0x9B, 0xE6, 0xC1, 0xA1, 0x95, 0x58, 0xBA, 0xBE, 0x62, 0x58, 0xD5, 0x09,
+ 0xA8, 0xE6, 0xB6, 0x1B, 0xB1, 0x18, 0x28, 0x13, 0xC7, 0x89, 0x1C, 0x68,
+ 0xCE, 0x15, 0xAF, 0x2E, 0x68, 0xAC, 0x1C, 0xF7
+};
+UINT8 RsaPrivKeyE[3] = {
+ 0x01, 0x00, 0x01
+};
+UINT8 RsaPrivKeyD[128] = {
+ 0x08, 0x96, 0x6F, 0x31, 0x7B, 0xC1, 0x92, 0x6A, 0x8E, 0x5A, 0x04, 0xEF,
+ 0x40, 0x56, 0x45, 0x94, 0xE2, 0x88, 0x0B, 0x96, 0xC3, 0x1E, 0xEF, 0xDD,
+ 0x77, 0x67, 0xCD, 0x72, 0xDD, 0x41, 0x60, 0x3A, 0x0E, 0xC5, 0x4F, 0x47,
+ 0xEC, 0x49, 0x11, 0x3B, 0x28, 0x68, 0xCC, 0xCF, 0x9A, 0x78, 0xF4, 0x8D,
+ 0x73, 0x53, 0x18, 0x11, 0xE7, 0x34, 0x9F, 0x25, 0xAF, 0x47, 0x54, 0x94,
+ 0xD6, 0xC1, 0xFA, 0xAE, 0x8F, 0x94, 0x0C, 0x86, 0xF7, 0x96, 0x8B, 0xC2,
+ 0x03, 0xC4, 0xA1, 0xA5, 0x13, 0x83, 0x0A, 0xB3, 0xBF, 0xCB, 0xB7, 0x3C,
+ 0x0F, 0x4E, 0xA6, 0xFB, 0xD7, 0xDF, 0x31, 0x07, 0x2E, 0x95, 0x46, 0xBC,
+ 0x46, 0x35, 0x21, 0xD3, 0x98, 0x40, 0x44, 0x5B, 0x02, 0x99, 0xE4, 0xA2,
+ 0x3A, 0x3B, 0xB0, 0x31, 0x0B, 0x67, 0x2B, 0x95, 0xAC, 0xD6, 0xEB, 0x4B,
+ 0x7C, 0xA6, 0xCF, 0x0A, 0x30, 0xCE, 0x12, 0xC1
+};
+
+UINT8 P7SignedData[880] = {
+ 0x30, 0x82, 0x03, 0x6C, 0x02, 0x01, 0x01, 0x31, 0x0F, 0x30, 0x0D, 0x06,
+ 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00,
+ 0x30, 0x0B, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x07,
+ 0x01, 0xA0, 0x82, 0x02, 0x35, 0x30, 0x82, 0x02, 0x31, 0x30, 0x82, 0x01,
+ 0x9A, 0x02, 0x02, 0x0D, 0x68, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48,
+ 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x30, 0x5E, 0x31, 0x0B,
+ 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31,
+ 0x0B, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x02, 0x57, 0x41,
+ 0x31, 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53,
+ 0x65, 0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03,
+ 0x55, 0x04, 0x0A, 0x0C, 0x09, 0x54, 0x69, 0x61, 0x6E, 0x6F, 0x63, 0x6F,
+ 0x72, 0x65, 0x31, 0x0D, 0x30, 0x0B, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C,
+ 0x04, 0x45, 0x44, 0x4B, 0x32, 0x31, 0x0D, 0x30, 0x0B, 0x06, 0x03, 0x55,
+ 0x04, 0x03, 0x0C, 0x04, 0x55, 0x45, 0x46, 0x49, 0x30, 0x1E, 0x17, 0x0D,
+ 0x32, 0x30, 0x30, 0x36, 0x32, 0x39, 0x32, 0x33, 0x31, 0x35, 0x33, 0x36,
+ 0x5A, 0x17, 0x0D, 0x34, 0x37, 0x31, 0x31, 0x31, 0x35, 0x32, 0x33, 0x31,
+ 0x35, 0x33, 0x36, 0x5A, 0x30, 0x63, 0x31, 0x0B, 0x30, 0x09, 0x06, 0x03,
+ 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x0B, 0x30, 0x09, 0x06,
+ 0x03, 0x55, 0x04, 0x08, 0x0C, 0x02, 0x57, 0x41, 0x31, 0x10, 0x30, 0x0E,
+ 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65, 0x61, 0x74, 0x74,
+ 0x6C, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0A, 0x0C,
+ 0x09, 0x54, 0x69, 0x61, 0x6E, 0x6F, 0x63, 0x6F, 0x72, 0x65, 0x31, 0x12,
+ 0x30, 0x10, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x09, 0x45, 0x44, 0x4B,
+ 0x32, 0x43, 0x48, 0x49, 0x4C, 0x44, 0x31, 0x0D, 0x30, 0x0B, 0x06, 0x03,
+ 0x55, 0x04, 0x03, 0x0C, 0x04, 0x55, 0x45, 0x46, 0x49, 0x30, 0x81, 0x9F,
+ 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01,
+ 0x01, 0x05, 0x00, 0x03, 0x81, 0x8D, 0x00, 0x30, 0x81, 0x89, 0x02, 0x81,
+ 0x81, 0x00, 0x9F, 0xEF, 0x1B, 0x46, 0x45, 0x55, 0x33, 0x4B, 0xEE, 0x95,
+ 0x14, 0xD3, 0x5A, 0x3E, 0xD9, 0x29, 0xFB, 0xD9, 0x29, 0x4E, 0x8B, 0xF1,
+ 0xF5, 0x68, 0x7C, 0x58, 0x86, 0x0C, 0xDA, 0xD7, 0xE0, 0xD2, 0x9A, 0xE8,
+ 0x37, 0x16, 0x4D, 0x54, 0x92, 0x18, 0x20, 0x4C, 0x09, 0xA1, 0xCF, 0xE1,
+ 0xAA, 0x7A, 0x5A, 0x64, 0x7E, 0x5C, 0xEB, 0x4E, 0x15, 0x8E, 0x40, 0xD1,
+ 0xCB, 0x7D, 0x01, 0x71, 0x15, 0x11, 0xD2, 0xC7, 0xDB, 0x6B, 0x00, 0xDC,
+ 0x02, 0xCB, 0x5A, 0x6D, 0x2B, 0x2A, 0x75, 0xB6, 0x3F, 0xEC, 0xC1, 0x9D,
+ 0xBF, 0xDA, 0xE5, 0x3A, 0x77, 0x4B, 0x21, 0x1C, 0x99, 0x42, 0x84, 0x5E,
+ 0x27, 0x53, 0x9B, 0xE6, 0xC1, 0xA1, 0x95, 0x58, 0xBA, 0xBE, 0x62, 0x58,
+ 0xD5, 0x09, 0xA8, 0xE6, 0xB6, 0x1B, 0xB1, 0x18, 0x28, 0x13, 0xC7, 0x89,
+ 0x1C, 0x68, 0xCE, 0x15, 0xAF, 0x2E, 0x68, 0xAC, 0x1C, 0xF7, 0x02, 0x03,
+ 0x01, 0x00, 0x01, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7,
+ 0x0D, 0x01, 0x01, 0x0B, 0x05, 0x00, 0x03, 0x81, 0x81, 0x00, 0x0D, 0xA4,
+ 0x18, 0xA2, 0xB6, 0x09, 0xE1, 0x77, 0x22, 0x97, 0x46, 0x29, 0x1B, 0xD8,
+ 0x67, 0x0A, 0xC0, 0x91, 0x36, 0x53, 0xE1, 0x4C, 0x73, 0x1B, 0xC1, 0x90,
+ 0x6D, 0x98, 0x46, 0x7E, 0x65, 0x71, 0x1C, 0xF0, 0x62, 0x9F, 0x9E, 0x62,
+ 0x0B, 0x8B, 0x73, 0x35, 0x4C, 0x2D, 0xC3, 0x5D, 0x38, 0x22, 0xFE, 0x43,
+ 0x0F, 0xF2, 0x57, 0x17, 0x75, 0xA8, 0x76, 0x79, 0xAB, 0x4E, 0x33, 0xA5,
+ 0x91, 0xBD, 0x55, 0x5B, 0xC0, 0x7E, 0xFB, 0x1D, 0xC9, 0xF3, 0x5F, 0x12,
+ 0x6F, 0x7C, 0xDC, 0x24, 0x5A, 0x84, 0x16, 0x28, 0x5B, 0xF9, 0xCC, 0x8B,
+ 0xFE, 0x11, 0xE6, 0x29, 0xCF, 0xAC, 0x90, 0x66, 0xC0, 0x70, 0x25, 0xF8,
+ 0x71, 0xDB, 0x29, 0xCB, 0x6B, 0x10, 0xA7, 0xBE, 0x3E, 0x9D, 0x61, 0xD8,
+ 0x04, 0xE0, 0x71, 0x63, 0x83, 0xA3, 0xCA, 0x26, 0x6D, 0x7F, 0xF3, 0xAA,
+ 0x8E, 0xB2, 0x66, 0x98, 0x41, 0xD6, 0x31, 0x82, 0x01, 0x0E, 0x30, 0x82,
+ 0x01, 0x0A, 0x02, 0x01, 0x01, 0x30, 0x64, 0x30, 0x5E, 0x31, 0x0B, 0x30,
+ 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x55, 0x53, 0x31, 0x0B,
+ 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x08, 0x0C, 0x02, 0x57, 0x41, 0x31,
+ 0x10, 0x30, 0x0E, 0x06, 0x03, 0x55, 0x04, 0x07, 0x0C, 0x07, 0x53, 0x65,
+ 0x61, 0x74, 0x74, 0x6C, 0x65, 0x31, 0x12, 0x30, 0x10, 0x06, 0x03, 0x55,
+ 0x04, 0x0A, 0x0C, 0x09, 0x54, 0x69, 0x61, 0x6E, 0x6F, 0x63, 0x6F, 0x72,
+ 0x65, 0x31, 0x0D, 0x30, 0x0B, 0x06, 0x03, 0x55, 0x04, 0x0B, 0x0C, 0x04,
+ 0x45, 0x44, 0x4B, 0x32, 0x31, 0x0D, 0x30, 0x0B, 0x06, 0x03, 0x55, 0x04,
+ 0x03, 0x0C, 0x04, 0x55, 0x45, 0x46, 0x49, 0x02, 0x02, 0x0D, 0x68, 0x30,
+ 0x0D, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
+ 0x05, 0x00, 0x30, 0x0D, 0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D,
+ 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x81, 0x80, 0x31, 0xF4, 0xB2, 0xCB,
+ 0x9C, 0xB6, 0xE4, 0x54, 0xB4, 0xB4, 0x6F, 0x31, 0xC4, 0x4F, 0x55, 0x50,
+ 0x98, 0x34, 0xB6, 0x81, 0x0E, 0xE7, 0xFF, 0x02, 0xB3, 0x21, 0x81, 0x38,
+ 0xD4, 0x03, 0x0D, 0x37, 0xCD, 0xFF, 0xE9, 0x74, 0x49, 0x2D, 0x29, 0x3A,
+ 0x2F, 0xDD, 0xE1, 0x01, 0xDF, 0x5A, 0x2D, 0x64, 0xC8, 0xCD, 0x2D, 0x08,
+ 0x38, 0xAB, 0x5C, 0x7D, 0xA1, 0xD2, 0x69, 0x53, 0x53, 0xF4, 0x44, 0x65,
+ 0x29, 0x35, 0x8A, 0x44, 0xB0, 0x3F, 0xD7, 0xDF, 0x8A, 0xC7, 0xB2, 0xFD,
+ 0x56, 0xF5, 0x84, 0x04, 0x74, 0x1F, 0xEE, 0xDB, 0xDC, 0x6C, 0x96, 0xBF,
+ 0x71, 0xF1, 0xDE, 0x17, 0xE1, 0x98, 0x1B, 0x66, 0x55, 0x2A, 0x87, 0x6C,
+ 0x52, 0xF7, 0xD1, 0x71, 0xC3, 0x1F, 0xB7, 0x02, 0xA6, 0xC3, 0x68, 0x2D,
+ 0x11, 0x03, 0xBD, 0x69, 0xF9, 0x7C, 0xE5, 0x81, 0xA0, 0x10, 0xCA, 0x80,
+ 0x90, 0x28, 0x28, 0x5F
+};
+
UNIT_TEST_STATUS
EFIAPI
TestVerifyRsaCertPkcs1SignVerify (
@@ -262,9 +369,20 @@ TestVerifyRsaCertPkcs1SignVerify (
//
// Retrieve RSA private key from encrypted PEM data.
//
- Status = RsaGetPrivateKeyFromPem (TestKeyPem, sizeof (TestKeyPem), PemPass,
&RsaPrivKey);
+ RsaPrivKey = RsaNew ();
+
+ if (RsaPrivKey == NULL) {
+ return UNIT_TEST_ERROR_TEST_FAILED;
+ }
+
+ Status = RsaSetKey (RsaPrivKey, RsaKeyN, RsaPrivKeyN, sizeof (RsaPrivKeyN));
+ UT_ASSERT_TRUE (Status);
+
+ Status = RsaSetKey (RsaPrivKey, RsaKeyD, RsaPrivKeyD, sizeof (RsaPrivKeyD));
UT_ASSERT_TRUE (Status);
+ Status = RsaSetKey (RsaPrivKey, RsaKeyE, RsaPrivKeyE, sizeof (RsaPrivKeyE));
+ UT_ASSERT_TRUE (Status);
//
// Retrieve RSA public key from X509 Certificate.
//
@@ -342,12 +460,11 @@ TestVerifyPkcs7SignVerify (
)
{
BOOLEAN Status;
- UINT8 *P7SignedData;
UINTN P7SignedDataSize;
UINT8 *SignCert;
- P7SignedData = NULL;
SignCert = NULL;
+ P7SignedDataSize = sizeof (P7SignedData);
//
// Construct Signer Certificate from RAW data.
@@ -356,24 +473,6 @@ TestVerifyPkcs7SignVerify (
UT_ASSERT_TRUE (Status);
UT_ASSERT_NOT_NULL (SignCert);
- //
- // Create PKCS#7 signedData on Payload.
- // Note: Caller should release P7SignedData manually.
- //
- Status = Pkcs7Sign (
- TestKeyPem,
- sizeof (TestKeyPem),
- (CONST UINT8 *)PemPass,
- (UINT8 *)Payload,
- AsciiStrLen (Payload),
- SignCert,
- NULL,
- &P7SignedData,
- &P7SignedDataSize
- );
- UT_ASSERT_TRUE (Status);
- UT_ASSERT_NOT_EQUAL (P7SignedDataSize, 0);
-
Status = Pkcs7Verify (
P7SignedData,
P7SignedDataSize,
@@ -384,10 +483,6 @@ TestVerifyPkcs7SignVerify (
);
UT_ASSERT_TRUE (Status);
- if (P7SignedData != NULL) {
- FreePool (P7SignedData);
- }
-
if (SignCert != NULL) {
X509Free (SignCert);
}
--
2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101294): https://edk2.groups.io/g/devel/message/101294
Mute This Topic: https://groups.io/mt/97666989/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
