nrf_security: Make PSA SSF client independent

This renames the configuration PSA_SSF_CRYPTO_CLIENT -> NRF_PSA_SSF_CRYPTO_CLIENT and makes it independent from NRF_SECURITY. This configuration provides the PSA implementation from the secure domain through the SSF client and it has no configurability yet. So there is no need to enforce NRF_SECURITY with this configuration. Signed-off-by: Georgios Vasilakis <[email protected]>
nrfconnect · Sep 27, 2024 · 94a8dab · 94a8dab
1 parent 70b3997
commit 94a8dab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/subsys/nrf_security/CMakeLists.txt b/subsys/nrf_security/CMakeLists.txt
@@ -37,7 +37,7 @@ if(CONFIG_BUILD_WITH_TFM)
   include(${NRF_SECURITY_ROOT}/cmake/config_to_tf-m.cmake)
 endif()
 
-if(CONFIG_BUILD_WITH_TFM OR CONFIG_PSA_SSF_CRYPTO_CLIENT)
+if(CONFIG_BUILD_WITH_TFM OR (CONFIG_NRF_PSA_SSF_CRYPTO_CLIENT AND CONFIG_NRF_SECURITY))
   # We enable either TF-M or the SSF client PSA crypto interface but we are
   # not in the secure image build
 

diff --git a/subsys/nrf_security/Kconfig b/subsys/nrf_security/Kconfig
@@ -30,6 +30,12 @@ config NORDIC_SECURITY_BACKEND
 	  Note that this will enable nrf_oberon by default. Multiple backends is
 	  not supported.
 
+config NRF_PSA_SSF_CRYPTO_CLIENT
+	bool
+	prompt "PSA crypto provided through SSF"
+	default y
+	depends on SSF_CLIENT && SSF_PSA_CRYPTO_SERVICE_ENABLED
+
 config NRF_SECURITY
 	bool
 	prompt "Enable nRF Security" if !PSA_PROMPTLESS

diff --git a/subsys/nrf_security/Kconfig.psa b/subsys/nrf_security/Kconfig.psa
@@ -21,8 +21,6 @@ osource "modules/mbedtls/Kconfig.psa"
 
 rsource "src/core/Kconfig"
 
-rsource "src/ssf_secdom/Kconfig"
-
 comment "PSA Driver Support"
 
 config MBEDTLS_PSA_CRYPTO_DRIVERS

diff --git a/subsys/nrf_security/src/CMakeLists.txt b/subsys/nrf_security/src/CMakeLists.txt
@@ -111,7 +111,7 @@ add_library(${mbedcrypto_target}
     ${src_crypto}
 )
 
-if(CONFIG_PSA_SSF_CRYPTO_CLIENT)
+if(CONFIG_NRF_PSA_SSF_CRYPTO_CLIENT)
   add_subdirectory(ssf_secdom)
 endif()
 

diff --git a/subsys/nrf_security/src/ssf_secdom/Kconfig b/subsys/nrf_security/src/ssf_secdom/Kconfig