Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions config/nrfconnect/chip-module/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -487,14 +487,10 @@ config CHIP_WIFI
select WIFI
select WIFI_NM_WPA_SUPPLICANT
select NETWORKING
imply NORDIC_SECURITY_BACKEND
imply MBEDTLS_ENTROPY_C
imply MBEDTLS_PSA_CRYPTO_C
imply NET_STATISTICS
imply NET_L2_ETHERNET
imply NET_PKT_TXTIME
imply NET_PKT_TIMESTAMP
imply MBEDTLS_PROMPTLESS
imply BUILD_OUTPUT_META
imply USE_DT_CODE_PARTITION # might be removed when the OTA is enabled
imply NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
Expand All @@ -503,6 +499,37 @@ config CHIP_WIFI
imply NET_STATISTICS_USER_API
imply NET_CONFIG_NEED_IPV6

choice CHIP_WIFI_CRYPTO_BACKEND
prompt "Wi-Fi crypto backend"
default CHIP_WIFI_CRYPTO_BACKEND_PSA if CHIP_CRYPTO_PSA
default CHIP_WIFI_CRYPTO_BACKEND_MBEDTLS
depends on CHIP_WIFI

config CHIP_WIFI_CRYPTO_BACKEND_PSA
bool "Matter WiFi PSA crypto backend"
select PSA_WANT_ALG_ECDSA
select PSA_WANT_ALG_ECDH
select PSA_WANT_ECC_SECP_R1_256
select PSA_WANT_ALG_HKDF
select PSA_INTERNAL_TRUSTED_STORAGE
select MBEDTLS_PSA_CRYPTO_STORAGE_C if !BUILD_WITH_TFM
select TRUSTED_STORAGE if !BUILD_WITH_TFM
select HW_UNIQUE_KEY_WRITE_ON_CRYPTO_INIT if (SOC_NRF5340_CPUAPP || SOC_SERIES_NRF54L)
select MBEDTLS_PSA_CRYPTO_C
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE

config CHIP_WIFI_CRYPTO_BACKEND_MBEDTLS
bool "Matter WiFi mbedTLS crypto backend"
select MBEDTLS
imply NORDIC_SECURITY_BACKEND
imply MBEDTLS_PSA_CRYPTO_C
imply MBEDTLS_PROMPTLESS

endchoice

config CHIP_IM_PRETTY_PRINT
bool "Detailed logging of Matter messages"
depends on !CHIP_LOG_SIZE_OPTIMIZATION
Expand Down
2 changes: 1 addition & 1 deletion config/nrfconnect/chip-module/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ config MBEDTLS_HEAP_SIZE
# Enable PSA Crypto dependencies for Matter

config CHIP_CRYPTO_PSA
default y if !CHIP_WIFI
default y
imply PSA_WANT_ALG_SPAKE2P_MATTER
imply PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_IMPORT if PSA_CRYPTO_DRIVER_OBERON

Expand Down
Loading