wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support for dynamic allocation of PKCS7 structure using wc_PKCS7_New and wc_PKCS7_Free. Updated the test examples to use the dynamic method. Add API unit test for wc_PKCS7_New.

Browse Source
This commit is contained in:
David Garske
2018-06-29 15:04:28 -07:00
parent 54f2c3fe18
commit 07401d909c
4 changed files with 214 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/api.c
View File

@@ -14185,6 +14185,25 @@ static int test_wc_ecc_is_valid_idx (void)
} /* END test_wc_ecc_is_valid_idx */ } /* END test_wc_ecc_is_valid_idx */
/*
* Testing wc_PKCS7_New()
*/
static void test_wc_PKCS7_New (void)
{
#if defined(HAVE_PKCS7)
PKCS7* pkcs7;
void* heap = NULL;
printf(testingFmt, "wc_PKCS7_New()");
pkcs7 = wc_PKCS7_New(heap, devId);
AssertNotNull(pkcs7);
printf(resultFmt, passed);
wc_PKCS7_Free(pkcs7);
#endif
} /* END test-wc_PKCS7_New */
/* /*
* Testing wc_PKCS7_Init() * Testing wc_PKCS7_Init()
*/ */
@@ -20176,6 +20195,7 @@ void ApiTest(void)
AssertIntEQ(test_wc_ecc_mulmod(), 0); AssertIntEQ(test_wc_ecc_mulmod(), 0);
AssertIntEQ(test_wc_ecc_is_valid_idx(), 0); AssertIntEQ(test_wc_ecc_is_valid_idx(), 0);
test_wc_PKCS7_New();
test_wc_PKCS7_Init(); test_wc_PKCS7_Init();
test_wc_PKCS7_InitWithCert(); test_wc_PKCS7_InitWithCert();
test_wc_PKCS7_EncodeData(); test_wc_PKCS7_EncodeData();

42
wolfcrypt/src/pkcs7.c
View File

@@ -228,6 +228,17 @@ static int wc_PKCS7_GetOIDKeySize(int oid)
} }
PKCS7* wc_PKCS7_New(void* heap, int devId)
{
PKCS7* pkcs7 = (PKCS7*)XMALLOC(sizeof(PKCS7), heap, DYNAMIC_TYPE_PKCS7);
if (pkcs7) {
XMEMSET(pkcs7, 0, sizeof(PKCS7));
wc_PKCS7_Init(pkcs7, heap, devId);
pkcs7->isDynamic = 1;
}
return pkcs7;
}
/* This is to initialize a PKCS7 structure. It sets all values to 0 and can be /* This is to initialize a PKCS7 structure. It sets all values to 0 and can be
* used to set the heap hint. * used to set the heap hint.
* *
@@ -246,7 +257,11 @@ int wc_PKCS7_Init(PKCS7* pkcs7, void* heap, int devId)
} }
XMEMSET(pkcs7, 0, sizeof(PKCS7)); XMEMSET(pkcs7, 0, sizeof(PKCS7));
#ifdef WOLFSSL_HEAP_TEST
pkcs7->heap = (void*)WOLFSSL_HEAP_TEST;
#else
pkcs7->heap = heap; pkcs7->heap = heap;
#endif
pkcs7->devId = devId; pkcs7->devId = devId;
return 0; return 0;
@@ -254,34 +269,30 @@ int wc_PKCS7_Init(PKCS7* pkcs7, void* heap, int devId)
/* init PKCS7 struct with recipient cert, decode into DecodedCert /* init PKCS7 struct with recipient cert, decode into DecodedCert
* NOTE: keeps previously set pkcs7 memory heap hint */ * NOTE: keeps previously set pkcs7 heap hint, devId and isDynamic */
int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz) int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz)
{ {
int ret = 0; int ret = 0;
void* heap; void* heap;
int devId; int devId;
word16 isDynamic;
if (pkcs7 == NULL || (cert == NULL && certSz != 0)) { if (pkcs7 == NULL || (cert == NULL && certSz != 0)) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }
#ifdef WOLFSSL_HEAP_TEST
heap = (void*)WOLFSSL_HEAP_TEST;
#else
heap = pkcs7->heap; heap = pkcs7->heap;
#endif
devId = pkcs7->devId; devId = pkcs7->devId;
isDynamic = pkcs7->isDynamic;
XMEMSET(pkcs7, 0, sizeof(PKCS7)); wc_PKCS7_Init(pkcs7, heap, devId);
pkcs7->heap = heap; pkcs7->isDynamic = isDynamic;
pkcs7->devId = devId;
if (cert != NULL && certSz > 0) { if (cert != NULL && certSz > 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
DecodedCert* dCert; DecodedCert* dCert;
dCert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL, dCert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), pkcs7->heap,
DYNAMIC_TYPE_PKCS7); DYNAMIC_TYPE_DCERT);
if (dCert == NULL) if (dCert == NULL)
return MEMORY_E; return MEMORY_E;
#else #else
@@ -297,7 +308,7 @@ int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz)
if (ret < 0) { if (ret < 0) {
FreeDecodedCert(dCert); FreeDecodedCert(dCert);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(dCert, NULL, DYNAMIC_TYPE_PKCS7); XFREE(dCert, NULL, DYNAMIC_TYPE_DCERT);
#endif #endif
return ret; return ret;
} }
@@ -313,7 +324,7 @@ int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz)
FreeDecodedCert(dCert); FreeDecodedCert(dCert);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(dCert, NULL, DYNAMIC_TYPE_PKCS7); XFREE(dCert, NULL, DYNAMIC_TYPE_DCERT);
#endif #endif
} }
@@ -359,6 +370,11 @@ void wc_PKCS7_Free(PKCS7* pkcs7)
if (pkcs7->der != NULL) if (pkcs7->der != NULL)
XFREE(pkcs7->der, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(pkcs7->der, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
#endif #endif
if (pkcs7->isDynamic) {
pkcs7->isDynamic = 0;
XFREE(pkcs7, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
}
} }

194
wolfcrypt/test/test.c
View File

@@ -18050,7 +18050,7 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
byte enveloped[2048]; byte enveloped[2048];
byte decoded[2048]; byte decoded[2048];
PKCS7 pkcs7; PKCS7* pkcs7;
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
FILE* pkcs7File; FILE* pkcs7File;
#endif #endif
@@ -18128,64 +18128,75 @@ static int pkcs7enveloped_run_vectors(byte* rsaCert, word32 rsaCertSz,
testSz = sizeof(testVectors) / sizeof(pkcs7EnvelopedVector); testSz = sizeof(testVectors) / sizeof(pkcs7EnvelopedVector);
for (i = 0; i < testSz; i++) { for (i = 0; i < testSz; i++) {
ret = wc_PKCS7_Init(&pkcs7, HEAP_HINT, pkcs7 = wc_PKCS7_New(HEAP_HINT,
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
INVALID_DEVID /* async PKCS7 is not supported */ INVALID_DEVID /* async PKCS7 is not supported */
#else #else
devId devId
#endif #endif
); );
if (ret != 0) if (pkcs7 == NULL)
return -9214; return -9214;
ret = wc_PKCS7_InitWithCert(&pkcs7, testVectors[i].cert, ret = wc_PKCS7_InitWithCert(pkcs7, testVectors[i].cert,
(word32)testVectors[i].certSz); (word32)testVectors[i].certSz);
if (ret != 0) if (ret != 0) {
wc_PKCS7_Free(pkcs7);
return -9215; return -9215;
}
pkcs7.content = (byte*)testVectors[i].content; pkcs7->content = (byte*)testVectors[i].content;
pkcs7.contentSz = testVectors[i].contentSz; pkcs7->contentSz = testVectors[i].contentSz;
pkcs7.contentOID = testVectors[i].contentOID; pkcs7->contentOID = testVectors[i].contentOID;
pkcs7.encryptOID = testVectors[i].encryptOID; pkcs7->encryptOID = testVectors[i].encryptOID;
pkcs7.keyWrapOID = testVectors[i].keyWrapOID; pkcs7->keyWrapOID = testVectors[i].keyWrapOID;
pkcs7.keyAgreeOID = testVectors[i].keyAgreeOID; pkcs7->keyAgreeOID = testVectors[i].keyAgreeOID;
pkcs7.privateKey = testVectors[i].privateKey; pkcs7->privateKey = testVectors[i].privateKey;
pkcs7.privateKeySz = testVectors[i].privateKeySz; pkcs7->privateKeySz = testVectors[i].privateKeySz;
pkcs7.ukm = testVectors[i].optionalUkm; pkcs7->ukm = testVectors[i].optionalUkm;
pkcs7.ukmSz = testVectors[i].optionalUkmSz; pkcs7->ukmSz = testVectors[i].optionalUkmSz;
/* encode envelopedData */ /* encode envelopedData */
envelopedSz = wc_PKCS7_EncodeEnvelopedData(&pkcs7, enveloped, envelopedSz = wc_PKCS7_EncodeEnvelopedData(pkcs7, enveloped,
sizeof(enveloped)); sizeof(enveloped));
if (envelopedSz <= 0) { if (envelopedSz <= 0) {
printf("DEBUG: i = %d, envelopedSz = %d\n", i, envelopedSz); printf("DEBUG: i = %d, envelopedSz = %d\n", i, envelopedSz);
wc_PKCS7_Free(pkcs7);
return -9216; return -9216;
} }
/* decode envelopedData */ /* decode envelopedData */
decodedSz = wc_PKCS7_DecodeEnvelopedData(&pkcs7, enveloped, envelopedSz, decodedSz = wc_PKCS7_DecodeEnvelopedData(pkcs7, enveloped, envelopedSz,
decoded, sizeof(decoded)); decoded, sizeof(decoded));
if (decodedSz <= 0) if (decodedSz <= 0) {
wc_PKCS7_Free(pkcs7);
return -9217; return -9217;
}
/* test decode result */ /* test decode result */
if (XMEMCMP(decoded, data, sizeof(data)) != 0) if (XMEMCMP(decoded, data, sizeof(data)) != 0){
wc_PKCS7_Free(pkcs7);
return -9218; return -9218;
}
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
/* output pkcs7 envelopedData for external testing */ /* output pkcs7 envelopedData for external testing */
pkcs7File = fopen(testVectors[i].outFileName, "wb"); pkcs7File = fopen(testVectors[i].outFileName, "wb");
if (!pkcs7File) if (!pkcs7File) {
wc_PKCS7_Free(pkcs7);
return -9219; return -9219;
}
ret = (int)fwrite(enveloped, 1, envelopedSz, pkcs7File); ret = (int)fwrite(enveloped, 1, envelopedSz, pkcs7File);
fclose(pkcs7File); fclose(pkcs7File);
if (ret != envelopedSz) { if (ret != envelopedSz) {
wc_PKCS7_Free(pkcs7);
return -9220; return -9220;
} }
#endif /* PKCS7_OUTPUT_TEST_BUNDLES */ #endif /* PKCS7_OUTPUT_TEST_BUNDLES */
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
pkcs7 = NULL;
} }
#if !defined(HAVE_ECC) || defined(NO_AES) #if !defined(HAVE_ECC) || defined(NO_AES)
@@ -18313,7 +18324,7 @@ int pkcs7encrypted_test(void)
int ret = 0; int ret = 0;
int i, testSz; int i, testSz;
int encryptedSz, decodedSz, attribIdx; int encryptedSz, decodedSz, attribIdx;
PKCS7 pkcs7; PKCS7* pkcs7;
byte encrypted[2048]; byte encrypted[2048];
byte decoded[2048]; byte decoded[2048];
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
@@ -18437,55 +18448,65 @@ int pkcs7encrypted_test(void)
testSz = sizeof(testVectors) / sizeof(pkcs7EncryptedVector); testSz = sizeof(testVectors) / sizeof(pkcs7EncryptedVector);
for (i = 0; i < testSz; i++) { for (i = 0; i < testSz; i++) {
ret = wc_PKCS7_Init(&pkcs7, HEAP_HINT, devId); pkcs7 = wc_PKCS7_New(HEAP_HINT, devId);
if (ret != 0) if (pkcs7 == NULL)
return -9400; return -9400;
pkcs7.content = (byte*)testVectors[i].content; pkcs7->content = (byte*)testVectors[i].content;
pkcs7.contentSz = testVectors[i].contentSz; pkcs7->contentSz = testVectors[i].contentSz;
pkcs7.contentOID = testVectors[i].contentOID; pkcs7->contentOID = testVectors[i].contentOID;
pkcs7.encryptOID = testVectors[i].encryptOID; pkcs7->encryptOID = testVectors[i].encryptOID;
pkcs7.encryptionKey = testVectors[i].encryptionKey; pkcs7->encryptionKey = testVectors[i].encryptionKey;
pkcs7.encryptionKeySz = testVectors[i].encryptionKeySz; pkcs7->encryptionKeySz = testVectors[i].encryptionKeySz;
pkcs7.unprotectedAttribs = testVectors[i].attribs; pkcs7->unprotectedAttribs = testVectors[i].attribs;
pkcs7.unprotectedAttribsSz = testVectors[i].attribsSz; pkcs7->unprotectedAttribsSz = testVectors[i].attribsSz;
/* encode encryptedData */ /* encode encryptedData */
encryptedSz = wc_PKCS7_EncodeEncryptedData(&pkcs7, encrypted, encryptedSz = wc_PKCS7_EncodeEncryptedData(pkcs7, encrypted,
sizeof(encrypted)); sizeof(encrypted));
if (encryptedSz <= 0) if (encryptedSz <= 0) {
wc_PKCS7_Free(pkcs7);
return -9401; return -9401;
}
/* decode encryptedData */ /* decode encryptedData */
decodedSz = wc_PKCS7_DecodeEncryptedData(&pkcs7, encrypted, encryptedSz, decodedSz = wc_PKCS7_DecodeEncryptedData(pkcs7, encrypted, encryptedSz,
decoded, sizeof(decoded)); decoded, sizeof(decoded));
if (decodedSz <= 0) if (decodedSz <= 0){
wc_PKCS7_Free(pkcs7);
return -9402; return -9402;
}
/* test decode result */ /* test decode result */
if (XMEMCMP(decoded, data, sizeof(data)) != 0) if (XMEMCMP(decoded, data, sizeof(data)) != 0) {
wc_PKCS7_Free(pkcs7);
return -9403; return -9403;
}
/* verify decoded unprotected attributes */ /* verify decoded unprotected attributes */
if (pkcs7.decodedAttrib != NULL) { if (pkcs7->decodedAttrib != NULL) {
decodedAttrib = pkcs7.decodedAttrib; decodedAttrib = pkcs7->decodedAttrib;
attribIdx = 1; attribIdx = 1;
while (decodedAttrib != NULL) { while (decodedAttrib != NULL) {
/* expected attribute, stored list is reversed */ /* expected attribute, stored list is reversed */
expectedAttrib = &(pkcs7.unprotectedAttribs expectedAttrib = &(pkcs7->unprotectedAttribs
[pkcs7.unprotectedAttribsSz - attribIdx]); [pkcs7->unprotectedAttribsSz - attribIdx]);
/* verify oid */ /* verify oid */
if (XMEMCMP(decodedAttrib->oid, expectedAttrib->oid, if (XMEMCMP(decodedAttrib->oid, expectedAttrib->oid,
decodedAttrib->oidSz) != 0) decodedAttrib->oidSz) != 0) {
wc_PKCS7_Free(pkcs7);
return -9404; return -9404;
}
/* verify value */ /* verify value */
if (XMEMCMP(decodedAttrib->value, expectedAttrib->value, if (XMEMCMP(decodedAttrib->value, expectedAttrib->value,
decodedAttrib->valueSz) != 0) decodedAttrib->valueSz) != 0) {
wc_PKCS7_Free(pkcs7);
return -9405; return -9405;
}
decodedAttrib = decodedAttrib->next; decodedAttrib = decodedAttrib->next;
attribIdx++; attribIdx++;
@@ -18495,8 +18516,10 @@ int pkcs7encrypted_test(void)
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
/* output pkcs7 envelopedData for external testing */ /* output pkcs7 envelopedData for external testing */
pkcs7File = fopen(testVectors[i].outFileName, "wb"); pkcs7File = fopen(testVectors[i].outFileName, "wb");
if (!pkcs7File) if (!pkcs7File) {
wc_PKCS7_Free(pkcs7);
return -9406; return -9406;
}
ret = (int)fwrite(encrypted, encryptedSz, 1, pkcs7File); ret = (int)fwrite(encrypted, encryptedSz, 1, pkcs7File);
fclose(pkcs7File); fclose(pkcs7File);
@@ -18505,7 +18528,7 @@ int pkcs7encrypted_test(void)
ret = 0; ret = 0;
#endif #endif
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
} }
return ret; return ret;
@@ -18539,7 +18562,7 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
byte* out; byte* out;
word32 outSz; word32 outSz;
WC_RNG rng; WC_RNG rng;
PKCS7 pkcs7; PKCS7* pkcs7;
#ifdef PKCS7_OUTPUT_TEST_BUNDLES #ifdef PKCS7_OUTPUT_TEST_BUNDLES
FILE* file; FILE* file;
#endif #endif
@@ -18679,26 +18702,30 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
} }
for (i = 0; i < testSz; i++) { for (i = 0; i < testSz; i++) {
pkcs7 = wc_PKCS7_New(HEAP_HINT, INVALID_DEVID);
if (pkcs7 == NULL)
return -9410;
pkcs7.heap = HEAP_HINT; pkcs7->heap = HEAP_HINT;
pkcs7.devId = INVALID_DEVID; pkcs7->devId = INVALID_DEVID;
ret = wc_PKCS7_InitWithCert(&pkcs7, testVectors[i].cert, ret = wc_PKCS7_InitWithCert(pkcs7, testVectors[i].cert,
(word32)testVectors[i].certSz); (word32)testVectors[i].certSz);
if (ret != 0) { if (ret != 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(pkcs7);
return -9410; return -9410;
} }
pkcs7.rng = &rng; pkcs7->rng = &rng;
pkcs7.content = (byte*)testVectors[i].content; pkcs7->content = (byte*)testVectors[i].content;
pkcs7.contentSz = testVectors[i].contentSz; pkcs7->contentSz = testVectors[i].contentSz;
pkcs7.hashOID = testVectors[i].hashOID; pkcs7->hashOID = testVectors[i].hashOID;
pkcs7.encryptOID = testVectors[i].encryptOID; pkcs7->encryptOID = testVectors[i].encryptOID;
pkcs7.privateKey = testVectors[i].privateKey; pkcs7->privateKey = testVectors[i].privateKey;
pkcs7.privateKeySz = testVectors[i].privateKeySz; pkcs7->privateKeySz = testVectors[i].privateKeySz;
pkcs7.signedAttribs = testVectors[i].signedAttribs; pkcs7->signedAttribs = testVectors[i].signedAttribs;
pkcs7.signedAttribsSz = testVectors[i].signedAttribsSz; pkcs7->signedAttribsSz = testVectors[i].signedAttribsSz;
/* generate senderNonce */ /* generate senderNonce */
{ {
@@ -18708,7 +18735,7 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
ret = wc_RNG_GenerateBlock(&rng, &senderNonce[2], PKCS7_NONCE_SZ); ret = wc_RNG_GenerateBlock(&rng, &senderNonce[2], PKCS7_NONCE_SZ);
if (ret != 0) { if (ret != 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9411; return -9411;
} }
} }
@@ -18731,20 +18758,20 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
ret = wc_InitSha_ex(&sha, HEAP_HINT, devId); ret = wc_InitSha_ex(&sha, HEAP_HINT, devId);
if (ret != 0) { if (ret != 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9412; return -9412;
} }
wc_ShaUpdate(&sha, pkcs7.publicKey, pkcs7.publicKeySz); wc_ShaUpdate(&sha, pkcs7->publicKey, pkcs7->publicKeySz);
wc_ShaFinal(&sha, digest); wc_ShaFinal(&sha, digest);
wc_ShaFree(&sha); wc_ShaFree(&sha);
#else #else
ret = wc_InitSha256_ex(&sha, HEAP_HINT, devId); ret = wc_InitSha256_ex(&sha, HEAP_HINT, devId);
if (ret != 0) { if (ret != 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9413; return -9413;
} }
wc_Sha256Update(&sha, pkcs7.publicKey, pkcs7.publicKeySz); wc_Sha256Update(&sha, pkcs7->publicKey, pkcs7->publicKeySz);
wc_Sha256Final(&sha, digest); wc_Sha256Final(&sha, digest);
wc_Sha256Free(&sha); wc_Sha256Free(&sha);
#endif #endif
@@ -18754,10 +18781,10 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
} }
} }
encodedSz = wc_PKCS7_EncodeSignedData(&pkcs7, out, outSz); encodedSz = wc_PKCS7_EncodeSignedData(pkcs7, out, outSz);
if (encodedSz < 0) { if (encodedSz < 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9414; return -9414;
} }
@@ -18766,35 +18793,38 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
file = fopen(testVectors[i].outFileName, "wb"); file = fopen(testVectors[i].outFileName, "wb");
if (!file) { if (!file) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9415; return -9415;
} }
ret = (int)fwrite(out, 1, encodedSz, file); ret = (int)fwrite(out, 1, encodedSz, file);
fclose(file); fclose(file);
if (ret != (int)encodedSz) { if (ret != (int)encodedSz) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9416; return -9416;
} }
#endif /* PKCS7_OUTPUT_TEST_BUNDLES */ #endif /* PKCS7_OUTPUT_TEST_BUNDLES */
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
wc_PKCS7_InitWithCert(&pkcs7, NULL, 0);
ret = wc_PKCS7_VerifySignedData(&pkcs7, out, outSz); pkcs7 = wc_PKCS7_New(HEAP_HINT, INVALID_DEVID);
if (pkcs7 == NULL)
return -9410;
wc_PKCS7_InitWithCert(pkcs7, NULL, 0);
ret = wc_PKCS7_VerifySignedData(pkcs7, out, outSz);
if (ret < 0) { if (ret < 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9417; return -9417;
} }
if (pkcs7.singleCert == NULL || pkcs7.singleCertSz == 0) { if (pkcs7->singleCert == NULL || pkcs7->singleCertSz == 0) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9418; return -9418;
} }
{ {
/* check getting signed attributes */ /* check getting signed attributes */
#ifndef NO_SHA #ifndef NO_SHA
@@ -18807,25 +18837,25 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
int bufSz = 0; int bufSz = 0;
if (testVectors[i].signedAttribs != NULL && if (testVectors[i].signedAttribs != NULL &&
wc_PKCS7_GetAttributeValue(&pkcs7, oidPt, oidSz, wc_PKCS7_GetAttributeValue(pkcs7, oidPt, oidSz,
NULL, (word32*)&bufSz) != LENGTH_ONLY_E) { NULL, (word32*)&bufSz) != LENGTH_ONLY_E) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9419; return -9419;
} }
if (bufSz > (int)sizeof(buf)) { if (bufSz > (int)sizeof(buf)) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9420; return -9420;
} }
bufSz = wc_PKCS7_GetAttributeValue(&pkcs7, oidPt, oidSz, bufSz = wc_PKCS7_GetAttributeValue(pkcs7, oidPt, oidSz,
buf, (word32*)&bufSz); buf, (word32*)&bufSz);
if ((testVectors[i].signedAttribs != NULL && bufSz < 0) || if ((testVectors[i].signedAttribs != NULL && bufSz < 0) ||
(testVectors[i].signedAttribs == NULL && bufSz > 0)) { (testVectors[i].signedAttribs == NULL && bufSz > 0)) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9421; return -9421;
} }
} }
@@ -18834,14 +18864,14 @@ static int pkcs7signed_run_vectors(byte* rsaCert, word32 rsaCertSz,
file = fopen("./pkcs7cert.der", "wb"); file = fopen("./pkcs7cert.der", "wb");
if (!file) { if (!file) {
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
return -9422; return -9422;
} }
ret = (int)fwrite(pkcs7.singleCert, 1, pkcs7.singleCertSz, file); ret = (int)fwrite(pkcs7->singleCert, 1, pkcs7->singleCertSz, file);
fclose(file); fclose(file);
#endif /* PKCS7_OUTPUT_TEST_BUNDLES */ #endif /* PKCS7_OUTPUT_TEST_BUNDLES */
wc_PKCS7_Free(&pkcs7); wc_PKCS7_Free(pkcs7);
} }
XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER); XFREE(out, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);

11
wolfssl/wolfcrypt/pkcs7.h
View File

@@ -95,6 +95,9 @@ typedef struct PKCS7DecodedAttrib {
} PKCS7DecodedAttrib; } PKCS7DecodedAttrib;
/* Public Structure Warning:
* Existing members must not be changed to maintain backwards compatibility!
*/
typedef struct PKCS7 { typedef struct PKCS7 {
WC_RNG* rng; WC_RNG* rng;
PKCS7Attrib* signedAttribs; PKCS7Attrib* signedAttribs;
@@ -136,11 +139,17 @@ typedef struct PKCS7 {
int devId; /* device ID for HW based private key */ int devId; /* device ID for HW based private key */
byte issuerHash[KEYID_SIZE]; /* hash of all alt Names */ byte issuerHash[KEYID_SIZE]; /* hash of all alt Names */
byte issuerSn[MAX_SN_SZ]; /* singleCert's serial number */ byte issuerSn[MAX_SN_SZ]; /* singleCert's serial number */
byte publicKey[MAX_RSA_INT_SZ + MAX_RSA_E_SZ ];/*MAX RSA key size (m + e)*/ byte publicKey[MAX_RSA_INT_SZ + MAX_RSA_E_SZ]; /* MAX RSA key size (m + e)*/
word32 certSz[MAX_PKCS7_CERTS]; word32 certSz[MAX_PKCS7_CERTS];
/* flags - up to 32-bits */
word16 isDynamic:1;
/* !! NEW DATA MEMBERS MUST BE ADDED AT END !! */
} PKCS7; } PKCS7;
WOLFSSL_API PKCS7* wc_PKCS7_New(void* heap, int devId);
WOLFSSL_API int wc_PKCS7_Init(PKCS7* pkcs7, void* heap, int devId); WOLFSSL_API int wc_PKCS7_Init(PKCS7* pkcs7, void* heap, int devId);
WOLFSSL_API int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz); WOLFSSL_API int wc_PKCS7_InitWithCert(PKCS7* pkcs7, byte* cert, word32 certSz);
WOLFSSL_API void wc_PKCS7_Free(PKCS7* pkcs7); WOLFSSL_API void wc_PKCS7_Free(PKCS7* pkcs7);