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

ECC SP uncompress: use error return

Browse Source
This commit is contained in:
Sean Parkinson
2022-08-01 08:35:10 +10:00
parent 26c61f8e0f
commit c7d28e3bb9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wolfcrypt/src/ecc.c
View File

@ -8288,21 +8288,21 @@ int wc_ecc_import_point_der_ex(const byte* in, word32 inLen,
#ifndef WOLFSSL_SP_NO_256 #ifndef WOLFSSL_SP_NO_256
if (curve_idx != ECC_CUSTOM_IDX && if (curve_idx != ECC_CUSTOM_IDX &&
ecc_sets[curve_idx].id == ECC_SECP256R1) { ecc_sets[curve_idx].id == ECC_SECP256R1) {
sp_ecc_uncompress_256(point->x, pointType, point->y); err = sp_ecc_uncompress_256(point->x, pointType, point->y);
} }
else else
#endif #endif
#ifdef WOLFSSL_SP_384 #ifdef WOLFSSL_SP_384
if (curve_idx != ECC_CUSTOM_IDX && if (curve_idx != ECC_CUSTOM_IDX &&
ecc_sets[curve_idx].id == ECC_SECP384R1) { ecc_sets[curve_idx].id == ECC_SECP384R1) {
sp_ecc_uncompress_384(point->x, pointType, point->y); err = sp_ecc_uncompress_384(point->x, pointType, point->y);
} }
else else
#endif #endif
#ifdef WOLFSSL_SP_521 #ifdef WOLFSSL_SP_521
if (curve_idx != ECC_CUSTOM_IDX && if (curve_idx != ECC_CUSTOM_IDX &&
ecc_sets[curve_idx].id == ECC_SECP521R1) { ecc_sets[curve_idx].id == ECC_SECP521R1) {
sp_ecc_uncompress_521(point->x, pointType, point->y); err = sp_ecc_uncompress_521(point->x, pointType, point->y);
} }
else else
#endif #endif
@ -8424,7 +8424,7 @@ int wc_ecc_import_point_der_ex(const byte* in, word32 inLen,
if (compressed == 0) if (compressed == 0)
#endif #endif
err = mp_read_unsigned_bin(point->y, in + keysize, keysize); err = mp_read_unsigned_bin(point->y, in + keysize, keysize);
} }
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_set(point->z, 1); err = mp_set(point->z, 1);
@ -9601,19 +9601,22 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
#else #else
#ifndef WOLFSSL_SP_NO_256 #ifndef WOLFSSL_SP_NO_256
if (key->dp->id == ECC_SECP256R1) { if (key->dp->id == ECC_SECP256R1) {
sp_ecc_uncompress_256(key->pubkey.x, pointType, key->pubkey.y); err = sp_ecc_uncompress_256(key->pubkey.x, pointType,
key->pubkey.y);
} }
else else
#endif #endif
#ifdef WOLFSSL_SP_384 #ifdef WOLFSSL_SP_384
if (key->dp->id == ECC_SECP384R1) { if (key->dp->id == ECC_SECP384R1) {
sp_ecc_uncompress_384(key->pubkey.x, pointType, key->pubkey.y); err = sp_ecc_uncompress_384(key->pubkey.x, pointType,
key->pubkey.y);
} }
else else
#endif #endif
#ifdef WOLFSSL_SP_521 #ifdef WOLFSSL_SP_521
if (key->dp->id == ECC_SECP521R1) { if (key->dp->id == ECC_SECP521R1) {
sp_ecc_uncompress_521(key->pubkey.x, pointType, key->pubkey.y); err = sp_ecc_uncompress_521(key->pubkey.x, pointType,
key->pubkey.y);
} }
else else
#endif #endif
@ -9629,8 +9632,7 @@ int wc_ecc_import_x963_ex(const byte* in, word32 inLen, ecc_key* key,
if (compressed == 0) if (compressed == 0)
#endif #endif
{ {
err = mp_read_unsigned_bin(key->pubkey.y, in + keysize, err = mp_read_unsigned_bin(key->pubkey.y, in + keysize, keysize);
keysize);
} }
} }
if (err == MP_OKAY) if (err == MP_OKAY)