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

fixes for static analysis checks

Browse Source
This commit is contained in:
Jacob Barthelmeh
2020-03-19 16:34:02 -06:00
parent 09dedfbe17
commit ce6aeebdb4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/pkcs12.c
View File

@ -795,7 +795,6 @@ int wc_i2d_PKCS12(WC_PKCS12* pkcs12, byte** der, int* derSz)
} }
else { else {
XMEMCPY(&sdBuf[idx], ar, tmpSz); XMEMCPY(&sdBuf[idx], ar, tmpSz);
idx += tmpSz;
} }
} }
totalSz += sdBufSz; totalSz += sdBufSz;
@ -1889,9 +1888,9 @@ static byte* PKCS12_create_key_content(WC_PKCS12* pkcs12, int nidKey,
word32 tmpSz; word32 tmpSz;
int ret; int ret;
int algo; int algo;
void* heap;
void* heap = wc_PKCS12_GetHeap(pkcs12); heap = wc_PKCS12_GetHeap(pkcs12);
*keyCiSz = 0; *keyCiSz = 0;
switch (nidKey) { switch (nidKey) {
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
@ -1987,6 +1986,7 @@ static byte* PKCS12_create_key_content(WC_PKCS12* pkcs12, int nidKey,
} }
#endif #endif
(void)heap;
return keyCi; return keyCi;
} }
@ -2009,8 +2009,9 @@ static byte* PKCS12_create_cert_content(WC_PKCS12* pkcs12, int nidCert,
word32 tmpSz; word32 tmpSz;
byte* certCi; byte* certCi;
void* heap = wc_PKCS12_GetHeap(pkcs12); void* heap;
heap = wc_PKCS12_GetHeap(pkcs12);
switch (nidCert) { switch (nidCert) {
case PBE_SHA1_RC4_128: case PBE_SHA1_RC4_128:
type = WC_PKCS12_ENCRYPTED_DATA; type = WC_PKCS12_ENCRYPTED_DATA;
@ -2133,6 +2134,7 @@ static byte* PKCS12_create_cert_content(WC_PKCS12* pkcs12, int nidCert,
} }
#endif #endif
(void)heap;
return certCi; return certCi;
} }
@ -2171,6 +2173,7 @@ static int PKCS12_create_safe(WC_PKCS12* pkcs12, byte* certCi, word32 certCiSz,
innerData = (byte*)XMALLOC(innerDataSz, pkcs12->heap, DYNAMIC_TYPE_PKCS); innerData = (byte*)XMALLOC(innerDataSz, pkcs12->heap, DYNAMIC_TYPE_PKCS);
if (innerData == NULL) { if (innerData == NULL) {
WOLFSSL_MSG("Error malloc'ing inner data buffer"); WOLFSSL_MSG("Error malloc'ing inner data buffer");
XFREE(safeData, pkcs12->heap, DYNAMIC_TYPE_TMP_BUFFER);
return MEMORY_E; return MEMORY_E;
} }
idx = 0; idx = 0;