Skip to content

Commit 08c13b8

Browse files
ArekBalysNordicrlubos
authored andcommitted
[nrf toup][nrfconnect] Add new Crypto backend for Matter over Wi-Fi
Allow switching between PSA and MBedTLS. Enable all PSA configs required by Matter. Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>
1 parent 324e282 commit 08c13b8

1 file changed

Lines changed: 31 additions & 4 deletions

File tree

  • config/nrfconnect/chip-module

config/nrfconnect/chip-module/Kconfig

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,14 +487,10 @@ config CHIP_WIFI
487487
select WIFI
488488
select WIFI_NM_WPA_SUPPLICANT
489489
select NETWORKING
490-
imply NORDIC_SECURITY_BACKEND
491-
imply MBEDTLS_ENTROPY_C
492-
imply MBEDTLS_PSA_CRYPTO_C
493490
imply NET_STATISTICS
494491
imply NET_L2_ETHERNET
495492
imply NET_PKT_TXTIME
496493
imply NET_PKT_TIMESTAMP
497-
imply MBEDTLS_PROMPTLESS
498494
imply BUILD_OUTPUT_META
499495
imply USE_DT_CODE_PARTITION # might be removed when the OTA is enabled
500496
imply NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
@@ -503,6 +499,37 @@ config CHIP_WIFI
503499
imply NET_STATISTICS_USER_API
504500
imply NET_CONFIG_NEED_IPV6
505501

502+
choice CHIP_WIFI_CRYPTO_BACKEND
503+
prompt "Wi-Fi crypto backend"
504+
default CHIP_WIFI_CRYPTO_BACKEND_PSA if CHIP_CRYPTO_PSA
505+
default CHIP_WIFI_CRYPTO_BACKEND_MBEDTLS
506+
depends on CHIP_WIFI
507+
508+
config CHIP_WIFI_CRYPTO_BACKEND_PSA
509+
bool "Matter WiFi PSA crypto backend"
510+
select PSA_WANT_ALG_ECDSA
511+
select PSA_WANT_ALG_ECDH
512+
select PSA_WANT_ECC_SECP_R1_256
513+
select PSA_WANT_ALG_HKDF
514+
select PSA_INTERNAL_TRUSTED_STORAGE
515+
select MBEDTLS_PSA_CRYPTO_STORAGE_C if !BUILD_WITH_TFM
516+
select TRUSTED_STORAGE if !BUILD_WITH_TFM
517+
select HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54L)
518+
select MBEDTLS_PSA_CRYPTO_C
519+
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
520+
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
521+
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
522+
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
523+
524+
config CHIP_WIFI_CRYPTO_BACKEND_MBEDTLS
525+
bool "Matter WiFi mbedTLS crypto backend"
526+
select MBEDTLS
527+
imply NORDIC_SECURITY_BACKEND
528+
imply MBEDTLS_PSA_CRYPTO_C
529+
imply MBEDTLS_PROMPTLESS
530+
531+
endchoice
532+
506533
config CHIP_IM_PRETTY_PRINT
507534
bool "Detailed logging of Matter messages"
508535
depends on !CHIP_LOG_SIZE_OPTIMIZATION

0 commit comments

Comments
 (0)