wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible use of ForceZero with NULL pointer. Improve init of "kb" when small stack disabled, so memset isn't performed twice.

Browse Source
This commit is contained in:
David Garske
2016-06-22 07:22:30 -07:00
parent 69db94d668
commit 47c1f4e68f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/ecc.c
View File

@@ -4326,7 +4326,7 @@ static int accel_fp_mul2add(int idx1, int idx2,
#define KB_SIZE 128 #define KB_SIZE 128
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
unsigned char* kb[2]; unsigned char* kb[2] = {NULL, NULL};
#else #else
unsigned char kb[2][KB_SIZE]; unsigned char kb[2][KB_SIZE];
#endif #endif
@@ -4337,8 +4337,6 @@ static int accel_fp_mul2add(int idx1, int idx2,
if (mp_init_multi(&tka, &tkb, &order, NULL, NULL, NULL) != MP_OKAY) if (mp_init_multi(&tka, &tkb, &order, NULL, NULL, NULL) != MP_OKAY)
return MP_INIT_E; return MP_INIT_E;
XMEMSET(kb, 0, sizeof(kb));
/* if it's smaller than modulus we fine */ /* if it's smaller than modulus we fine */
if (mp_unsigned_bin_size(kA) > mp_unsigned_bin_size(modulus)) { if (mp_unsigned_bin_size(kA) > mp_unsigned_bin_size(modulus)) {
/* find order */ /* find order */
@@ -4526,8 +4524,10 @@ done:
mp_clear(&order); mp_clear(&order);
#endif #endif
ForceZero(kb[0], KB_SIZE); if (kb[0])
ForceZero(kb[1], KB_SIZE); ForceZero(kb[0], KB_SIZE);
if (kb[1])
ForceZero(kb[1], KB_SIZE);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(kb[0], NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(kb[0], NULL, DYNAMIC_TYPE_TMP_BUFFER);