tests: Use correct KMU keyslot during provisioning

Updated tests to use proper keyname for MCUboot

Signed-off-by: Grzegorz Chwierut <[email protected]>

Author: gchwier

tests/subsys/kmu/pytest/common.py

@@ -9,6 +9,7 @@
 import subprocess
 
 from pathlib import Path
+from twister_harness.helpers.utils import find_in_config
 
 logger = logging.getLogger(__name__)
 
@@ -73,6 +74,14 @@ def flash_board(build_dir: Path | str, dev_id: str | None, erase: bool = False):
     run_command(command)
 
 
+def get_keyname_for_mcuboot(sysbuild_config: Path) -> str:
+    keyname = "BL_PUBKEY"
+    if (find_in_config(sysbuild_config, "SB_CONFIG_SECURE_BOOT_APPCORE")
+            or find_in_config(sysbuild_config, "SB_CONFIG_MCUBOOT_SIGNATURE_KMU_UROT_MAPPING")):
+        keyname = "UROT_PUBKEY"
+    return keyname
+
+
 def provision_keys_for_kmu(
         keys: list[str] | str,
         keyname: str = "UROT_PUBKEY",  # UROT_PUBKEY, BL_PUBKEY, APP_PUBKEY

tests/subsys/kmu/pytest/test_kmu_provision.py

@@ -11,6 +11,7 @@
 from twister_harness import DeviceAdapter
 from twister_harness.helpers.utils import match_lines, find_in_config
 from common import (
+    get_keyname_for_mcuboot,
     provision_keys_for_kmu,
     reset_board,
     APP_KEYS_FOR_KMU
@@ -49,7 +50,7 @@ def test_kmu_use_key_from_config(dut: DeviceAdapter, test_option):
 
     provision_keys_for_kmu(
         keys=keys,
-        keyname="UROT_PUBKEY",
+        keyname=get_keyname_for_mcuboot(sysbuild_config),
         dev_id=dut.device_config.id
     )
     dut.clear_buffer()
@@ -70,13 +71,14 @@ def test_kmu_use_wrong_key(dut: DeviceAdapter):
     verify that the application does not boot if the keys are incorrect.
     """
     logger.info("Provision wrong keys")
+    sysbuild_config = Path(dut.device_config.build_dir) / 'zephyr' / '.config'
     provision_keys_for_kmu(
         keys=[
             APP_KEYS_FOR_KMU / 'root-ed25519-1.pem',
             APP_KEYS_FOR_KMU / 'root-ed25519-2.pem',
             APP_KEYS_FOR_KMU / 'root-ed25519-w.pem'
         ],
-        keyname="UROT_PUBKEY",
+        keyname=get_keyname_for_mcuboot(sysbuild_config),
         dev_id=dut.device_config.id
     )
 

west.yml

@@ -128,7 +128,7 @@ manifest:
           compare-by-default: true
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: pull/531/head
+      revision: 754f9586875dd72de367704e42c2121eb60696c3
       path: bootloader/mcuboot
     - name: qcbor
       url: https://github.com/laurencelundblade/QCBOR