Skip to content

[nrf noup] zephyr: Fix issues with compression TLVs #368

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

Merged
merged 1 commit into from
Oct 31, 2024
Merged

[nrf noup] zephyr: Fix issues with compression TLVs #368

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
12 changes: 11 additions & 1 deletion boot/zephyr/decompression.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,17 @@ int boot_size_unprotected_tlvs(const struct image_header *hdr, const struct flas
} else if (rc > 0) {
rc = 0;
break;
} else if (bootutil_tlv_iter_is_prot(&it, off)) {
} else if (bootutil_tlv_iter_is_prot(&it, off) && type != IMAGE_TLV_DECOMP_SHA &&
type != IMAGE_TLV_DECOMP_SIGNATURE) {
/* Include size of protected hash and signature as these will be replacing the
* original ones
*/
continue;
} else if (type == EXPECTED_HASH_TLV || type == EXPECTED_SIG_TLV) {
/* Exclude the original unprotected TLVs for signature and hash, the length of the
* signature of the compressed data might not be the same size as the signaute of the
* decompressed data, as is the case when using ECDSA-P256
*/
continue;
}

Expand Down
Loading