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

Merge pull request #2184 from ejohnstown/ecc-fix

Browse Source 
Fix Clang Static-Analysis Finding
This commit is contained in:
David Garske
2019-04-01 05:46:22 -07:00
committed by GitHub
parent 9ad48067f6 6d1a11eefb
commit 9ce32e3808
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wolfcrypt/src/ecc.c
View File

@@ -6286,17 +6286,22 @@ int wc_ecc_check_key(ecc_key* key)
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_read_radix(b, key->dp->Bf, MP_RADIX_HEX); err = mp_read_radix(b, key->dp->Bf, MP_RADIX_HEX);
#else #else
b = curve->Bf; if (err == MP_OKAY)
b = curve->Bf;
#endif #endif
/* SP 800-56Ar3, section 5.6.2.3.3, process step 2 */ /* SP 800-56Ar3, section 5.6.2.3.3, process step 2 */
/* Qx must be in the range [0, p-1] */ /* Qx must be in the range [0, p-1] */
if (mp_cmp(key->pubkey.x, curve->prime) != MP_LT) if (err == MP_OKAY) {
err = ECC_OUT_OF_RANGE_E; if (mp_cmp(key->pubkey.x, curve->prime) != MP_LT)
err = ECC_OUT_OF_RANGE_E;
}
/* Qy must be in the range [0, p-1] */ /* Qy must be in the range [0, p-1] */
if (mp_cmp(key->pubkey.y, curve->prime) != MP_LT) if (err == MP_OKAY) {
err = ECC_OUT_OF_RANGE_E; if (mp_cmp(key->pubkey.y, curve->prime) != MP_LT)
err = ECC_OUT_OF_RANGE_E;
}
/* SP 800-56Ar3, section 5.6.2.3.3, process steps 3 */ /* SP 800-56Ar3, section 5.6.2.3.3, process steps 3 */
/* make sure point is actually on curve */ /* make sure point is actually on curve */