root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

SLH-DSA coverity fixes. 

Fixes 1643092 and 1643093

Neither of these are major issues, but fixed anyway..

i.e. 1<<hm is bounded by the parameter set so this is not an issue
Not checking an error from WPACKET_memcpy() would also not cause an
issue.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/26835)
This commit is contained in:
slontis 2025-02-20 07:54:54 +11:00 committed by Pauli
parent 560e586371
commit 92159b48e9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/slh_dsa/slh_dsa.c
View File

@ -354,7 +354,7 @@ static int get_tree_ids(PACKET *rpkt, const SLH_DSA_PARAMS *params,
* i.e. A & (0xFFFF_FFFF_FFFF_FFFF >> (64 - X))
*/
tree_id_mask = (~(uint64_t)0) >> (64 - (params->h - params->hm));
leaf_id_mask = (1 << params->hm) - 1; /* max value is 0x1FF when hm = 9 */
leaf_id_mask = ((uint64_t)1 << params->hm) - 1; /* max value is 0x1FF when hm = 9 */
*tree_id = bytes_to_u64_be(tree_id_bytes, tree_id_len) & tree_id_mask;
*leaf_id = (uint32_t)(bytes_to_u64_be(leaf_id_bytes, leaf_id_len) & leaf_id_mask);
return 1;

3
crypto/slh_dsa/slh_fors.c
View File

@ -181,7 +181,8 @@ int ossl_slh_fors_sign(SLH_DSA_HASH_CTX *ctx, const uint8_t *md,
return 0;
node_id >>= 1; /* Get the parent node id */
tree_offset >>= 1; /* Each layer up has half as many nodes */
WPACKET_memcpy(sig_wpkt, out, n);
if (!WPACKET_memcpy(sig_wpkt, out, n))
return 0;
}
tree_id_times_two_power_a += two_power_a;
}