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

use ForceZero instead of MEMSET in PKCS7 signed attribute handling

Browse Source
This commit is contained in:
Chris Conlon
2019-07-16 08:13:47 -07:00
parent 7367da3fb6
commit d51b958334
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/pkcs7.c
View File

@ -1313,14 +1313,14 @@ static void FreeAttribArray(PKCS7* pkcs7, FlatAttrib** arr, int rows)
for (i = 0; i < rows; i++) { for (i = 0; i < rows; i++) {
if (arr[i]) { if (arr[i]) {
if (arr[i]->data) { if (arr[i]->data) {
XMEMSET(arr[i]->data, 0, arr[i]->dataSz); ForceZero(arr[i]->data, arr[i]->dataSz);
XFREE(arr[i]->data, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(arr[i]->data, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);
} }
XMEMSET(arr[i], 0, sizeof(FlatAttrib)); ForceZero(arr[i], sizeof(FlatAttrib));
XFREE(arr[i], pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(arr[i], pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);
} }
} }
XMEMSET(arr, 0, rows); ForceZero(arr, rows);
XFREE(arr, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(arr, pkcs7->heap, DYNAMIC_TYPE_TMP_BUFFER);
} }
(void)pkcs7; (void)pkcs7;
@ -1426,7 +1426,7 @@ static int FlattenAttributes(PKCS7* pkcs7, byte* output, EncodedAttrib* ea,
if (derArr == NULL) { if (derArr == NULL) {
return MEMORY_E; return MEMORY_E;
} }
XMEMSET(derArr, 0, eaSz); ForceZero(derArr, eaSz);
for (i = 0; i < eaSz; i++) { for (i = 0; i < eaSz; i++) {
derArr[i] = (FlatAttrib*) XMALLOC(sizeof(FlatAttrib), pkcs7->heap, derArr[i] = (FlatAttrib*) XMALLOC(sizeof(FlatAttrib), pkcs7->heap,
@ -1435,7 +1435,7 @@ static int FlattenAttributes(PKCS7* pkcs7, byte* output, EncodedAttrib* ea,
FreeAttribArray(pkcs7, derArr, eaSz); FreeAttribArray(pkcs7, derArr, eaSz);
return MEMORY_E; return MEMORY_E;
} }
XMEMSET(derArr[i], 0, sizeof(FlatAttrib)); ForceZero(derArr[i], sizeof(FlatAttrib));
} }
/* flatten EncodedAttrib into DER byte arrays */ /* flatten EncodedAttrib into DER byte arrays */