Merge pull request #7532 from SparkiDev/wc_ecc_mulmod_zero

ECC: handle zero in wc_ecc_mulmod()
This commit is contained in:
David Garske
2024-05-15 09:02:02 -07:00
committed by GitHub
2 changed files with 25 additions and 0 deletions

View File

@@ -4058,6 +4058,12 @@ exit:
int wc_ecc_mulmod(const mp_int* k, ecc_point *G, ecc_point *R, mp_int* a,
mp_int* modulus, int map)
{
if ((k != NULL) && (R != NULL) && (mp_iszero(k))) {
mp_zero(R->x);
mp_zero(R->y);
mp_zero(R->z);
return MP_OKAY;
}
return wc_ecc_mulmod_ex(k, G, R, a, modulus, map, NULL);
}

View File

@@ -30563,6 +30563,9 @@ static wc_test_ret_t ecc_mulmod_test(ecc_key* key1)
ecc_key key2[1];
ecc_key key3[1];
#endif
#ifdef WOLFSSL_PUBLIC_MP
mp_int* priv;
#endif
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)
if ((key2 == NULL) || (key3 == NULL))
@@ -30597,6 +30600,22 @@ static wc_test_ret_t ecc_mulmod_test(ecc_key* key1)
goto done;
}
#ifdef WOLFSSL_PUBLIC_MP
priv = wc_ecc_key_get_priv(key1);
mp_zero(priv);
ret = wc_ecc_mulmod(wc_ecc_key_get_priv(key1), &key2->pubkey, &key3->pubkey,
wc_ecc_key_get_priv(key2), wc_ecc_key_get_priv(key3),
1);
if (ret != 0) {
ret = WC_TEST_RET_ENC_EC(ret);
goto done;
}
if (!wc_ecc_point_is_at_infinity(&key3->pubkey)) {
ret = WC_TEST_RET_ENC_EC(ret);
goto done;
}
#endif
done:
#if defined(WOLFSSL_SMALL_STACK) && !defined(WOLFSSL_NO_MALLOC)