Skip to content

Commit e968a58

Browse files
adigierlubos
authored andcommitted
doc: matter: Update default storage for DAC key on nRF54L15
Change default storage for DAC key on nRF54L15 to KMU. Signed-off-by: Adrian Gielniewski <[email protected]>
1 parent f090408 commit e968a58

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

doc/nrf/protocols/matter/end_product/security.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ nRF54L with Trusted Firmware-M (TF-M)
2626

2727
On the nRF54L SoC, Matter samples support :ref:`app_boards_spe_nspe` with Trusted Firmware-M (TF-M).
2828
All cryptographic operations within the Matter stack are performed by utilizing the `Platform Security Architecture (PSA)`_ API and executed in the secure TF-M environment.
29-
The secure materials like Matter Session keys, DAC private key and other keys, are stored in the TF-M secure storage using the :ref:`tfm_encrypted_its` module.
29+
The secure materials like Matter Session keys and other keys, except for the DAC private key, are stored in the TF-M secure storage using the :ref:`tfm_encrypted_its` module.
3030
Matter samples use the full TF-M library, so you cannot use the :ref:`tfm_minimal_build` version of TF-M.
3131

3232
To build a Matter sample with the TF-M support, :ref:`build <building>` for the :ref:`board target <app_boards_names>` with the ``/ns`` variant.
@@ -37,8 +37,8 @@ While using TF-M, the application partition size and available RAM space for the
3737
You must keep this in mind and calculate the available space for the application partition.
3838
The recommended values are provided in the :ref:`ug_matter_hw_requirements_layouts` section.
3939

40-
In addition, you can store the DAC private key in the KMU storage while using TF-M.
41-
To learn how to do it, see the :ref:`matter_platforms_security_dac_priv_key_kmu` section.
40+
By default, the DAC private key is stored in the KMU storage while using TF-M.
41+
See the :ref:`matter_platforms_security_dac_priv_key_kmu` section for more information.
4242

4343
Cryptography
4444
************
@@ -142,7 +142,7 @@ This is a reference configuration that can be modified in the production firmwar
142142
- PSA Crypto API
143143
- CRACEN
144144
- Yes
145-
- Trusted Firmware-M (TF-M)
145+
- Trusted Firmware-M (TF-M) + Key Management Unit (KMU)
146146

147147
.. [1] The CryptoCell backend is used in parallel with the Oberon backend.
148148
By default, the CryptoCell backend is used only for Random Number Generation (RNG) and the AEAD key derivation driver.
@@ -162,7 +162,7 @@ Storing Device Attestation Certificate private key
162162
In Matter samples based on the PSA crypto API, the Device Attestation Certificate's private key, which exists in the factory data set, can be migrated to secure storage.
163163
The secure storage used depends on the platform and the cryptographic backend.
164164

165-
To enable the migration of the DAC private key from the factory data set to secure storage, set the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY` Kconfig option to ``y``.
165+
The migration of the DAC private key from the factory data set to secure storage is controlled by the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_MIGRATE_DAC_PRIV_KEY` Kconfig option and set to ``y`` by default.
166166

167167
Currently, this feature is available only for the PSA crypto API.
168168
See the following table to learn about the default secure storage backends for the DAC private key and the available secure storage backends for each platform:
@@ -185,12 +185,12 @@ See the following table to learn about the default secure storage backends for t
185185
- Not available
186186
- Not available
187187
* - nRF54L15 SoC
188-
- Trusted Storage library + Hardware Unique Key
188+
- Key Management Unit (KMU)
189189
- | Key Management Unit (KMU),
190190
| Trusted Storage library + Hardware Unique Key (Zephyr Settings),
191191
| Trusted Storage library + SHA-256 hash (Zephyr Settings)
192192
* - nRF54L15 SoC + Trusted Firmware-M (TF-M)
193-
- Trusted Firmware-M Storage (TF-M)
193+
- Key Management Unit (KMU)
194194
- | Key Management Unit (KMU),
195195
| Trusted Firmware-M Storage (TF-M)
196196
@@ -207,7 +207,7 @@ DAC in Trusted Storage library
207207

208208
The Device Attestation Certificates private key can be stored in the Trusted Storage library.
209209
The key is encrypted with the AEAD key derived from the Hardware Unique Key (HUK) or a SHA-256 hash.
210-
This storage backend is selected by default for all platforms that support the PSA crypto API.
210+
This storage backend is selected by default for all platforms that support the PSA crypto API, except for the nRF54L Series, which uses Key Management Unit (KMU).
211211

212212
To enable storing the DAC private key in the Trusted Storage library, set the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_DAC_PRIV_KEY_ITS` Kconfig option to ``y``.
213213
To select which encryption to use, set one of the following Kconfig options:
@@ -226,7 +226,7 @@ The Key Management Unit (KMU) is a hardware peripheral that provides secure stor
226226
It is available in the nRF54L Series SoCs and can be used to store the DAC private key.
227227
This storage backend can be used with Trusted Firmware-M (TF-M).
228228

229-
You can enable storing the DAC private key in the KMU by setting the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_DAC_PRIV_KEY_KMU` Kconfig option to ``y``.
229+
Storing the DAC private key in the KMU is controlled by the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_DAC_PRIV_KEY_KMU` Kconfig option and set to ``y`` by default.
230230

231231
You can additionally encrypt the DAC private key in the KMU storage by setting the :kconfig:option:`CONFIG_CHIP_CRYPTO_PSA_DAC_PRIV_KEY_KMU_ENCRYPTED` Kconfig option to ``y``.
232232
This operation requires two additional KMU slots to store the nonce and the authentication tag, making the total number of slots used four.

0 commit comments

Comments
 (0)