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

Merge pull request #8761 from douzzer/20250510-SP-dyn-stack-tweaks-and-workaround

Browse Source 
20250510-SP-dyn-stack-tweaks-and-workaround
This commit is contained in:
David Garske
2025-05-12 08:48:10 -07:00
committed by GitHub
parent b1cf5df2c2 5a911f6af0
commit 110504acd6
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.wolfssl_known_macro_extras
View File

@@ -641,7 +641,6 @@ WOLFSSL_CLIENT_EXAMPLE
WOLFSSL_COMMERCIAL_LICENSE WOLFSSL_COMMERCIAL_LICENSE
WOLFSSL_CONTIKI WOLFSSL_CONTIKI
WOLFSSL_CRL_ALLOW_MISSING_CDP WOLFSSL_CRL_ALLOW_MISSING_CDP
WOLFSSL_CURVE25519_BLINDING
WOLFSSL_CUSTOM_CONFIG WOLFSSL_CUSTOM_CONFIG
WOLFSSL_DILITHIUM_ASSIGN_KEY WOLFSSL_DILITHIUM_ASSIGN_KEY
WOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM WOLFSSL_DILITHIUM_MAKE_KEY_SMALL_MEM

25
wolfcrypt/src/sp_int.c
View File

@@ -131,7 +131,7 @@ PRAGMA_GCC("GCC diagnostic ignored \"-Warray-bounds\"")
!defined(WOLFSSL_SP_NO_DYN_STACK) !defined(WOLFSSL_SP_NO_DYN_STACK)
/* Declare a variable on the stack with the required data size. */ /* Declare a variable on the stack with the required data size. */
#define DECL_SP_INT(n, s) \ #define DECL_SP_INT(n, s) \
byte n##d[MP_INT_SIZEOF(s)]; \ sp_int_digit n##d[MP_INT_SIZEOF_DIGITS(s)]; \
sp_int* (n) = (sp_int*)n##d sp_int* (n) = (sp_int*)n##d
#else #else
/* Declare a variable on the stack. */ /* Declare a variable on the stack. */
@@ -222,7 +222,7 @@ PRAGMA_GCC("GCC diagnostic ignored \"-Warray-bounds\"")
!defined(WOLFSSL_SP_NO_DYN_STACK) !defined(WOLFSSL_SP_NO_DYN_STACK)
/* Declare a variable on the stack with the required data size. */ /* Declare a variable on the stack with the required data size. */
#define DECL_SP_INT_ARRAY(n, s, c) \ #define DECL_SP_INT_ARRAY(n, s, c) \
byte n##d[MP_INT_SIZEOF(s) * (c)]; \ sp_int_digit n##d[MP_INT_SIZEOF_DIGITS(s) * (c)]; \
sp_int* (n)[c] = { NULL, } sp_int* (n)[c] = { NULL, }
#else #else
/* Declare a variable on the stack. */ /* Declare a variable on the stack. */
@@ -7909,28 +7909,30 @@ static int _sp_submod(const sp_int* a, const sp_int* b, const sp_int* m,
unsigned int used = ((a->used >= m->used) ? unsigned int used = ((a->used >= m->used) ?
((a->used >= b->used) ? (a->used + 1U) : (b->used + 1U)) : ((a->used >= b->used) ? (a->used + 1U) : (b->used + 1U)) :
((b->used >= m->used)) ? (b->used + 1U) : (m->used + 1U)); ((b->used >= m->used)) ? (b->used + 1U) : (m->used + 1U));
DECL_SP_INT_ARRAY(t, used, 2); DECL_SP_INT(t0, used);
DECL_SP_INT(t1, used);
ALLOC_SP_INT_ARRAY(t, used, 2, err, NULL); ALLOC_SP_INT_SIZE(t0, used, err, NULL);
ALLOC_SP_INT_SIZE(t1, used, err, NULL);
if (err == MP_OKAY) { if (err == MP_OKAY) {
/* Reduce a to less than m. */ /* Reduce a to less than m. */
if (_sp_cmp(a, m) != MP_LT) { if (_sp_cmp(a, m) != MP_LT) {
err = sp_mod(a, m, t[0]); err = sp_mod(a, m, t0);
a = t[0]; a = t0;
} }
} }
if (err == MP_OKAY) { if (err == MP_OKAY) {
/* Reduce b to less than m. */ /* Reduce b to less than m. */
if (_sp_cmp(b, m) != MP_LT) { if (_sp_cmp(b, m) != MP_LT) {
err = sp_mod(b, m, t[1]); err = sp_mod(b, m, t1);
b = t[1]; b = t1;
} }
} }
if (err == MP_OKAY) { if (err == MP_OKAY) {
/* Add m to a if a smaller than b. */ /* Add m to a if a smaller than b. */
if (_sp_cmp(a, b) == MP_LT) { if (_sp_cmp(a, b) == MP_LT) {
err = sp_add(a, m, t[0]); err = sp_add(a, m, t0);
a = t[0]; a = t0;
} }
} }
if (err == MP_OKAY) { if (err == MP_OKAY) {
@@ -7938,7 +7940,8 @@ static int _sp_submod(const sp_int* a, const sp_int* b, const sp_int* m,
err = sp_sub(a, b, r); err = sp_sub(a, b, r);
} }
FREE_SP_INT_ARRAY(t, NULL); FREE_SP_INT(t0, NULL);
FREE_SP_INT(t1, NULL);
#else /* WOLFSSL_SP_INT_NEGATIVE */ #else /* WOLFSSL_SP_INT_NEGATIVE */
sp_size_t used = ((a->used >= b->used) ? a->used + 1 : b->used + 1); sp_size_t used = ((a->used >= b->used) ? a->used + 1 : b->used + 1);
DECL_SP_INT(t, used); DECL_SP_INT(t, used);

3
wolfssl/wolfcrypt/sp_int.h
View File

@@ -930,6 +930,9 @@ typedef struct sp_int_minimal {
sp_int_digit dp[1]; sp_int_digit dp[1];
} sp_int_minimal; } sp_int_minimal;
wc_static_assert(sizeof(struct sp_int_minimal) % sizeof(sp_int_digit) == 0);
#define MP_INT_SIZEOF_DIGITS(cnt) (MP_INT_SIZEOF(cnt) / sizeof(sp_int_digit))
/* Multi-precision integer type is SP integer type. */ /* Multi-precision integer type is SP integer type. */
typedef sp_int mp_int; typedef sp_int mp_int;
/* Multi-precision integer digit type is SP integer digit type. /* Multi-precision integer digit type is SP integer digit type.