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

Merge pull request #353 from dgarske/EccUnsignedSizeCheckFix

Browse Source 
Fixed bug where mp_unsigned_bin_size returning 0 could produce a UINT…
This commit is contained in:
toddouska
2016-03-17 10:50:01 -07:00
parent 46a01c29d8 19967dd264
commit 10e74f7200
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/ecc.c
View File

@@ -4199,7 +4199,10 @@ static int accel_fp_mul(int idx, mp_int* k, ecc_point *R, mp_int* modulus,
else {
/* let's reverse kb so it's little endian */
x = 0;
y = mp_unsigned_bin_size(&tk) - 1;
y = mp_unsigned_bin_size(&tk);
if (y > 0) {
y -= 1;
}
mp_clear(&tk);
while ((unsigned)x < y) {
@@ -4401,7 +4404,10 @@ static int accel_fp_mul2add(int idx1, int idx2,
/* let's reverse kb so it's little endian */
x = 0;
y = mp_unsigned_bin_size(&tka) - 1;
y = mp_unsigned_bin_size(&tka);
if (y > 0) {
y -= 1;
}
mp_clear(&tka);
while ((unsigned)x < y) {
z = kb[0][x]; kb[0][x] = kb[0][y]; kb[0][y] = z;
@@ -4423,7 +4429,10 @@ static int accel_fp_mul2add(int idx1, int idx2,
}
else {
x = 0;
y = mp_unsigned_bin_size(&tkb) - 1;
y = mp_unsigned_bin_size(&tkb);
if (y > 0) {
y -= 1;
}
mp_clear(&tkb);
while ((unsigned)x < y) {
z = kb[1][x]; kb[1][x] = kb[1][y]; kb[1][y] = z;

33
wolfcrypt/test/test.c
View File

@@ -6268,6 +6268,14 @@ static int ecc_test_raw_vector(const rawEccVector* vector, ecc_key* userA,
}
#endif /* HAVE_ECC_VECTOR_TEST */
#undef ECC_TEST_KEY_SIZE
#define ECC_TEST_KEY_SIZE 32
#define ECC_TEST_VERIFY_COUNT 1
#ifdef FP_ECC
#undef ECC_TEST_VERIFY_COUNT
#define ECC_TEST_VERIFY_COUNT 2
#define ECC_TEST_VERIFY_ZERO
#endif
int ecc_test(void)
{
WC_RNG rng;
@@ -6314,7 +6322,7 @@ int ecc_test(void)
wc_ecc_init(&userB);
wc_ecc_init(&pubKey);
ret = wc_ecc_make_key(&rng, 32, &userA);
ret = wc_ecc_make_key(&rng, ECC_TEST_KEY_SIZE, &userA);
if (ret != 0)
return -1014;
@@ -6322,7 +6330,7 @@ int ecc_test(void)
if (ret != 0)
return -1024;
ret = wc_ecc_make_key(&rng, 32, &userB);
ret = wc_ecc_make_key(&rng, ECC_TEST_KEY_SIZE, &userB);
if (ret != 0)
return -1002;
@@ -6398,8 +6406,13 @@ int ecc_test(void)
#ifdef HAVE_ECC_SIGN
/* test DSA sign hash */
for (i = 0; i < (int)sizeof(digest); i++)
for (i = 0; i < (int)sizeof(digest); i++) {
#ifdef ECC_TEST_VERIFY_ZERO
digest[i] = 0;
#else
digest[i] = (byte)i;
#endif
}
x = sizeof(sig);
ret = wc_ecc_sign_hash(digest, sizeof(digest), sig, &x, &rng, &userA);
@@ -6408,12 +6421,14 @@ int ecc_test(void)
return -1014;
#ifdef HAVE_ECC_VERIFY
verify = 0;
ret = wc_ecc_verify_hash(sig, x, digest, sizeof(digest), &verify, &userA);
if (ret != 0)
return -1015;
if (verify != 1)
return -1016;
for (i=0; i<ECC_TEST_VERIFY_COUNT; i++) {
verify = 0;
ret = wc_ecc_verify_hash(sig, x, digest, sizeof(digest), &verify, &userA);
if (ret != 0)
return -1015;
if (verify != 1)
return -1016;
}
#endif /* HAVE_ECC_VERIFY */
#endif /* HAVE_ECC_SIGN */