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

Fix issue in ECC test from size mismatch. Code review feedback.

Browse Source
This commit is contained in:
Kareem
2026-05-19 16:56:22 -07:00
parent 5b2569e321
commit d942fe47d5
3 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/ecc.c
+20 -12
View File
@@ -327,6 +327,14 @@ ECC Curve Sizes:
#define MAX_ECC_BITS_USE MAX_ECC_BITS_NEEDED
#endif
#if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
#define ECC_DECL_MP_OVER_MAX(bits) \
(MP_BITS_CNT(bits) > MP_BITS_CNT(MAX_ECC_BITS_USE))
#else
#define ECC_DECL_MP_OVER_MAX(bits) \
((bits) > MAX_ECC_BITS_USE)
#endif
#if !defined(WOLFSSL_CUSTOM_CURVES) && (ECC_MIN_KEY_SZ > 160) && \
(!defined(HAVE_ECC_KOBLITZ) || (ECC_MIN_KEY_SZ > 224))
@@ -2012,7 +2020,7 @@ static int _ecc_projective_add_point(ecc_point* P, ecc_point* Q, ecc_point* R,
mp_int *x, *y, *z;
int err;
if (mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -2416,7 +2424,7 @@ static int _ecc_projective_dbl_point(ecc_point *P, ecc_point *R, mp_int* a,
mp_int *x, *y, *z;
int err;
if (mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -2770,7 +2778,7 @@ int ecc_map_ex(ecc_point* P, mp_int* modulus, mp_digit mp, int ct)
#endif
mp_int *x, *y, *z;
if (mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -3595,7 +3603,7 @@ static int ecc_point_to_mont(ecc_point* p, ecc_point* r, mp_int* modulus,
DECL_MP_INT_SIZE_DYN(mu, mp_bitsused(modulus), MAX_ECC_BITS_USE);
if (mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -3903,8 +3911,8 @@ static int ecc_check_order_minus_1(const mp_int* k, ecc_point* tG, ecc_point* R,
int err;
DECL_MP_INT_SIZE_DYN(t, mp_bitsused(order), MAX_ECC_BITS_USE);
if (mp_bitsused(order) > MAX_ECC_BITS_USE ||
mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(order)) ||
ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -6858,7 +6866,7 @@ int wc_ecc_sign_hash(const byte* in, word32 inlen, byte* out, word32 *outlen,
word32 keySz;
#endif
if (ECC_KEY_MAX_BITS(key) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(ECC_KEY_MAX_BITS(key))) {
return WC_KEY_SIZE_E;
}
@@ -7063,7 +7071,7 @@ static int ecc_sign_hash_sw(ecc_key* key, ecc_key* pubkey, WC_RNG* rng,
DECL_MP_INT_SIZE_DYN(b, ECC_KEY_MAX_BITS_NONULLCHECK(key), MAX_ECC_BITS_USE);
if (ECC_KEY_MAX_BITS_NONULLCHECK(key) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(ECC_KEY_MAX_BITS_NONULLCHECK(key))) {
return WC_KEY_SIZE_E;
}
@@ -7394,7 +7402,7 @@ int wc_ecc_sign_hash_ex(const byte* in, word32 inlen, WC_RNG* rng,
#else
DECLARE_CURVE_SPECS(1);
#endif
if (ECC_KEY_MAX_BITS(key) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(ECC_KEY_MAX_BITS(key))) {
return WC_KEY_SIZE_E;
}
#endif /* !WOLFSSL_SP_MATH */
@@ -8317,7 +8325,7 @@ static int ecc_mont_norm_points(ecc_point* A, ecc_point* Am, ecc_point* B,
DECL_MP_INT_SIZE_DYN(mu, mp_bitsused(modulus), MAX_ECC_BITS_USE);
if (mp_bitsused(modulus) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(mp_bitsused(modulus))) {
return WC_KEY_SIZE_E;
}
@@ -8707,7 +8715,7 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash,
word32 keySz;
#endif
if (ECC_KEY_MAX_BITS(key) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(ECC_KEY_MAX_BITS(key))) {
return WC_KEY_SIZE_E;
}
@@ -9095,7 +9103,7 @@ static int ecc_verify_hash(mp_int *r, mp_int *s, const byte* hash,
mp_int* u1 = NULL; /* Will be e. */
mp_int* u2 = NULL; /* Will be w. */
if (ECC_KEY_MAX_BITS_NONULLCHECK(key) > MAX_ECC_BITS_USE) {
if (ECC_DECL_MP_OVER_MAX(ECC_KEY_MAX_BITS_NONULLCHECK(key))) {
return WC_KEY_SIZE_E;
}
wolfcrypt/src/rsa.c
+12 -8
View File
@@ -44,6 +44,14 @@ RSA keys can be used to encrypt, decrypt, sign and verify data.
#include <wolfssl/wolfcrypt/rsa.h>
#include <wolfssl/wolfcrypt/logging.h>
#if defined(WOLFSSL_SP_MATH) || defined(WOLFSSL_SP_MATH_ALL)
#define RSA_DECL_MP_OVER_MAX(bits) \
(MP_BITS_CNT(bits) > MP_BITS_CNT(RSA_MAX_SIZE))
#else
#define RSA_DECL_MP_OVER_MAX(bits) \
((bits) > RSA_MAX_SIZE)
#endif
#ifdef WOLFSSL_AFALG_XILINX_RSA
#include <wolfssl/wolfcrypt/port/af_alg/wc_afalg.h>
#endif
@@ -839,7 +847,7 @@ int wc_CheckRsaKey(RsaKey* key)
}
#endif
if (mp_bitsused(&key->n) > RSA_MAX_SIZE) {
if (RSA_DECL_MP_OVER_MAX(mp_bitsused(&key->n))) {
return WC_KEY_SIZE_E;
}
@@ -2879,7 +2887,7 @@ static int RsaFunctionPrivate(mp_int* tmp, RsaKey* key, WC_RNG* rng)
DECL_MP_INT_SIZE_DYN(rndi, mp_bitsused(&key->n), RSA_MAX_SIZE);
#endif /* WC_RSA_BLINDING && !WC_NO_RNG */
if (mp_bitsused(&key->n) > RSA_MAX_SIZE) {
if (RSA_DECL_MP_OVER_MAX(mp_bitsused(&key->n))) {
return WC_KEY_SIZE_E;
}
@@ -3062,7 +3070,7 @@ static int RsaFunctionSync(const byte* in, word32 inLen, byte* out,
DECL_MP_INT_SIZE_DYN(tmp, mp_bitsused(&key->n), RSA_MAX_SIZE);
int ret = 0;
if (mp_bitsused(&key->n) > RSA_MAX_SIZE) {
if (RSA_DECL_MP_OVER_MAX(mp_bitsused(&key->n))) {
return WC_KEY_SIZE_E;
}
@@ -3496,7 +3504,7 @@ int RsaFunctionCheckIn(const byte* in, word32 inLen, RsaKey* key,
DECL_MP_INT_SIZE_DYN(c, mp_bitsused(&key->n), RSA_MAX_SIZE);
if (mp_bitsused(&key->n) > RSA_MAX_SIZE) {
if (RSA_DECL_MP_OVER_MAX(mp_bitsused(&key->n))) {
return WC_KEY_SIZE_E;
}
@@ -4840,10 +4848,6 @@ int wc_RsaEncryptSize(const RsaKey* key)
return BAD_FUNC_ARG;
}
if (mp_bitsused(&key->n) > RSA_MAX_SIZE) {
return WC_KEY_SIZE_E;
}
ret = mp_unsigned_bin_size(&key->n);
#if defined(WOLFSSL_MICROCHIP_TA100)
wolfssl/wolfcrypt/sp_int.h
+6 -4
View File
@@ -895,11 +895,13 @@ while (0)
#define DECL_MP_INT_SIZE(name, bits) \
sp_int_digit name##d[MP_INT_SIZEOF_DIGITS(MP_BITS_CNT(bits))]; \
sp_int* (name) = (sp_int*)name##d
/* Zero out mp_int of minimal size.
* Use the declared digit array size, not bits, so memset cannot exceed the
* buffer allocated by DECL_MP_INT_SIZE_DYN(..., bits, max). */
/* Bytes to zero for a static mp_int: min(requested bits size, declared buffer). */
#define MP_INT_ZERO_SIZE(name, bits) \
((sizeof(name##d) < MP_INT_SIZEOF(MP_BITS_CNT(bits))) ? \
sizeof(name##d) : MP_INT_SIZEOF(MP_BITS_CNT(bits)))
/* Zero out mp_int without clearing more than the declared digit buffer. */
#define NEW_MP_INT_SIZE(name, bits, heap, type) \
XMEMSET(name, 0, sizeof(name##d))
XMEMSET((name), 0, MP_INT_ZERO_SIZE(name, bits))
/* Dispose of static mp_int. */
#define FREE_MP_INT_SIZE(name, heap, type) WC_DO_NOTHING
/* Type to force compiler to not complain about size. */