Merge pull request #5866 from dgarske/ecc_pub_import

Fix API test `test_wc_ecc_import_raw` with SP math
This commit is contained in:
Daniel Pouzzner
2022-12-09 14:00:57 -06:00
committed by GitHub
2 changed files with 12 additions and 1 deletions

View File

@ -25479,9 +25479,11 @@ static int test_wc_ecc_import_raw(void)
ret = wc_ecc_init(&key);
/* Test good import */
if (ret == 0) {
ret = wc_ecc_import_raw(&key, qx, qy, d, curveName);
}
/* Test bad args. */
if (ret == 0) {
ret = wc_ecc_import_raw(NULL, qx, qy, d, curveName);
@ -25510,14 +25512,23 @@ static int test_wc_ecc_import_raw(void)
wc_ecc_free(&key);
#endif
ret = wc_ecc_import_raw(&key, "0", qy, d, curveName);
/* Note: SP math "is point" failure returns MP_VAL */
if (ret == ECC_INF_E || ret == MP_VAL) {
ret = BAD_FUNC_ARG; /* This is expected by other tests */
}
}
if (ret == BAD_FUNC_ARG) {
#if !defined(USE_FAST_MATH) && !defined(WOLFSSL_SP_MATH)
wc_ecc_free(&key);
#endif
ret = wc_ecc_import_raw(&key, qx, "0", d, curveName);
/* Note: SP math "is point" failure returns MP_VAL */
if (ret == ECC_INF_E || ret == MP_VAL) {
ret = BAD_FUNC_ARG; /* This is expected by other tests */
}
}
#endif
if (ret == BAD_FUNC_ARG) {
ret = 0;
}

View File

@ -684,7 +684,7 @@ int wc_ERR_remove_state(void)
* In case all entries are ignored, the ERR queue will be empty afterwards.
* For an empty ERR queue 0 is returned.
*
* ìgnore_err` may be NULL, in which case this returns the HEAD values.
* `ignore_err` may be NULL, in which case this returns the HEAD values.
*
* `flags` is present for OpenSSL compatibility, but will always be
* set to 0, since we do not keep flags at ERR entries.