Skip to content

Commit 2ac74ca

Browse files
joerchannordicjm
authored andcommitted
[nrf fromtree] tfm: Enforce initial attestation with required key provisioned
Enforce that the initial attestation partition has the required initial attestation key provisioned. If the initial attestation key (IAK) is not present during boot of TF-M the system will panic during initialization. Signed-off-by: Joakim Andersson <[email protected]> (cherry picked from commit 2687376)
1 parent ec48dcb commit 2ac74ca

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

boards/arm/b_u585i_iot02a/Kconfig.defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ config SYS_CLOCK_TICKS_PER_SEC
2222

2323
if BUILD_WITH_TFM
2424

25+
# Initial Attestation key provisioned by the BL1 bootloader
26+
config TFM_INITIAL_ATTESTATION_KEY
27+
default y
28+
2529
config TFM_DUMMY_PROVISIONING
2630
default n
2731

modules/trusted-firmware-m/Kconfig.tfm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ config TFM_PARTITION_PLATFORM_CUSTOM_REBOOT
179179

180180
config TFM_DUMMY_PROVISIONING
181181
bool "Provision with dummy values. NOT to be used in production"
182+
select TFM_INITIAL_ATTESTATION_KEY
182183
default y
183184
help
184185
If this option is enabled (as it is by default), a set of dummy
@@ -188,6 +189,13 @@ config TFM_DUMMY_PROVISIONING
188189
This option MUST not be used in production hardware, as the keys are
189190
insecure.
190191

192+
config TFM_INITIAL_ATTESTATION_KEY
193+
bool
194+
help
195+
Hidden option to mark that the TF-M platform has an initial
196+
attestation key, which is a requirement for the Initial Attestation
197+
partition.
198+
191199
config TFM_BL2_NOT_SUPPORTED
192200
bool
193201
help

modules/trusted-firmware-m/Kconfig.tfm.partitions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ config TFM_PARTITION_CRYPTO
4444
config TFM_PARTITION_INITIAL_ATTESTATION
4545
bool "Secure partition 'Initial Attestation'"
4646
depends on TFM_PARTITION_CRYPTO
47+
depends on TFM_INITIAL_ATTESTATION_KEY
4748
default n
4849
help
4950
Setting this option will cause '-DTFM_PARTITION_INITIAL_ATTESTATION'

0 commit comments

Comments
 (0)