WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

valgrind testing

pull/1898/head
JacobBarthelmeh 2018-10-12 10:21:39 -07:00 committed by David Garske
parent 5d8f59d83b
commit b0e4cb3572
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wolfcrypt/src/pkcs7.c
View File

@ -5280,6 +5280,7 @@ int wc_PKCS7_AddRecipient_ORI(PKCS7* pkcs7, CallbackOriEncrypt oriEncryptCb,
pkcs7->heap, DYNAMIC_TYPE_PKCS7); pkcs7->heap, DYNAMIC_TYPE_PKCS7);
if (recip == NULL) if (recip == NULL)
return MEMORY_E; return MEMORY_E;
XMEMSET(recip, 0, sizeof(Pkcs7EncodedRecip));
/* get key size for content-encryption key based on algorithm */ /* get key size for content-encryption key based on algorithm */
blockKeySz = wc_PKCS7_GetOIDKeySize(pkcs7->encryptOID); blockKeySz = wc_PKCS7_GetOIDKeySize(pkcs7->encryptOID);
@ -9439,7 +9440,7 @@ static int wc_PKCS7_DecodeUnprotectedAttributes(PKCS7* pkcs7, byte* pkiMsg,
int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz, int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
byte* output, word32 outputSz) byte* output, word32 outputSz)
{ {
int ret = 0, version, length, haveAttribs; int ret = 0, version, length, haveAttribs = 0;
word32 idx = 0, tmpIdx = 0; word32 idx = 0, tmpIdx = 0;
word32 contentType, encOID; word32 contentType, encOID;
@ -9633,6 +9634,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
/* use IV buffer from stream structure */ /* use IV buffer from stream structure */
tmpIv = pkcs7->stream->tmpIv; tmpIv = pkcs7->stream->tmpIv;
length = pkcs7->stream->expected;
#endif #endif
XMEMCPY(tmpIv, &pkiMsg[idx], length); XMEMCPY(tmpIv, &pkiMsg[idx], length);
idx += length; idx += length;
@ -9705,6 +9707,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
XMEMCPY(output, encryptedContent, encryptedContentSz - padLen); XMEMCPY(output, encryptedContent, encryptedContentSz - padLen);
/* get implicit[1] unprotected attributes, optional */ /* get implicit[1] unprotected attributes, optional */
wc_PKCS7_FreeDecodedAttrib(pkcs7->decodedAttrib, pkcs7->heap);
pkcs7->decodedAttrib = NULL; pkcs7->decodedAttrib = NULL;
#ifndef NO_PKCS7_STREAM #ifndef NO_PKCS7_STREAM
if (pkcs7->stream->hasAtrib) { if (pkcs7->stream->hasAtrib) {