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

Fix LUT cache implementation

Browse Source 
- Make sure that the cache is actually set (and not just depend on the LRU_count)
- test_wolfSSL_EC should also be run without ECC_SHAMIR
This commit is contained in:
Juliusz Sosinowicz
2020-05-12 13:48:59 +02:00
parent 6c9a0e440e
commit 3d2cbdd3e8
2 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/api.c
View File

@ -1789,7 +1789,7 @@ static int test_wolfSSL_SetMinVersion(void)
# if defined(OPENSSL_EXTRA)
static void test_wolfSSL_EC(void)
{
#if defined(HAVE_ECC) && defined(ECC_SHAMIR)
#if defined(HAVE_ECC)
BN_CTX *ctx;
EC_GROUP *group;
EC_POINT *Gxy, *new_point, *set_point;
@ -1853,14 +1853,23 @@ static void test_wolfSSL_EC(void)
#ifndef HAVE_SELFTEST
/* perform point multiplication */
AssertIntEQ(EC_POINT_mul(group, new_point, Gx, Gxy, k, ctx), WOLFSSL_SUCCESS);
AssertIntEQ(BN_is_zero(new_point->X), 0);
AssertIntEQ(BN_is_zero(new_point->Y), 0);
AssertIntEQ(BN_is_zero(new_point->Z), 0);
AssertIntEQ(EC_POINT_mul(group, new_point, NULL, Gxy, k, ctx), WOLFSSL_SUCCESS);
AssertIntEQ(BN_is_zero(new_point->X), 0);
AssertIntEQ(BN_is_zero(new_point->Y), 0);
AssertIntEQ(BN_is_zero(new_point->Z), 0);
AssertIntEQ(EC_POINT_mul(group, new_point, Gx, NULL, NULL, ctx), WOLFSSL_SUCCESS);
AssertIntEQ(BN_is_zero(new_point->X), 0);
AssertIntEQ(BN_is_zero(new_point->Y), 0);
AssertIntEQ(BN_is_zero(new_point->Z), 0);
#else
AssertIntEQ(EC_POINT_set_affine_coordinates_GFp(group, new_point, Gx, Gy, ctx), WOLFSSL_SUCCESS);
#endif
/* check if point X coordinate is zero */
AssertIntEQ(BN_is_zero(new_point->X), 0);
AssertIntEQ(BN_is_zero(new_point->Y), 0);
AssertIntEQ(BN_is_zero(new_point->Z), 0);
#endif
/* Force non-affine coordinates */
AssertIntEQ(BN_add(new_point->Z, (WOLFSSL_BIGNUM*)BN_value_one(),

27
wolfcrypt/src/ecc.c
View File

@ -8092,6 +8092,7 @@ int wc_ecc_sig_size(ecc_key* key)
typedef struct {
ecc_point* g; /* cached COPY of base point */
ecc_point* LUT[1U<<FP_LUT]; /* fixed point lookup */
int LUT_set; /* flag to determine if the LUT has been computed */
mp_int mu; /* copy of the montgomery constant */
int lru_count; /* amount of times this entry has been used */
int lock; /* flag to indicate cache eviction */
@ -8665,6 +8666,7 @@ static int find_hole(void)
wc_ecc_del_point(fp_cache[z].LUT[x]);
fp_cache[z].LUT[x] = NULL;
}
fp_cache[z].LUT_set = 0;
fp_cache[z].lru_count = 0;
}
return z;
@ -8722,6 +8724,7 @@ static int add_entry(int idx, ecc_point *g)
}
}
fp_cache[idx].LUT_set = 0;
fp_cache[idx].lru_count = 0;
return MP_OKAY;
@ -8853,8 +8856,10 @@ static int build_lut(int idx, mp_int* a, mp_int* modulus, mp_digit mp,
mp_clear(&tmp);
if (err == MP_OKAY)
return MP_OKAY;
if (err == MP_OKAY) {
fp_cache[idx].LUT_set = 1;
return MP_OKAY;
}
/* err cleanup */
for (y = 0; y < (1U<<FP_LUT); y++) {
@ -8863,6 +8868,7 @@ static int build_lut(int idx, mp_int* a, mp_int* modulus, mp_digit mp,
}
wc_ecc_del_point(fp_cache[idx].g);
fp_cache[idx].g = NULL;
fp_cache[idx].LUT_set = 0;
fp_cache[idx].lru_count = 0;
mp_clear(&fp_cache[idx].mu);
@ -9426,8 +9432,8 @@ int ecc_mul2add(ecc_point* A, mp_int* kA,
}
if (err == MP_OKAY) {
/* if it's 2 build the LUT, if it's higher just use the LUT */
if (idx1 >= 0 && fp_cache[idx1].lru_count == 2) {
/* if it's >=2 build the LUT, if it's higher just use the LUT */
if (idx1 >= 0 && fp_cache[idx1].lru_count >= 2 && !fp_cache[idx1].LUT_set) {
/* compute mp */
err = mp_montgomery_setup(modulus, &mp);
@ -9443,8 +9449,8 @@ int ecc_mul2add(ecc_point* A, mp_int* kA,
}
if (err == MP_OKAY) {
/* if it's 2 build the LUT, if it's higher just use the LUT */
if (idx2 >= 0 && fp_cache[idx2].lru_count == 2) {
/* if it's >=2 build the LUT, if it's higher just use the LUT */
if (idx2 >= 0 && fp_cache[idx2].lru_count >= 2 && !fp_cache[idx2].LUT_set) {
if (mpInit == 0) {
/* compute mp */
err = mp_montgomery_setup(modulus, &mp);
@ -9462,8 +9468,8 @@ int ecc_mul2add(ecc_point* A, mp_int* kA,
if (err == MP_OKAY) {
if (idx1 >=0 && idx2 >= 0 && fp_cache[idx1].lru_count >= 2 &&
fp_cache[idx2].lru_count >= 2) {
if (idx1 >=0 && idx2 >= 0 && fp_cache[idx1].LUT_set &&
fp_cache[idx2].LUT_set) {
if (mpInit == 0) {
/* compute mp */
err = mp_montgomery_setup(modulus, &mp);
@ -9540,7 +9546,7 @@ int wc_ecc_mulmod_ex(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
if (err == MP_OKAY) {
/* if it's 2 build the LUT, if it's higher just use the LUT */
if (idx >= 0 && fp_cache[idx].lru_count == 2) {
if (idx >= 0 && fp_cache[idx].lru_count >= 2 && !fp_cache[idx].LUT_set) {
/* compute mp */
err = mp_montgomery_setup(modulus, &mp);
@ -9557,7 +9563,7 @@ int wc_ecc_mulmod_ex(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
}
if (err == MP_OKAY) {
if (idx >= 0 && fp_cache[idx].lru_count >= 2) {
if (idx >= 0 && fp_cache[idx].LUT_set) {
if (mpSetup == 0) {
/* compute mp */
err = mp_montgomery_setup(modulus, &mp);
@ -9609,6 +9615,7 @@ static void wc_ecc_fp_free_cache(void)
wc_ecc_del_point(fp_cache[x].g);
fp_cache[x].g = NULL;
mp_clear(&fp_cache[x].mu);
fp_cache[x].LUT_set = 0;
fp_cache[x].lru_count = 0;
fp_cache[x].lock = 0;
}