commit 56fb74afc0820a397e72dfdc4b16e22d31f4034d
author Alphan Ulusoy <alphan@google.com> Mon Jun 14 10:24:43 2021 -0400
committer Alphan Ulusoy <alphan@google.com> Tue Jun 15 08:20:45 2021 -0400
tree dddca4dcada6de6fc663f13408d684348d503865
parent 282ad142e950eb3f16dd3b2557e2a2c1a512ca21

[sw/silicon_creator] Use manifest values to advance keymgr state

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/device/silicon_creator/mask_rom/mask_rom.c

diff --git a/sw/device/silicon_creator/mask_rom/mask_rom.c b/sw/device/silicon_creator/mask_rom/mask_rom.c
index a05bed7..2e7db89 100644
--- a/sw/device/silicon_creator/mask_rom/mask_rom.c
+++ b/sw/device/silicon_creator/mask_rom/mask_rom.c
@@ -131,12 +131,8 @@
     // CreatorRootKey (2.c.iv)
     // - This is only allowed to be done if we have verified the signature on
     //   the current ROM_EXT.
-    // TODO(#5955): Switch to manifest in C struct format update this code to
-    // use the sw binding and max key version fields from the manifest.
-    keymgr_binding_value_t binding_value = {0};
-    uint32_t max_key_version = 0x1;
-    if (keymgr_state_advance_to_creator(&binding_value, max_key_version) !=
-        kErrorOk) {
+    if (keymgr_state_advance_to_creator(
+            &manifest->binding_value, manifest->max_key_version) != kErrorOk) {
       break;
     }