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

ECC: make public APIS for add and double points

Browse Source 
Use internal API internally.
This commit is contained in:
Sean Parkinson
2022-04-11 09:19:23 +10:00
parent cd1344bbed
commit b6db087a62
1 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
wolfcrypt/src/ecc.c
View File

@ -1653,6 +1653,8 @@ static void alt_fp_init(mp_int* a)
!defined(WOLFSSL_CRYPTOCELL) && !defined(WOLF_CRYPTO_CB_ONLY_ECC)
#if !defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_PUBLIC_ECC_ADD_DBL)
static int _ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int* modulus, mp_digit mp);
/**
Add two ECC points
@ -1664,8 +1666,8 @@ static void alt_fp_init(mp_int* a)
mp The "b" value from montgomery_setup()
return MP_OKAY on success
*/
int ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
mp_int* a, mp_int* modulus, mp_digit mp)
static int _ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
mp_int* a, mp_int* modulus, mp_digit mp)
{
#if !defined(WOLFSSL_SP_MATH)
#ifdef WOLFSSL_SMALL_STACK
@ -1685,10 +1687,6 @@ int ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
mp_int *x, *y, *z;
int err;
if (P == NULL || Q == NULL || R == NULL || modulus == NULL) {
return ECC_BAD_ARG_E;
}
/* if Q == R then swap P and Q, so we don't require a local x,y,z */
if (Q == R) {
ecc_point* tPt = P;
@ -1779,7 +1777,7 @@ int ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
XFREE(t1, NULL, DYNAMIC_TYPE_ECC);
}
#endif
return ecc_projective_dbl_point(P, R, a, modulus, mp);
return _ecc_projective_dbl_point(P, R, a, modulus, mp);
}
}
@ -1981,23 +1979,7 @@ done:
return err;
#else
int modBits;
if (P == NULL || Q == NULL || R == NULL || modulus == NULL) {
return ECC_BAD_ARG_E;
}
modBits = mp_count_bits(modulus);
#ifdef WOLFSSL_PUBLIC_ECC_ADD_DBL
if ((mp_count_bits(P->x) > modBits) ||
(mp_count_bits(P->y) > modBits) ||
(mp_count_bits(P->z) > modBits) ||
(mp_count_bits(Q->x) > modBits) ||
(mp_count_bits(Q->y) > modBits) ||
(mp_count_bits(Q->z) > modBits)) {
return ECC_OUT_OF_RANGE_E;
}
#endif
int modBits = mp_count_bits(modulus);
(void)a;
(void)mp;
@ -2024,6 +2006,25 @@ done:
#endif
}
int ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
mp_int* a, mp_int* modulus, mp_digit mp)
{
if (P == NULL || Q == NULL || R == NULL || modulus == NULL) {
return ECC_BAD_ARG_E;
}
if (mp_cmp(P->x, modulus) != MP_LT ||
mp_cmp(P->y, modulus) != MP_LT ||
mp_cmp(P->z, modulus) != MP_LT ||
mp_cmp(Q->x, modulus) != MP_LT ||
mp_cmp(Q->y, modulus) != MP_LT ||
mp_cmp(Q->z, modulus) != MP_LT) {
return ECC_OUT_OF_RANGE_E;
}
return _ecc_projective_add_point(P, Q, R, a, modulus, mp);
}
/* ### Point doubling in Jacobian coordinate system ###
*
* let us have a curve: y^2 = x^3 + a*x + b
@ -2051,8 +2052,8 @@ done:
mp The "b" value from montgomery_setup()
return MP_OKAY on success
*/
int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int* modulus, mp_digit mp)
static int _ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int* modulus, mp_digit mp)
{
#if !defined(WOLFSSL_SP_MATH)
#ifdef WOLFSSL_SMALL_STACK
@ -2072,9 +2073,6 @@ int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int *x, *y, *z;
int err;
if (P == NULL || R == NULL || modulus == NULL)
return ECC_BAD_ARG_E;
#ifdef WOLFSSL_SMALL_STACK
#ifdef WOLFSSL_SMALL_STACK_CACHE
if (R->key != NULL) {
@ -2339,19 +2337,7 @@ int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
return err;
#else
int modBits;
if (P == NULL || R == NULL || modulus == NULL)
return ECC_BAD_ARG_E;
modBits = mp_count_bits(modulus);
#ifdef WOLFSSL_PUBLIC_ECC_ADD_DBL
if ((mp_count_bits(P->x) > modBits) ||
(mp_count_bits(P->y) > modBits) ||
(mp_count_bits(P->z) > modBits)) {
return ECC_OUT_OF_RANGE_E;
}
#endif
int modBits = mp_count_bits(modulus);
(void)a;
(void)mp;
@ -2375,6 +2361,21 @@ int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
#endif
}
int ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int* modulus, mp_digit mp)
{
if (P == NULL || R == NULL || modulus == NULL)
return ECC_BAD_ARG_E;
if (mp_cmp(P->x, modulus) != MP_LT ||
mp_cmp(P->y, modulus) != MP_LT ||
mp_cmp(P->z, modulus) != MP_LT) {
return ECC_OUT_OF_RANGE_E;
}
return _ecc_projective_dbl_point(P, R, a, modulus, mp);
}
#if !defined(FREESCALE_LTC_ECC) && !defined(WOLFSSL_STM32_PKA) && \
!defined(WOLFSSL_CRYPTOCELL)
@ -6940,7 +6941,7 @@ int ecc_projective_add_point_safe(ecc_point* A, ecc_point* B, ecc_point* R,
/* x ordinattes the same. */
if (mp_cmp(A->y, B->y) == MP_EQ) {
/* A = B */
err = ecc_projective_dbl_point(B, R, a, modulus, mp);
err = _ecc_projective_dbl_point(B, R, a, modulus, mp);
}
else {
/* A = -B */
@ -6954,7 +6955,7 @@ int ecc_projective_add_point_safe(ecc_point* A, ecc_point* B, ecc_point* R,
}
}
else {
err = ecc_projective_add_point(A, B, R, a, modulus, mp);
err = _ecc_projective_add_point(A, B, R, a, modulus, mp);
if ((err == MP_OKAY) && mp_iszero(R->z)) {
/* When all zero then should have done a double */
if (mp_iszero(R->x) && mp_iszero(R->y)) {
@ -6964,11 +6965,11 @@ int ecc_projective_add_point_safe(ecc_point* A, ecc_point* B, ecc_point* R,
err = mp_montgomery_calc_normalization(R->z, modulus);
}
if (err == MP_OKAY) {
err = ecc_projective_dbl_point(R, R, a, modulus, mp);
err = _ecc_projective_dbl_point(R, R, a, modulus, mp);
}
}
else {
err = ecc_projective_dbl_point(B, R, a, modulus, mp);
err = _ecc_projective_dbl_point(B, R, a, modulus, mp);
}
}
/* When only Z zero then result is infinity */
@ -7002,7 +7003,7 @@ int ecc_projective_dbl_point_safe(ecc_point *P, ecc_point *R, mp_int* a,
err = wc_ecc_copy_point(P, R);
}
else {
err = ecc_projective_dbl_point(P, R, a, modulus, mp);
err = _ecc_projective_dbl_point(P, R, a, modulus, mp);
}
return err;