Skip to content

Commit 9542b95

Browse files
committed
[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]>
1 parent a58dabf commit 9542b95

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

subsys/bluetooth/crypto/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ config BT_CRYPTO
77
select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
88
select PSA_WANT_KEY_TYPE_AES
99
select PSA_WANT_ALG_CMAC
10-
select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
10+
select PSA_WANT_ALG_ECB_NO_PADDING
11+
imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
1112
help
1213
This option enables the Bluetooth Cryptographic Toolbox.

subsys/bluetooth/host/Kconfig.gatt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@ config BT_GATT_CACHING
132132
bool "GATT Caching support"
133133
default y
134134
depends on BT_GATT_SERVICE_CHANGED
135-
depends on PSA_CRYPTO_CLIENT
136135
select PSA_WANT_KEY_TYPE_AES
137136
select PSA_WANT_ALG_CMAC
138-
select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
137+
imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
139138
help
140139
This option enables support for GATT Caching. When enabled the stack
141140
will register Client Supported Features and Database Hash

0 commit comments

Comments
 (0)