[nrf noup] bluetooth: Kconfig: Enable MBEDTLS_AES_ROM_TABLES with imply

... not select, so that it is still possible to have this option not enabled when its dependencies are not fulfilled. Also remove dependency on PSA_CRYPTO_CLIENT in BT_GATT_CACHING to avoid dependency loop and add missing enabling of PSA_WANT_ALG_ECB_NO_PADDING in BT_CRYPTO. These changes are introduced temporarily as a noup commit to unblock building of a lot of samples and tests in CI. This commit is expected to be replaced with a proper solution posted upstream. Signed-off-by: Andrzej Głąbek <[email protected]>
nrfconnect · Jan 14, 2025 · 9542b95 · 9542b95
1 parent a58dabf
commit 9542b95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
@@ -7,6 +7,7 @@ config BT_CRYPTO
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	select PSA_WANT_ALG_ECB_NO_PADDING
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
@@ -132,10 +132,9 @@ config BT_GATT_CACHING
 	bool "GATT Caching support"
 	default y
 	depends on BT_GATT_SERVICE_CHANGED
-	depends on PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables support for GATT Caching. When enabled the stack
 	  will register Client Supported Features and Database Hash