From 11978d48af6dae276abb845e34c539e3b8be95c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Tue, 28 Jan 2025 09:18:18 +0100 Subject: [PATCH 1/2] wifi: Resolve PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -PSA_WANT_ALG_CMAC must be set for PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 to be valid. This commit fixes this mismatch for hostap Signed-off-by: Frank Audun Kvamtrø --- modules/hostap/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig index 1efcd6a5c4055..84245873a3053 100644 --- a/modules/hostap/Kconfig +++ b/modules/hostap/Kconfig @@ -174,6 +174,7 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA select PSA_WANT_ALG_SHA_384 select PSA_WANT_ALG_SHA_512 select PSA_WANT_ALG_PBKDF2_HMAC + select PSA_WANT_ALG_CMAC select PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128 select PSA_WANT_KEY_TYPE_AES select PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY From 1e90719d7795c71d80e6f07e671af89df953c83d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Tue, 28 Jan 2025 12:35:03 +0100 Subject: [PATCH 2/2] wifi: hostap: Fixing naming collisions for some TLS configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Mbed TLS has come up with its own naming-convention with regards to certain Mbed TLS configurations for TLS/DTLS and X.509. This commit fixes a couple of them by depending on MBEDTLS_BUILTIN which is set when Kconfig.tls-generic is used 1. Make MBEDTLS_PEM_CERTIFICATE_FORMAT depend on MBEDTLS_BUILTIN The proper name for this functionaity is MBEDTL_PEM_PARSE_C and MBEDTLS_PEM_WRITE_C 2. Make MBEDTLS_SERVER_NAME_INDICATION depend on MBEDTLS_BUILTIN The proper name for this is MBEDTLS_SSL_SERVER_NAME_INDICATION Signed-off-by: Frank Audun Kvamtrø --- modules/hostap/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig index 84245873a3053..d8bbff826f028 100644 --- a/modules/hostap/Kconfig +++ b/modules/hostap/Kconfig @@ -184,8 +184,8 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE bool "Enterprise Crypto support for WiFi" - select MBEDTLS_PEM_CERTIFICATE_FORMAT - select MBEDTLS_SERVER_NAME_INDICATION + select MBEDTLS_PEM_CERTIFICATE_FORMAT if MBEDTLS_BUILTIN + select MBEDTLS_SERVER_NAME_INDICATION if MBEDTLS_BUILTIN select MBEDTLS_X509_CRL_PARSE_C select MBEDTLS_TLS_VERSION_1_2 depends on !WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE