wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 02:37:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6326 from SparkiDev/ecc_key_max_bits_fix

Browse Source 
ECC: max bits for a key must handle order as well
This commit is contained in:
JacobBarthelmeh
2023-04-21 09:47:42 -06:00
committed by GitHub
parent 12cec5ec61 0cc50521b6
commit e194c90b3e
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/ecc.c
View File

@ -227,9 +227,17 @@ ECC Curve Sizes:
#else
#define MAX_ECC_BITS_USE MAX_ECC_BITS_NEEDED
#endif
#if !defined(WOLFSSL_CUSTOM_CURVES) && (ECC_MIN_KEY_SZ > 160) && \
(!defined(HAVE_ECC_KOBLITZ) || (ECC_MIN_KEY_SZ > 224))
#define ECC_KEY_MAX_BITS(key) \
((((key) == NULL) || ((key)->dp == NULL)) ? MAX_ECC_BITS_USE \
: (unsigned)((key)->dp->size * 8))
((((key) == NULL) || ((key)->dp == NULL)) ? MAX_ECC_BITS_USE : \
((unsigned)((key)->dp->size * 8)))
#else
/* Add one bit for cases when order is a bit greater than prime. */
#define ECC_KEY_MAX_BITS(key) \
((((key) == NULL) || ((key)->dp == NULL)) ? MAX_ECC_BITS_USE : \
((unsigned)((key)->dp->size * 8 + 1)))
#endif
/* forward declarations */
static int wc_ecc_new_point_ex(ecc_point** point, void* heap);

4
wolfcrypt/src/sp_int.c
View File

@ -16552,8 +16552,8 @@ static int _sp_mont_red(sp_int* a, const sp_int* m, sp_int_digit mp)
a->dp[i] = 0;
}
/* Special case when modulus is 1 digit. */
if (m->used == 1) {
/* Special case when modulus is 1 digit or less. */
if (m->used <= 1) {
/* mu = (mp * DigitMask(a, i)) & WORD_MASK */
mu = mp * a->dp[0];
/* a += mu * m */