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

pkcs7: avoid initial value of pointer to auto value for embedded compilers

Browse Source
This commit is contained in:
Takashi Kojo
2015-08-29 21:22:30 +09:00
parent 572a8cfc11
commit cf80a6f639
3 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/ge_low_mem.c
View File

@@ -229,7 +229,7 @@ const ge_p3 ed25519_base = {
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66
}, },
{1, 0} {1, 0},
{ {
0xa3, 0xdd, 0xb7, 0xa5, 0xb3, 0x8a, 0xde, 0x6d, 0xa3, 0xdd, 0xb7, 0xa5, 0xb3, 0x8a, 0xde, 0x6d,
0xf5, 0x52, 0x51, 0x77, 0x80, 0x9f, 0xf0, 0x20, 0xf5, 0x52, 0x51, 0x77, 0x80, 0x9f, 0xf0, 0x20,
@@ -243,7 +243,7 @@ const ge_p3 ed25519_base = {
const ge_p3 ed25519_neutral = { const ge_p3 ed25519_neutral = {
{0}, {0},
{1, 0}, {1, 0},
{1, 0} {1, 0},
{0}, {0},
}; };

43
wolfcrypt/src/pkcs7.c
View File

@@ -52,19 +52,19 @@
WOLFSSL_LOCAL int wc_SetContentType(int pkcs7TypeOID, byte* output) WOLFSSL_LOCAL int wc_SetContentType(int pkcs7TypeOID, byte* output)
{ {
/* PKCS#7 content types, RFC 2315, section 14 */ /* PKCS#7 content types, RFC 2315, section 14 */
static const byte pkcs7[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte pkcs7[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07 }; 0x0D, 0x01, 0x07 };
static const byte data[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte data[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x01 }; 0x0D, 0x01, 0x07, 0x01 };
static const byte signedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte signedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x02}; 0x0D, 0x01, 0x07, 0x02};
static const byte envelopedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte envelopedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x03 }; 0x0D, 0x01, 0x07, 0x03 };
static const byte signedAndEnveloped[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte signedAndEnveloped[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x04 }; 0x0D, 0x01, 0x07, 0x04 };
static const byte digestedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte digestedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x05 }; 0x0D, 0x01, 0x07, 0x05 };
static const byte encryptedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, const byte encryptedData[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7,
0x0D, 0x01, 0x07, 0x06 }; 0x0D, 0x01, 0x07, 0x06 };
int idSz; int idSz;
@@ -430,14 +430,17 @@ int wc_PKCS7_EncodeSignedData(PKCS7* pkcs7, byte* output, word32 outputSz)
{ ASN_OBJECT_ID, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, { ASN_OBJECT_ID, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
0x09, 0x04 }; 0x09, 0x04 };
PKCS7Attrib cannedAttribs[2] = PKCS7Attrib cannedAttribs[2] ;
{
{ contentTypeOid, sizeof(contentTypeOid),
contentType, sizeof(contentType) },
{ messageDigestOid, sizeof(messageDigestOid),
esd->contentDigest, sizeof(esd->contentDigest) }
};
word32 cannedAttribsCount = sizeof(cannedAttribs)/sizeof(PKCS7Attrib); word32 cannedAttribsCount = sizeof(cannedAttribs)/sizeof(PKCS7Attrib);
cannedAttribs[0].oid = contentTypeOid ;
cannedAttribs[0].oidSz = sizeof(contentTypeOid) ;
cannedAttribs[0].value = contentType ;
cannedAttribs[0].valueSz = sizeof(contentType) ;
cannedAttribs[1].oid = messageDigestOid ;
cannedAttribs[1].oidSz = sizeof(messageDigestOid) ;
cannedAttribs[1].value = esd->contentDigest ;
cannedAttribs[1].valueSz = sizeof(esd->contentDigest) ;
esd->signedAttribsCount += cannedAttribsCount; esd->signedAttribsCount += cannedAttribsCount;
esd->signedAttribsSz += EncodeAttributes(&esd->signedAttribs[0], 2, esd->signedAttribsSz += EncodeAttributes(&esd->signedAttribs[0], 2,
@@ -881,14 +884,14 @@ int wc_PKCS7_VerifySignedData(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz)
{ {
word32 scratch = 0; word32 scratch = 0;
int plainSz = 0; int plainSz = 0;
int digestSz = MAX_SEQ_SZ + MAX_ALGO_SZ + #define DIGEST_SZ (MAX_SEQ_SZ + MAX_ALGO_SZ +\
MAX_OCTET_STR_SZ + SHA_DIGEST_SIZE; MAX_OCTET_STR_SZ + SHA_DIGEST_SIZE)
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
byte* digest; byte* digest;
RsaKey* key; RsaKey* key;
digest = (byte*)XMALLOC(digestSz, NULL, DYNAMIC_TYPE_TMP_BUFFER); digest = (byte*)XMALLOC(DIGEST_SZ, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (digest == NULL) if (digest == NULL)
return MEMORY_E; return MEMORY_E;
@@ -900,12 +903,12 @@ int wc_PKCS7_VerifySignedData(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz)
return MEMORY_E; return MEMORY_E;
} }
#else #else
byte digest[digestSz]; byte digest[DIGEST_SZ];
RsaKey stack_key; RsaKey stack_key;
RsaKey* key = &stack_key; RsaKey* key = &stack_key;
#endif #endif
XMEMSET(digest, 0, digestSz); XMEMSET(digest, 0, DIGEST_SZ);
ret = wc_InitRsaKey(key, NULL); ret = wc_InitRsaKey(key, NULL);
if (ret != 0) { if (ret != 0) {
@@ -925,7 +928,7 @@ int wc_PKCS7_VerifySignedData(PKCS7* pkcs7, byte* pkiMsg, word32 pkiMsgSz)
return PUBLIC_KEY_E; return PUBLIC_KEY_E;
} }
plainSz = wc_RsaSSL_Verify(sig, sigSz, digest, digestSz, key); plainSz = wc_RsaSSL_Verify(sig, sigSz, digest, DIGEST_SZ, key);
wc_FreeRsaKey(key); wc_FreeRsaKey(key);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK

12
wolfcrypt/test/test.c
View File

@@ -6397,18 +6397,18 @@ int pkcs7signed_test(void)
PKCS7 msg; PKCS7 msg;
WC_RNG rng; WC_RNG rng;
byte transIdOid[] = static byte transIdOid[] =
{ 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01, { 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01,
0x09, 0x07 }; 0x09, 0x07 };
byte messageTypeOid[] = static byte messageTypeOid[] =
{ 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01, { 0x06, 0x0a, 0x60, 0x86, 0x48, 0x01, 0x86, 0xF8, 0x45, 0x01,
0x09, 0x02 }; 0x09, 0x02 };
byte senderNonceOid[] = static 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 transId[(SHA_DIGEST_SIZE + 1) * 2 + 1]; static byte transId[(SHA_DIGEST_SIZE + 1) * 2 + 1];
byte messageType[] = { 0x13, 2, '1', '9' }; static byte messageType[] = { 0x13, 2, '1', '9' };
byte senderNonce[PKCS7_NONCE_SZ + 2]; static byte senderNonce[PKCS7_NONCE_SZ + 2];
PKCS7Attrib attribs[] = PKCS7Attrib attribs[] =
{ {