Skip to content

Backport 26994 ([ownership] Fix key algo comparison hardening) #29260

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
+7 −7
Open

Backport 26994 ([ownership] Fix key algo comparison hardening) #29260

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
14 changes: 7 additions & 7 deletions sw/device/silicon_creator/lib/ownership/owner_block.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ enum {
};

hardened_bool_t owner_block_owner_key_equal(void) {
hardened_bool_t result =
hardened_memeq(owner_page[0].owner_key.raw, owner_page[1].owner_key.raw,
ARRAYSIZE(owner_page[0].owner_key.raw));
result ^= owner_page[0].ownership_key_alg;
result ^= owner_page[1].ownership_key_alg;
if (launder32(result) != kHardenedBoolTrue) {
if (launder32(owner_page[0].ownership_key_alg) !=
launder32(owner_page[1].ownership_key_alg)) {
return kHardenedBoolFalse;
}
return result;
HARDENED_CHECK_EQ(owner_page[0].ownership_key_alg,
owner_page[1].ownership_key_alg);
return hardened_memeq(owner_page[0].owner_key.raw,
owner_page[1].owner_key.raw,
ARRAYSIZE(owner_page[0].owner_key.raw));
}

hardened_bool_t owner_block_newversion_mode(void) {
Expand Down
Loading