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

wolfcrypt/src/ecc.c: fix uncompilable !WOLFSSL_SP_MATH && WOLFSSL_SMALL_STACK_CACHE implementations of ecc_key_tmp_init() and ecc_key_tmp_free() (the latter misnamed ecc_key_tmp_final()).

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-08-20 13:57:01 -05:00
parent 836915d05f
commit 9ab1df690a
1 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wolfcrypt/src/ecc.c
View File

@ -2898,9 +2898,8 @@ static int ecc_key_tmp_init(ecc_key* key, void* heap)
return err; return err;
} }
static void ecc_key_tmp_final(ecc_key* key, void* heap) static void ecc_key_tmp_free(ecc_key* key, void* heap)
{ {
(void)heap;
#ifdef ALT_ECC_SIZE #ifdef ALT_ECC_SIZE
if (key->z != NULL) if (key->z != NULL)
XFREE(key->z, heap, DYNAMIC_TYPE_ECC); XFREE(key->z, heap, DYNAMIC_TYPE_ECC);
@ -3005,7 +3004,7 @@ exit:
} }
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
R->key = NULL; R->key = NULL;
ecc_key_tmp_final(&key, heap); ecc_key_tmp_free(&key, heap);
#endif /* WOLFSSL_SMALL_STACK_CACHE */ #endif /* WOLFSSL_SMALL_STACK_CACHE */
return err; return err;
@ -3139,23 +3138,6 @@ int wc_ecc_mulmod_ex2(mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
if (err == MP_OKAY) if (err == MP_OKAY)
err = ecc_mulmod(&t, tG, R, M, a, modulus, mp, rng); err = ecc_mulmod(&t, tG, R, M, a, modulus, mp, rng);
/* Check for k == 1 or k == order+1. Result will be 0 point which is not
* correct. Calculates 2 * order and get 0 point then adds base point
* which results in 0 point with constant time implementation)
*/
if (err == MP_OKAY)
err = mp_add_d(order, 1, &t);
if (err == MP_OKAY) {
int kIsOne = (mp_cmp_d(k, 1) == MP_EQ) | (mp_cmp(k, &t) == MP_EQ);
err = mp_cond_copy(tG->x, kIsOne, R->x);
if (err == 0) {
err = mp_cond_copy(tG->y, kIsOne, R->y);
}
if (err == 0) {
err = mp_cond_copy(tG->z, kIsOne, R->z);
}
}
mp_forcezero(&t); mp_forcezero(&t);
mp_free(&t); mp_free(&t);
#else #else
@ -3176,7 +3158,7 @@ exit:
} }
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
R->key = NULL; R->key = NULL;
ecc_key_tmp_final(&key, heap); ecc_key_tmp_free(&key, heap);
#endif /* WOLFSSL_SMALL_STACK_CACHE */ #endif /* WOLFSSL_SMALL_STACK_CACHE */
return err; return err;