Skip to content

cms: Reduce stack usage in generate_digest() #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rosslagerwall wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −12
Open

cms: Reduce stack usage in generate_digest() #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions src/cms_pe_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,19 +278,14 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
cmsgotoerr(error_shdrs, cms,
"PE has invalid trailing data");

generate_digest_step(cms, hash_base, hash_size);
dbgprintf("digesting %tx + %zx", hash_base - map,
hash_size);
if (hash_size % 8 != 0 && padded) {
size_t tmp_size = hash_size +
ALIGNMENT_PADDING(hash_size, 8);
uint8_t tmp_array[tmp_size];
memset(tmp_array, '\0', tmp_size);
memcpy(tmp_array, hash_base, hash_size);
generate_digest_step(cms, tmp_array, tmp_size);
dbgprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
tmp_size);
} else {
generate_digest_step(cms, hash_base, hash_size);
dbgprintf("digesting %tx + %zx", hash_base - map,
hash_size);
size_t pad_size = ALIGNMENT_PADDING(hash_size, 8);
uint8_t pad_array[8] = {0};
generate_digest_step(cms, pad_array, pad_size);
dbgprintf("padding to %zx", hash_size + pad_size);
}
}
dbgprintf("end of hash");
Expand Down