Merge branch 'main' into fork/shared_upgrade_slot_support

(cherry picked from commit 08ffe42)
Signed-off-by: INFINEON\DovhalA <artem.dovhal@infineon.com>

Author: DOAR-Infineon

.github/workflows/zephyr_build.yaml

@@ -75,7 +75,7 @@ jobs:
           base-path: repos/zephyr
           toolchains: arm-zephyr-eabi
           sdk-version: 1.0.0
-          west-project-filter: -.*,+cmsis,+cmsis_6,+hal_nordic,+hal_nxp,+hal_stm32,+hal_ti,+libmetal,+littlefs,+mbedtls,+mcuboot,+open-amp,+tinycrypt,+trusted-firmware-m,+zcbor
+          west-project-filter: -.*,+cmsis,+cmsis_6,+hal_nordic,+hal_nxp,+hal_stm32,+hal_ti,+libmetal,+littlefs,+mbedtls,+mcuboot,+open-amp,+tinycrypt,+trusted-firmware-m,+zcbor,+tf-psa-crypto
           ccache-max-size: 768MB
 
       - name: Checkout MCUBoot

boot/zephyr/CMakeLists.txt

@@ -196,11 +196,11 @@ if(CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256 OR CONFIG_BOOT_ENCRYPT_EC256)
     zephyr_link_libraries(nrfxlib_crypto)
   endif()
 
-  if(CONFIG_MBEDTLS_CFG_FILE)
+  if(CONFIG_MBEDTLS_CONFIG_FILE)
     # Since here we are not using Zephyr's mbedTLS but rather our own, we need
     # to set MBEDTLS_CONFIG_FILE ourselves. When using Zephyr's copy, this
     # variable is set by its Kconfig in the Zephyr codebase.
-    zephyr_compile_definitions(MBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CFG_FILE}")
+    zephyr_compile_definitions(MBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CONFIG_FILE}")
   endif()
 elseif(CONFIG_BOOT_SIGNATURE_TYPE_NONE)
   zephyr_include_directories(
@@ -243,7 +243,7 @@ elseif(CONFIG_BOOT_SIGNATURE_TYPE_ED25519 OR CONFIG_BOOT_ENCRYPT_X25519)
       ${TINYCRYPT_DIR}/source/utils.c
       ${TINYCRYPT_SHA512_DIR}/source/sha512.c
     )
-    zephyr_compile_definitions(MBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CFG_FILE}")
+    zephyr_compile_definitions(MBEDTLS_CONFIG_FILE="${CONFIG_MBEDTLS_CONFIG_FILE}")
   endif()
 
   zephyr_include_directories(

boot/zephyr/Kconfig

@@ -281,6 +281,7 @@ config BOOT_RSA_TF_PSA_CRYPTO_LEGACY
 	bool "Use legacy crypto from TF-PSA-Crypto (i.e. Mbed TLS 4.x)"
 	select BOOT_USE_MBEDTLS
 	select PSA_CRYPTO
+	select TEST_RANDOM_GENERATOR if !ENTROPY_HAS_DRIVER
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	select PSA_WANT_ALG_RSA_PKCKS1_V15
 	select PSA_WANT_ALG_RSA_PSS
@@ -291,6 +292,7 @@ config BOOT_RSA_PSA
 	bool "Use PSA API crypto"
 	select BOOT_USE_PSA_CRYPTO
 	select PSA_CRYPTO
+	select TEST_RANDOM_GENERATOR if !ENTROPY_HAS_DRIVER
 	select MBEDTLS_ENABLE_HEAP if MBEDTLS_BUILTIN
 	select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY
 	select PSA_WANT_ALG_RSA_PKCKS1_V15
@@ -512,8 +514,7 @@ config MCUBOOT_INFINITE_LOOP_AFTER_RAM_CLEANUP
 	  Verification option that keeps execution in infinite loop after
 	  RAM cleanup has been performed.
 
-config MBEDTLS_CFG_FILE
-	string
+config MBEDTLS_CONFIG_FILE
 	# It might be awkward to define an Mbed TLS header file when TinyCrypt
 	# is used, but the fact is that Mbed TLS' ASN1 parse module is used
 	# also when TinyCrypt is used as crypto backend.