wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-06 07:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

ECC curve validation follow-up

Browse Source
This commit is contained in:
Tobias Frauenschläger
2026-04-07 12:40:44 +02:00
parent b5874a6d9e
commit 06e63f0a7b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/ecc.c
+8 -2
View File
@@ -10978,16 +10978,22 @@ int wc_ecc_import_x963_ex2(const byte* in, word32 inLen, ecc_key* key,
#ifndef WOLFSSL_SP_NO_256
if (ecc_sets[key->idx].id == ECC_SECP256R1) {
err = sp_ecc_is_point_256(key->pubkey.x, key->pubkey.y);
#if defined(WOLFSSL_SM2) && defined(WOLFSSL_SP_SM2)
#if defined(WOLFSSL_SM2)
if (err != MP_OKAY && curve_id < 0) {
/* Retry with SM2 curve when P-256 returns invalid.
* Only when no explicit curve was requested (curve_id < 0).
* Needed because SM2 keys can be mis-identified as
* SECP256R1 during parsing. */
#if defined(WOLFSSL_SP_SM2)
err = sp_ecc_is_point_sm2_256(key->pubkey.x,
key->pubkey.y);
#else
int sm2_idx = wc_ecc_get_curve_idx(ECC_SM2P256V1);
if (sm2_idx != ECC_CURVE_INVALID)
err = wc_ecc_point_is_on_curve(&key->pubkey, sm2_idx);
#endif
if (err == MP_OKAY) {
err = wc_ecc_set_curve(key, key->dp->size,
err = wc_ecc_set_curve(key, WOLFSSL_SM2_KEY_BITS / 8,
ECC_SM2P256V1);
}
}
wolfcrypt/src/evp.c
+2 -1
View File
@@ -9541,7 +9541,8 @@ static int ECC_populate_EVP_PKEY(WOLFSSL_EVP_PKEY* pkey, WOLFSSL_EC_KEY *key)
{
if (ecc->type == ECC_PRIVATEKEY_ONLY ||
(ecc->type == ECC_PRIVATEKEY &&
mp_iszero(ecc->pubkey.x))) {
mp_iszero(ecc->pubkey.x) &&
mp_iszero(ecc->pubkey.y))) {
/* Reconstruct public key from private scalar. This covers
* both ECC_PRIVATEKEY_ONLY keys and ECC_PRIVATEKEY keys whose
* public-key point was never populated (e.g. when only