nrf_security: Rename oberon_psa_core to psa_core

Vge0rge · rlubos · commit 4c0f3f0cb1e2 · 2025-06-03T17:55:36.000+02:00
Since now there is support for both Oberon PSA core
and PSA core lite rename the cmake target to a more
generic name.

Ref: NCSDK-32817

Signed-off-by: Georgios Vasilakis &lt;georgios.vasilakis@nordicsemi.no&gt;
diff --git a/subsys/nrf_security/src/core/lite/CMakeLists.txt b/subsys/nrf_security/src/core/lite/CMakeLists.txt
@@ -4,22 +4,19 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Note: Reusing the name oberon_psa_core as we don't have a normalized
-#       name for "any" PSA core in the current design
-
-add_library(oberon_psa_core STATIC
+add_library(psa_core STATIC
   psa_core_lite.c
   ${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c
 )
 
-target_link_libraries(oberon_psa_core
+target_link_libraries(psa_core
   PRIVATE
     psa_crypto_library_config
 )
 
-nrf_security_add_zephyr_options_library(oberon_psa_core)
+nrf_security_add_zephyr_options_library(psa_core)
 
 target_link_libraries(${mbedcrypto_target}
   PRIVATE
-    oberon_psa_core
+    psa_core
 )
diff --git a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt
@@ -16,37 +16,37 @@ append_with_prefix(src_crypto_core_oberon ${OBERON_PSA_CORE_PATH}/library/
   psa_crypto_storage.c
 )
 
-add_library(oberon_psa_core STATIC
+add_library(psa_core STATIC
     ${src_crypto_core_oberon}
 )
 
 # Add the nordic version of psa_crypto_driver_wrappers with the core (out of tree)
-target_sources(oberon_psa_core
+target_sources(psa_core
   PRIVATE
     ${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c
 )
 
-target_link_libraries(oberon_psa_core
+target_link_libraries(psa_core
   PRIVATE
     psa_crypto_library_config
     psa_interface
 )
 
-target_compile_definitions(oberon_psa_core
+target_compile_definitions(psa_core
   PRIVATE
     BUILDING_MBEDTLS_CRYPTO
 )
 
-target_link_libraries(oberon_psa_core
+target_link_libraries(psa_core
   PRIVATE
     psa_crypto_library_config
     mbedcrypto_base
     nrf_security_utils
 )
 
-nrf_security_add_zephyr_options_library(oberon_psa_core)
+nrf_security_add_zephyr_options_library(psa_core)
 
 target_link_libraries(${mbedcrypto_target}
   PRIVATE
-    oberon_psa_core
+    psa_core
 )
diff --git a/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt b/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt
@@ -56,8 +56,8 @@ else()
   add_dependencies(cracen_psa_driver zephyr_generated_headers)
 endif()
 
-# Link oberon_psa_core with this PSA crypto driver
-target_link_libraries(oberon_psa_core
+# Link psa_core with this PSA crypto driver
+target_link_libraries(psa_core
   PRIVATE
     cracen_psa_driver
 )
diff --git a/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt
@@ -14,10 +14,10 @@ target_include_directories(psa_crypto_library_config
     ${NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH}
 )
 
-# Link oberon_psa_core with the imported libraries
-target_link_libraries(oberon_psa_core
+# Link psa_core with the imported libraries
+target_link_libraries(psa_core
   INTERFACE
     nrf_cc3xx_psa_crypto_imported
     nrf_cc3xx_core_imported
     c
-)
+)
diff --git a/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt
@@ -11,7 +11,7 @@ target_include_directories(psa_crypto_library_config
 )
 
 # Link the Oberon PSA core with nrf_cc3xx_platform
-target_link_libraries(oberon_psa_core
+target_link_libraries(psa_core
   PRIVATE
     nrf_cc3xx_platform
 )
diff --git a/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt
@@ -82,8 +82,8 @@ target_link_libraries(oberon_psa_driver
     mbedcrypto_oberon_imported
 )
 
-# Link oberon_psa_core with this driver
-target_link_libraries(oberon_psa_core
+# Link psa_core with this driver
+target_link_libraries(psa_core
   PRIVATE
     oberon_psa_driver
 )
diff --git a/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt b/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt
@@ -6,7 +6,7 @@
 
 # Add the RNG driver to the Oberon PSA core (if needed)
 if (PSA_NEED_NRF_RNG_ENTROPY_DRIVER)
-  target_sources(oberon_psa_core
+  target_sources(psa_core
     PRIVATE
       nrf_rng_entropy.c
   )

Original file line number	Diff line number	Diff line change
`@@ -4,22 +4,19 @@`
`4`	`4`	`# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause`
`5`	`5`	`#`
`6`	`6`
`7`		`-# Note: Reusing the name oberon_psa_core as we don't have a normalized`
`8`		`-# name for "any" PSA core in the current design`
`9`		`-`
`10`		`-add_library(oberon_psa_core STATIC`
	`7`	`+add_library(psa_core STATIC`
`11`	`8`	`psa_core_lite.c`
`12`	`9`	`${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c`
`13`	`10`	`)`
`14`	`11`
`15`		`-target_link_libraries(oberon_psa_core`
	`12`	`+target_link_libraries(psa_core`
`16`	`13`	`PRIVATE`
`17`	`14`	`psa_crypto_library_config`
`18`	`15`	`)`
`19`	`16`
`20`		`-nrf_security_add_zephyr_options_library(oberon_psa_core)`
	`17`	`+nrf_security_add_zephyr_options_library(psa_core)`
`21`	`18`
`22`	`19`	`target_link_libraries(${mbedcrypto_target}`
`23`	`20`	`PRIVATE`
`24`		`- oberon_psa_core`
	`21`	`+ psa_core`
`25`	`22`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,37 +16,37 @@ append_with_prefix(src_crypto_core_oberon ${OBERON_PSA_CORE_PATH}/library/`
`16`	`16`	`psa_crypto_storage.c`
`17`	`17`	`)`
`18`	`18`
`19`		`-add_library(oberon_psa_core STATIC`
	`19`	`+add_library(psa_core STATIC`
`20`	`20`	`${src_crypto_core_oberon}`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`# Add the nordic version of psa_crypto_driver_wrappers with the core (out of tree)`
`24`		`-target_sources(oberon_psa_core`
	`24`	`+target_sources(psa_core`
`25`	`25`	`PRIVATE`
`26`	`26`	`${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c`
`27`	`27`	`)`
`28`	`28`
`29`		`-target_link_libraries(oberon_psa_core`
	`29`	`+target_link_libraries(psa_core`
`30`	`30`	`PRIVATE`
`31`	`31`	`psa_crypto_library_config`
`32`	`32`	`psa_interface`
`33`	`33`	`)`
`34`	`34`
`35`		`-target_compile_definitions(oberon_psa_core`
	`35`	`+target_compile_definitions(psa_core`
`36`	`36`	`PRIVATE`
`37`	`37`	`BUILDING_MBEDTLS_CRYPTO`
`38`	`38`	`)`
`39`	`39`
`40`		`-target_link_libraries(oberon_psa_core`
	`40`	`+target_link_libraries(psa_core`
`41`	`41`	`PRIVATE`
`42`	`42`	`psa_crypto_library_config`
`43`	`43`	`mbedcrypto_base`
`44`	`44`	`nrf_security_utils`
`45`	`45`	`)`
`46`	`46`
`47`		`-nrf_security_add_zephyr_options_library(oberon_psa_core)`
	`47`	`+nrf_security_add_zephyr_options_library(psa_core)`
`48`	`48`
`49`	`49`	`target_link_libraries(${mbedcrypto_target}`
`50`	`50`	`PRIVATE`
`51`		`- oberon_psa_core`
	`51`	`+ psa_core`
`52`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@ target_include_directories(psa_crypto_library_config`
`14`	`14`	`${NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH}`
`15`	`15`	`)`
`16`	`16`
`17`		`-# Link oberon_psa_core with the imported libraries`
`18`		`-target_link_libraries(oberon_psa_core`
	`17`	`+# Link psa_core with the imported libraries`
	`18`	`+target_link_libraries(psa_core`
`19`	`19`	`INTERFACE`
`20`	`20`	`nrf_cc3xx_psa_crypto_imported`
`21`	`21`	`nrf_cc3xx_core_imported`
`22`	`22`	`c`
`23`		`-)`
	`23`	`+)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ target_include_directories(psa_crypto_library_config`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`# Link the Oberon PSA core with nrf_cc3xx_platform`
`14`		`-target_link_libraries(oberon_psa_core`
	`14`	`+target_link_libraries(psa_core`
`15`	`15`	`PRIVATE`
`16`	`16`	`nrf_cc3xx_platform`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ target_link_libraries(oberon_psa_driver`
`82`	`82`	`mbedcrypto_oberon_imported`
`83`	`83`	`)`
`84`	`84`
`85`		`-# Link oberon_psa_core with this driver`
`86`		`-target_link_libraries(oberon_psa_core`
	`85`	`+# Link psa_core with this driver`
	`86`	`+target_link_libraries(psa_core`
`87`	`87`	`PRIVATE`
`88`	`88`	`oberon_psa_driver`
`89`	`89`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`# Add the RNG driver to the Oberon PSA core (if needed)`
`8`	`8`	`if (PSA_NEED_NRF_RNG_ENTROPY_DRIVER)`
`9`		`- target_sources(oberon_psa_core`
	`9`	`+ target_sources(psa_core`
`10`	`10`	`PRIVATE`
`11`	`11`	`nrf_rng_entropy.c`
`12`	`12`	`)`