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

Merge pull request #505 from toddouska/timing

Browse Source 
fix scan-build warning on ecc memory alloc failure
This commit is contained in:
dgarske
2016-07-27 15:52:01 -07:00
committed by GitHub
parent 6cd4acbdba 7cf0b8fe85
commit 303561c1a1
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfcrypt/src/ecc.c
View File

@ -1675,13 +1675,18 @@ int wc_ecc_mulmod_ex(mp_int* k, ecc_point *G, ecc_point *R,
/* init variables */ /* init variables */
tG = NULL; tG = NULL;
XMEMSET(M, 0, sizeof(M)); XMEMSET(M, 0, sizeof(M));
err = mp_init(&mu);
/* init montgomery reduction */ /* init montgomery reduction */
if (err == MP_OKAY) if ((err = mp_montgomery_setup(modulus, &mp)) != MP_OKAY) {
err = mp_montgomery_setup(modulus, &mp); return err;
if (err == MP_OKAY) }
err = mp_montgomery_calc_normalization(&mu, modulus); if ((err = mp_init(&mu)) != MP_OKAY) {
return err;
}
if ((err = mp_montgomery_calc_normalization(&mu, modulus)) != MP_OKAY) {
mp_clear(&mu);
return err;
}
/* alloc ram for window temps */ /* alloc ram for window temps */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
@ -1903,21 +1908,28 @@ int wc_ecc_mulmod_ex(mp_int* k, ecc_point *G, ecc_point *R,
/* init variables */ /* init variables */
tG = NULL; tG = NULL;
XMEMSET(M, 0, sizeof(M)); XMEMSET(M, 0, sizeof(M));
err = mp_init(&mu);
/* init montgomery reduction */ /* init montgomery reduction */
if (err == MP_OKAY) if ((err = mp_montgomery_setup(modulus, &mp)) != MP_OKAY) {
err = mp_montgomery_setup(modulus, &mp); return err;
if (err == MP_OKAY) }
err = mp_montgomery_calc_normalization(&mu, modulus); if ((err = mp_init(&mu)) != MP_OKAY) {
return err;
}
if ((err = mp_montgomery_calc_normalization(&mu, modulus)) != MP_OKAY) {
mp_clear(&mu);
return err;
}
/* alloc ram for window temps */ /* alloc ram for window temps */
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
M[i] = wc_ecc_new_point_h(heap); M[i] = wc_ecc_new_point_h(heap);
if (M[i] == NULL) { if (M[i] == NULL) {
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
wc_ecc_del_point(M[j]); wc_ecc_del_point_h(M[j], heap);
} }
mp_clear(&mu);
return MEMORY_E;
} }
} }