Skip to content

Backport 27503 ([manuf] Restore the num_objs for perso_blob_from_host) #29261

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
pamaury wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −0
Open

Backport 27503 ([manuf] Restore the num_objs for perso_blob_from_host) #29261

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
3 changes: 3 additions & 0 deletions sw/device/silicon_creator/manuf/base/ft_personalize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,7 @@ static status_t write_cert_to_flash_info_page(
return OK_STATUS();
}

size_t orig_num_objects_from_host;
static status_t personalize_endorse_certificates(ujson_t *uj) {
/*****************************************************************************
* Certificate Export and Endorsement.
Expand Down Expand Up @@ -950,6 +951,7 @@ static status_t personalize_endorse_certificates(ujson_t *uj) {
free_room -= block.obj_size;
}

orig_num_objects_from_host = perso_blob_from_host.num_objs;
// Extract the remaining cert perso LTV objects received from the host.
while (perso_blob_from_host.num_objs)
TRY(extract_next_cert(&next_cert, &free_room));
Expand Down Expand Up @@ -1131,6 +1133,7 @@ static status_t provision(ujson_t *uj) {
.uj = uj,
.perso_blob_from_host = &perso_blob_from_host,
.cert_flash_layout = cert_flash_layout};
post_endorse.perso_blob_from_host->num_objs = orig_num_objects_from_host;
TRY(personalize_extension_post_cert_endorse(&post_endorse));

// Check the hash of all perso objects with the host to confirm integrity of
Expand Down
Loading