nrf_security: Adding more accurate _ALT scheme for nrf_oberon

-Ensured that _ALT flags only applicable to nrf_oberon is only
 set when ONLY oberon is set (depends on OBERON_ONLY_ENABLED
-Ensured that config OBERON_ONLY_PSA_ENABLED also consider CC3XX_BACKEND
-Using the OBERON_ONLY_ENABLED mask to take files in for legacy
 build

ref: NCSDK-13783

Signed-off-by: Frank Audun Kvamtrø <[email protected]>

Author: frkv

nrf_security/Kconfig.legacy

@@ -56,22 +56,22 @@ config MBEDTLS_PLATFORM_ZEROIZE_ALT
 # Legacy configurations for _ALT defines
 config MBEDTLS_AES_SETKEY_ENC_ALT
 	bool
-	depends on OBERON_BACKEND || PSA_CRYPTO_DRIVER_OBERON
+	depends on OBERON_ONLY_ENABLED
 	default y
 
 config MBEDTLS_AES_SETKEY_DEC_ALT
 	bool
-	depends on OBERON_BACKEND || PSA_CRYPTO_DRIVER_OBERON
+	depends on OBERON_ONLY_ENABLED
 	default y
 
 config MBEDTLS_AES_ENCRYPT_ALT
 	bool
-	depends on OBERON_BACKEND || PSA_CRYPTO_DRIVER_OBERON
+	depends on OBERON_ONLY_ENABLED
 	default y
 
 config MBEDTLS_AES_DECRYPT_ALT
 	bool
-	depends on OBERON_BACKEND || PSA_CRYPTO_DRIVER_OBERON
+	depends on OBERON_ONLY_ENABLED
 	default y
 
 config MBEDTLS_AES_ALT
@@ -154,7 +154,7 @@ config MBEDTLS_ECDSA_VERIFY_ALT
 
 config MBEDTLS_ECJPAKE_ALT
 	bool
-	depends on OBERON_BACKEND || PSA_CRYPTO_DRIVER_OBERON
+	depends on OBERON_ONLY_ENABLED
 	default y
 
 config MBEDTLS_RSA_ALT
@@ -243,7 +243,8 @@ config CC312_ONLY_ENABLED
 config OBERON_ONLY_PSA_ENABLED
 	bool
 	default y
-	depends on (PSA_CRYPTO_DRIVER_OBERON && !PSA_CRYPTO_DRIVER_CC3XX)
+	depends on (PSA_CRYPTO_DRIVER_OBERON && !PSA_CRYPTO_DRIVER_CC3XX) && \
+		   !CC3XX_BACKEND
 
 config OBERON_ONLY_ENABLED
 	bool

nrf_security/src/legacy/CMakeLists.txt

@@ -85,7 +85,7 @@ if(NOT CONFIG_OBERON_BACKEND)
 endif()
 
 # Add oberon-specific replacement files
-if (CONFIG_OBERON_BACKEND OR PSA_CRYPTO_DRIVER_OBERON)
+if (CONFIG_OBERON_ONLY_ENABLED)
   list(APPEND src_crypto_legacy
     ${CMAKE_CURRENT_LIST_DIR}/aes.c
     ${CMAKE_CURRENT_LIST_DIR}/aes_oberon.c