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

Merge pull request #7566 from douzzer/20240521-fix-overshifts

Browse Source 
20240521-fix-overshifts
This commit is contained in:
Sean Parkinson
2024-05-22 07:42:49 +10:00
committed by GitHub
parent caaa9feb64 c5ce984966
commit 32c5acca22
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@ -21564,7 +21564,10 @@ int set_curves_list(WOLFSSL* ssl, WOLFSSL_CTX *ctx, const char* names,
for (i = 0; i < groups_len; ++i) { for (i = 0; i < groups_len; ++i) {
/* Switch the bit to off and therefore is enabled. */ /* Switch the bit to off and therefore is enabled. */
curve = (word16)groups[i]; curve = (word16)groups[i];
if (curve >= 32) { if (curve >= 64) {
WC_DO_NOTHING;
}
else if (curve >= 32) {
/* 0 is for invalid and 1-14 aren't used otherwise. */ /* 0 is for invalid and 1-14 aren't used otherwise. */
disabled &= ~(1U << (curve - 32)); disabled &= ~(1U << (curve - 32));
} }

2
wolfcrypt/src/wc_xmss_impl.c
View File

@ -3926,7 +3926,7 @@ static int wc_xmssmt_sign_next_idx(XmssState* state, BdsState* bds, XmssIdx idx,
* next leaf in alt state is not last. */ * next leaf in alt state is not last. */
if ((ret == 0) && (i > 0) && (updates > 0) && if ((ret == 0) && (i > 0) && (updates > 0) &&
(idx_tree < ((XmssIdx)1 << (h - (hs * (i + 1))))) && (idx_tree < ((XmssIdx)1 << (h - (hs * (i + 1))))) &&
(bds[alt_i].next < ((word32)1 << h))) { (bds[alt_i].next < ((XmssIdx)1 << h))) {
xmss_idx_set_addr_tree(idx_tree, state->addr); xmss_idx_set_addr_tree(idx_tree, state->addr);
/* Update alternative BDS state. */ /* Update alternative BDS state. */
wc_xmss_bds_update(state, &bds[alt_i], sk_seed, pk_seed, wc_xmss_bds_update(state, &bds[alt_i], sk_seed, pk_seed,