feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

1. Resized sample PKCS7 signed data attribute.

Browse Source 
2. Removed unnecessary PKCS7 signed data attribute.
This commit is contained in:
John Safranek
2014-01-21 11:45:15 -08:00
parent 8541c2cc97
commit 15f94b2f98
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ctaocrypt/test/test.c
View File

@@ -4144,13 +4144,9 @@ int pkcs7signed_test(void)
byte senderNonceOid[] = byte senderNonceOid[] =
{ 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01, { 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01,
0x09, 0x05 }; 0x09, 0x05 };
byte pkiStatusOid[] =
{ 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01,
0x09, 0x03 };
byte transId[(SHA_DIGEST_SIZE + 1) * 2 + 1]; byte transId[(SHA_DIGEST_SIZE + 1) * 2 + 1];
byte messageType[] = { 0x13, 2, '1', '9' }; byte messageType[] = { 0x13, 2, '1', '9' };
byte senderNonce[34]; byte senderNonce[PKCS7_NONCE_SZ + 2];
byte pkiStatus[] = { 0x13, 1, '0' };
PKCS7Attrib attribs[] = PKCS7Attrib attribs[] =
{ {
@@ -4159,9 +4155,7 @@ int pkcs7signed_test(void)
{ messageTypeOid, sizeof(messageTypeOid), { messageTypeOid, sizeof(messageTypeOid),
messageType, sizeof(messageType) }, messageType, sizeof(messageType) },
{ senderNonceOid, sizeof(senderNonceOid), { senderNonceOid, sizeof(senderNonceOid),
senderNonce, sizeof(senderNonce) }, senderNonce, sizeof(senderNonce) }
{ pkiStatusOid, sizeof(pkiStatusOid),
pkiStatus, sizeof(pkiStatus) }
}; };
dataSz = (word32) strlen(data); dataSz = (word32) strlen(data);
@@ -4203,8 +4197,8 @@ int pkcs7signed_test(void)
ret = InitRng(&rng); ret = InitRng(&rng);
senderNonce[0] = 0x04; senderNonce[0] = 0x04;
senderNonce[1] = 0x20; senderNonce[1] = PKCS7_NONCE_SZ;
RNG_GenerateBlock(&rng, &senderNonce[2], 32); RNG_GenerateBlock(&rng, &senderNonce[2], PKCS7_NONCE_SZ);
PKCS7_InitWithCert(&msg, certDer, certDerSz); PKCS7_InitWithCert(&msg, certDer, certDerSz);
msg.privateKey = keyDer; msg.privateKey = keyDer;

1
cyassl/ctaocrypt/pkcs7.h
View File

@@ -47,6 +47,7 @@ enum PKCS7_TYPES {
}; };
enum Pkcs7_Misc { enum Pkcs7_Misc {
PKCS7_NONCE_SZ = 16,
MAX_ENCRYPTED_KEY_SZ = 512, /* max enc. key size, RSA <= 4096 */ MAX_ENCRYPTED_KEY_SZ = 512, /* max enc. key size, RSA <= 4096 */
MAX_CONTENT_KEY_LEN = DES3_KEYLEN, /* highest current cipher is 3DES */ MAX_CONTENT_KEY_LEN = DES3_KEYLEN, /* highest current cipher is 3DES */
MAX_RECIP_SZ = MAX_VERSION_SZ + MAX_RECIP_SZ = MAX_VERSION_SZ +