[nrf noup] boot: bootutil: Allow configuring number of KMU keys #383
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michalek-no
approved these changes
Dec 2, 2024
nordicjm
force-pushed
the
kmuslotnumber
branch
from
a2cf0e4 to
0e0e6f6
Compare
nvlsianpu
reviewed
Dec 2, 2024
| @@ -30,7 +30,6 @@ static psa_key_id_t kmu_key_ids[3] = { | |||
| MAKE_PSA_KMU_KEY_ID(228), | |||
| MAKE_PSA_KMU_KEY_ID(230) | |||
| }; | |||
| #define KMU_KEY_COUNT (sizeof(kmu_key_ids)/sizeof(kmu_key_ids[0])) | |||
There was a problem hiding this comment.
can we have assertion on limit CONFIG_BOOT_SIGNATURE_KMU_SLOTS value to KMU_KEY_COUNT as max?
There was a problem hiding this comment.
The limit is enforced by Kconfig
There was a problem hiding this comment.
Added a build assert
gchwier
approved these changes
Dec 3, 2024
de-nordic
approved these changes
Dec 3, 2024
nordicjm
force-pushed
the
kmuslotnumber
branch
from
0e0e6f6 to
7707f33
Compare
de-nordic
approved these changes
Dec 3, 2024
nvlsianpu
approved these changes
Dec 3, 2024
nvlsianpu
previously requested changes
Dec 3, 2024
boot/bootutil/src/ed25519_psa.c
Outdated
| @@ -30,7 +31,9 @@ static psa_key_id_t kmu_key_ids[3] = { | |||
| MAKE_PSA_KMU_KEY_ID(228), | |||
| MAKE_PSA_KMU_KEY_ID(230) | |||
| }; | |||
| #define KMU_KEY_COUNT (sizeof(kmu_key_ids)/sizeof(kmu_key_ids[0])) | |||
|
|
|||
| BUILD_ASSERT(CONFIG_BOOT_SIGNATURE_KMU_SLOTS < ARRAY_SIZE(kmu_key_ids), | |||
There was a problem hiding this comment.
BUILD_ASSERT(CONFIG_BOOT_SIGNATURE_KMU_SLOTS <= ARRAY_SIZE(kmu_key_ids),
Adds a new Kconfig CONFIG_BOOT_SIGNATURE_KMU_SLOTS which allows specifying how many KMU key IDs are supported, the default is set to 1 instead of 3 which was set before NCSDK-30743 Signed-off-by: Jamie McCrae <[email protected]>
nordicjm
force-pushed
the
kmuslotnumber
branch
from
7707f33 to
2af4fb8
Compare
de-nordic
approved these changes
Dec 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a new Kconfig CONFIG_BOOT_SIGNATURE_KMU_SLOTS which allows specifying how many KMU key IDs are supported, the default is set to 1 instead of 3 which was set before