nrf_security: remove mbedcrypto_base CMake library

It seemed to just be a sort of duplicate/extension of mbedcrypto
without added benefit.
Remove it, merging it into mbedcrypto.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>

Author: tomi-font

subsys/nrf_security/src/CMakeLists.txt

@@ -96,9 +96,12 @@ add_library(${mbedcrypto_target}
 )
 
 target_link_libraries(${mbedcrypto_target}
-  INTERFACE
+  PUBLIC
     psa_crypto_config_chosen
     psa_interface
+  PRIVATE
+    $<TARGET_NAME_IF_EXISTS:platform_s>
+    nrf_security_utils
 )
 
 if(CONFIG_PSA_SSF_CRYPTO_CLIENT)
@@ -135,23 +138,11 @@ endif()
 include(${CMAKE_CURRENT_LIST_DIR}/threading/threading.cmake)
 include(${NRF_SECURITY_DIR}/src/utils/nrf_security_utils.cmake)
 
-# Add base library with files required by all drivers/backends.
-add_library(mbedcrypto_base
-  STATIC
-    ${src_crypto_base}
-)
-
-target_link_libraries(mbedcrypto_base
+target_sources(${mbedcrypto_target}
   PRIVATE
-    psa_crypto_config_chosen
-    $<TARGET_NAME_IF_EXISTS:platform_s>
-    nrf_security_utils
-  PUBLIC
-    psa_interface
+    ${src_crypto_base}
 )
 
-nrf_security_add_zephyr_options(mbedcrypto_base)
-
 # Misusing the psa_crypto_config and psa_crypto_library_config awareness to
 # set compiler-flags to ensure right floating-point types are set
 if(COMPILER_CP_FLAG)
@@ -180,11 +171,6 @@ if(LINKER_CP_OPTION)
 )
 endif()
 
-target_link_libraries(${mbedcrypto_target}
-  PRIVATE
-    mbedcrypto_base
-)
-
 # Add PSA core
 if(CONFIG_MBEDTLS_PSA_CRYPTO_C)
   add_subdirectory(core)
@@ -198,17 +184,9 @@ if(CONFIG_MBEDTLS_LEGACY_CRYPTO_C OR (CONFIG_NRF_OBERON AND CONFIG_BUILD_WITH_TF
   add_subdirectory(legacy)
 endif()
 
-# In TF-M build, a psa_interface lib is created and we must inherit its settings
-set_property(TARGET ${mbedcrypto_target}
-  APPEND PROPERTY
-    PRIVATE_LINK_LIBRARIES
-      $<TARGET_NAME_IF_EXISTS:psa_interface>
-)
-
 # NEWLIB requires linking with the C library
 if(CONFIG_NEWLIB_LIBC)
   target_link_libraries(${mbedcrypto_target} PRIVATE -lc)
-  target_link_libraries(mbedcrypto_base PRIVATE -lc)
 endif()
 
 if(CONFIG_MBEDTLS_X509_LIBRARY)
@@ -233,7 +211,6 @@ if(CONFIG_MBEDTLS_X509_LIBRARY)
     PRIVATE
       psa_crypto_config_chosen
       ${mbedcrypto_target}
-      mbedcrypto_base
   )
 
   nrf_security_add_zephyr_options(mbedx509)
@@ -276,7 +253,6 @@ if(CONFIG_MBEDTLS_TLS_LIBRARY)
       psa_crypto_config_chosen
       mbedx509
       ${mbedcrypto_target}
-      mbedcrypto_base
   )
 
   nrf_security_add_zephyr_options(mbedtls)

subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt

@@ -47,7 +47,7 @@ target_compile_definitions(psa_core
 target_link_libraries(psa_core
   PRIVATE
     psa_crypto_library_config
-    mbedcrypto_base
+    psa_interface
     nrf_security_utils
 )
 

subsys/nrf_security/src/drivers/cracen/CMakeLists.txt

@@ -46,7 +46,6 @@ target_link_libraries(cracen_psa_driver
   PRIVATE
     psa_crypto_library_config
     psa_interface
-    mbedcrypto_base
     nrf_security_utils
 )
 

subsys/nrf_security/src/legacy/CMakeLists.txt

@@ -111,7 +111,7 @@ if(DEFINED src_crypto_legacy)
 endif()
 
 if(DEFINED src_crypto_legacy_base)
-  target_sources(mbedcrypto_base
+  target_sources(${mbedcrypto_target}
     PRIVATE
       ${src_crypto_legacy_base}
   )
@@ -141,7 +141,7 @@ if(CONFIG_MBEDTLS_LEGACY_CRYPTO_C AND CONFIG_CC3XX_BACKEND)
 endif()
 
 if(TARGET nrf_cc3xx_core_imported)
-  # nrf_cc3xx needs functionality from mbedcrypto_base
+  # nrf_cc3xx needs functionality from mbedcrypto
   target_link_libraries(nrf_cc3xx_core_imported
     INTERFACE
       psa_crypto_config_chosen