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

ECC: where reading strings, check for neg (invalid)

Browse Source
This commit is contained in:
Sean Parkinson
2021-07-19 15:51:56 +10:00
parent bbe47a81b7
commit 5b621cf039
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wolfcrypt/src/ecc.c
View File

@@ -8882,6 +8882,11 @@ int wc_ecc_rs_to_sig(const char* r, const char* s, byte* out, word32* outlen)
if (mp_iszero(rtmp) == MP_YES || mp_iszero(stmp) == MP_YES) if (mp_iszero(rtmp) == MP_YES || mp_iszero(stmp) == MP_YES)
err = MP_ZERO_E; err = MP_ZERO_E;
} }
if (err == MP_OKAY) {
if (mp_isneg(rtmp) == MP_YES || mp_isneg(stmp) == MP_YES) {
err = MP_READ_E;
}
}
/* convert mp_ints to ECDSA sig, initializes rtmp and stmp internally */ /* convert mp_ints to ECDSA sig, initializes rtmp and stmp internally */
if (err == MP_OKAY) if (err == MP_OKAY)
@@ -8993,7 +8998,7 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
err = mp_read_unsigned_bin(key->pubkey.x, (const byte*)qx, err = mp_read_unsigned_bin(key->pubkey.x, (const byte*)qx,
key->dp->size); key->dp->size);
if (mp_iszero(key->pubkey.x)) { if (mp_iszero(key->pubkey.x) || mp_isneg(key->pubkey.x)) {
WOLFSSL_MSG("Invalid Qx"); WOLFSSL_MSG("Invalid Qx");
err = BAD_FUNC_ARG; err = BAD_FUNC_ARG;
} }
@@ -9007,7 +9012,7 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
err = mp_read_unsigned_bin(key->pubkey.y, (const byte*)qy, err = mp_read_unsigned_bin(key->pubkey.y, (const byte*)qy,
key->dp->size); key->dp->size);
if (mp_iszero(key->pubkey.y)) { if (mp_iszero(key->pubkey.y) || mp_isneg(key->pubkey.y)) {
WOLFSSL_MSG("Invalid Qy"); WOLFSSL_MSG("Invalid Qy");
err = BAD_FUNC_ARG; err = BAD_FUNC_ARG;
} }
@@ -9106,7 +9111,7 @@ static int wc_ecc_import_raw_private(ecc_key* key, const char* qx,
err = mp_read_unsigned_bin(&key->k, (const byte*)d, err = mp_read_unsigned_bin(&key->k, (const byte*)d,
key->dp->size); key->dp->size);
#endif /* WOLFSSL_ATECC508A */ #endif /* WOLFSSL_ATECC508A */
if (mp_iszero(&key->k)) { if (mp_iszero(&key->k) || mp_isneg(&key->k)) {
WOLFSSL_MSG("Invalid private key"); WOLFSSL_MSG("Invalid private key");
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
} }