Skip to content

rimage: Add support for resigning ace manifest #10032

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
kv2019i merged 3 commits into from
May 27, 2025
Merged

rimage: Add support for resigning ace manifest #10032

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f467f56
rimage: manifest: Add support for resigning ace manifest
softwarecki May 26, 2025
c54d145
rimage: manifest: Fix image size calculation in resign_image function
softwarecki May 26, 2025
02cf586
rimage: manifest: Preserve extended manifest in resigning mode
softwarecki May 26, 2025
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
13 changes: 11 additions & 2 deletions tools/rimage/src/manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,10 +1730,10 @@ int resign_image(struct image *image)
goto out;
}

image->image_end = size;
image->image_end = size - i;

/* check that key size matches */
if (image->adsp->man_v2_5) {
if (image->adsp->man_v2_5 || image->adsp->man_ace_v1_5) {
key_size = 384;
} else {
key_size = 256;
Expand All @@ -1755,6 +1755,8 @@ int resign_image(struct image *image)
ret = ri_manifest_sign_v1_8(image);
else if (image->adsp->man_v2_5)
ret = ri_manifest_sign_v2_5(image);
else if (image->adsp->man_ace_v1_5)
ret = ri_manifest_sign_ace_v1_5(image);
else
ret = -EINVAL;

Expand All @@ -1771,6 +1773,13 @@ int resign_image(struct image *image)
goto out;
}

/* Rewrite content before CSE header */
size = fwrite(buffer, 1, i, image->out_fd);
if (size != i) {
ret = file_error("Extended manifest write error", image->out_file);
goto out;
}

man_write_fw_mod(image);

out:
Expand Down
Loading