[nrf noup] Updated Matter for single Mbed TLS config

-This allows for PSA crypto and legacy APIs living side-by-side but will be reworked once PSA Crypto APIs is default and legacy configs and APIs becomes deprecated Signed-off-by: Frank Audun Kvamtrø <[email protected]>
frkv · Dec 5, 2023 · ac3344e · ac3344e
1 parent 340a3a2
commit ac3344e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -310,12 +310,21 @@ config MBEDTLS_SHA1_C
 config MBEDTLS_SHA256_C
     default y
 
+config MBEDTLS_HKDF_C
+    default y
+
 config MBEDTLS_PK_C
     default y
 
 config MBEDTLS_PK_WRITE_C
     default y
 
+config MBEDTLS_PK_PARSE_C
+    default y
+
+config MBEDTLS_PKCS5_C
+    default y
+
 config MBEDTLS_X509_CREATE_C
     default y if !CHIP_CRYPTO_PSA
 
@@ -328,6 +337,9 @@ config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
 config MBEDTLS_SSL_OUT_CONTENT_LEN
     default 900 if CHIP_WIFI
 
+config MBEDTLS_TLS_LIBRARY
+    default y
+
 # Disable unneeded crypto operations
 
 config MBEDTLS_SHA384_C

diff --git a/config/nrfconnect/chip-module/Kconfig.features b/config/nrfconnect/chip-module/Kconfig.features
@@ -28,6 +28,7 @@ config CHIP_WIFI
 	imply NORDIC_SECURITY_BACKEND
 	imply MBEDTLS_ENTROPY_C
 	imply MBEDTLS_PSA_CRYPTO_C
+	imply PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	imply NET_STATISTICS
 	imply NET_L2_ETHERNET
 	imply NET_PKT_TXTIME