sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-04 00:02:01 -04:00
Code Issues Projects Releases Wiki Activity

Fix LMS crash (#1998)

Browse Source 
* Fix LMS crash

Signed-off-by: Norman Ashley <nashley@cisco.com>

* Fixed compile issue on Mac

Signed-off-by: Norman Ashley <nashley@cisco.com>

---------

Signed-off-by: Norman Ashley <nashley@cisco.com>
This commit is contained in:
Norman Ashley 2024-11-24 03:13:48 -05:00 committed by GitHub
parent cce1bfde4e
commit fbaf871a4a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/sig_stfl/lms/external/hss_alloc.c vendored
View File

@ -164,11 +164,11 @@ struct hss_working_key *allocate_working_key(
/* Assign the memory target to a *signed* variable; signed so that it */
/* can take on negative values meaningfully (to account for cases where */
/* we are "overbudget") */
unsigned long mem_target;
signed long mem_target;
if (memory_target > LONG_MAX) {
mem_target = LONG_MAX;
} else {
mem_target = (unsigned long)memory_target;
mem_target = (signed long)memory_target;
}
#if 0
signed long initial_mem_target = mem_target; /* DEBUG HACK */
@ -179,7 +179,7 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
info->error_code = hss_error_out_of_memory;
return NULL;
}
mem_target -= (unsigned long)sizeof(*w) + MALLOC_OVERHEAD;
mem_target -= (signed long)sizeof(*w) + MALLOC_OVERHEAD;
unsigned i;
w->levels = levels;
w->status = hss_error_key_uninitialized; /* Not usable until we see a */
@ -221,13 +221,13 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
info->error_code = hss_error_out_of_memory;
return 0;
}
mem_target -= (unsigned long)w->signed_pk_len[i] + MALLOC_OVERHEAD;
mem_target -= (signed long)w->signed_pk_len[i] + MALLOC_OVERHEAD;
}
w->signature_len = signature_len;
/* Also account for the overhead for the stack allocation (the memory */
/* used by the stack will be accounted as a part of the tree level size */
mem_target -= (unsigned long)MALLOC_OVERHEAD;
mem_target -= (signed long)MALLOC_OVERHEAD;
/*
* Plot out how many subtree sizes we have at each level. We start by
@ -306,7 +306,7 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
level_height[i], hash_size[i], &subtree_levels[i],
&stack_used );
mem_target -= (unsigned long)mem;
mem_target -= (signed long)mem;
stack_usage += stack_used;
}
@ -362,7 +362,7 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
/* This is a signed type so that the comparison works as */
/* expected if mem_target is negative */
size_t stack_used;
unsigned long mem = (unsigned long)compute_level_memory_usage(i, j,
signed long mem = (unsigned long)compute_level_memory_usage(i, j,
level_height[i], hash_size[i], &subtree_levels[i],
&stack_used );
/* # of sublevels this would have */
@ -381,7 +381,7 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
/* This would use more memory than we'd like; accept it if */
/* either we have no solution, or it uses less memory than what */
/* we've seen */
if (search_status != nothing_yet && mem > best_mem) continue;
if (search_status != nothing_yet && mem > (signed long)best_mem) continue;
/* This solution is the best so far (however, it doesn't fit) */
search_status = found_overbudget;
@ -394,7 +394,7 @@ signed long initial_mem_target = mem_target; /* DEBUG HACK */
/* We've already seen a faster solution */
continue;
}
if (sub_levels == best_levels && mem > best_mem) {
if (sub_levels == best_levels && mem > (signed long)best_mem) {
/* We've already seen an equally fast solution that */
/* uses less memory */
continue;

6
src/sig_stfl/lms/external/hss_sign.c vendored
View File

@ -594,8 +594,8 @@ bool hss_generate_signature(
unsigned merkle_levels_below = 0;
int switch_merkle = w->levels;
struct merkle_level *tree;
for (i = w->levels; i>=1; i--, merkle_levels_below += tree->level) {
tree = w->tree[i-1];
for (i = w->levels-1; i>=1; i--, merkle_levels_below += tree->level) {
tree = w->tree[i];
if (0 == (cur_count & (((sequence_t)1 << (merkle_levels_below + tree->level))-1))) {
/* We exhausted this tree */
@ -608,7 +608,7 @@ bool hss_generate_signature(
}
/* Remember we'll need to switch to the NEXT_TREE */
switch_merkle = i-1;
switch_merkle = i;
continue;
}