Fixed scan-build warning about "len" being used un-initialized in ecc_mul2add. Cleanup of the "mu" variable handling.

This commit is contained in:
David Garske
2016-05-11 09:04:59 -07:00
parent 7c5483ba0b
commit 237193fdee

View File

@@ -2019,7 +2019,6 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
unsigned char* tB; unsigned char* tB;
int err = MP_OKAY, first, x, y; int err = MP_OKAY, first, x, y;
mp_digit mp; mp_digit mp;
mp_int mu;
/* argchks */ /* argchks */
if (A == NULL || kA == NULL || B == NULL || kB == NULL || C == NULL || if (A == NULL || kA == NULL || B == NULL || kB == NULL || C == NULL ||
@@ -2042,9 +2041,7 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
XMEMSET(tA, 0, ECC_BUFSIZE); XMEMSET(tA, 0, ECC_BUFSIZE);
XMEMSET(tB, 0, ECC_BUFSIZE); XMEMSET(tB, 0, ECC_BUFSIZE);
XMEMSET(precomp, 0, sizeof(precomp)); XMEMSET(precomp, 0, sizeof(precomp));
err = mp_init(&mu);
if (err == MP_OKAY) {
/* get sizes */ /* get sizes */
lenA = mp_unsigned_bin_size(kA); lenA = mp_unsigned_bin_size(kA);
lenB = mp_unsigned_bin_size(kB); lenB = mp_unsigned_bin_size(kB);
@@ -2054,7 +2051,6 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
if ((lenA > ECC_BUFSIZE) || (lenB > ECC_BUFSIZE)) { if ((lenA > ECC_BUFSIZE) || (lenB > ECC_BUFSIZE)) {
err = BAD_FUNC_ARG; err = BAD_FUNC_ARG;
} }
}
if (err == MP_OKAY) { if (err == MP_OKAY) {
/* extract and justify kA */ /* extract and justify kA */
@@ -2083,7 +2079,10 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
/* init montgomery reduction */ /* init montgomery reduction */
err = mp_montgomery_setup(modulus, &mp); err = mp_montgomery_setup(modulus, &mp);
if (err == MP_OKAY) if (err == MP_OKAY) {
mp_int mu;
err = mp_init(&mu);
if (err == MP_OKAY) {
err = mp_montgomery_calc_normalization(&mu, modulus); err = mp_montgomery_calc_normalization(&mu, modulus);
if (err == MP_OKAY) if (err == MP_OKAY)
@@ -2104,6 +2103,8 @@ static int ecc_mul2add(ecc_point* A, mp_int* kA,
/* done with mu */ /* done with mu */
mp_clear(&mu); mp_clear(&mu);
}
}
if (err == MP_OKAY) if (err == MP_OKAY)
/* precomp [i,0](A + B) table */ /* precomp [i,0](A + B) table */