From 154cd9d16bf2e1f38579a356ac85024c9d7a0769 Mon Sep 17 00:00:00 2001 From: Fengming Ye Date: Fri, 27 Sep 2024 12:07:12 +0900 Subject: [PATCH 1/2] hostap: add crypto module test kconfig option Add crypto module test kconfig option CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST, which is default n and hidden. It is only available by developer for crypto module test. Signed-off-by: Fengming Ye --- modules/hostap/CMakeLists.txt | 7 +++++++ modules/hostap/Kconfig | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt index 1f30ee34416183..6b6875d9a8fc6e 100644 --- a/modules/hostap/CMakeLists.txt +++ b/modules/hostap/CMakeLists.txt @@ -503,6 +503,13 @@ zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE ${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c ${HOSTAP_SRC_BASE}/crypto/milenage.c ) + +zephyr_library_sources_ifdef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST + ${HOSTAP_SRC_BASE}/crypto/crypto_module_tests.c + ${HOSTAP_SRC_BASE}/crypto/fips_prf_internal.c + ${HOSTAP_SRC_BASE}/crypto/sha1-internal.c + ${HOSTAP_SRC_BASE}/crypto/sha1-tlsprf.c +) endif() zephyr_library_link_libraries_ifndef(CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig index c49cee46973022..4350b054e13293 100644 --- a/modules/hostap/Kconfig +++ b/modules/hostap/Kconfig @@ -485,4 +485,8 @@ config SAE_PWE_EARLY_EXIT this can be intensive, so, add an option to exit early. Note that this is highly insecure and shouldn't be used in production +config WIFI_NM_WPA_SUPPLICANT_CRYPTO_TEST + bool + depends on WIFI_NM_WPA_SUPPLICANT_CRYPTO_MBEDTLS_PSA + endif # WIFI_NM_WPA_SUPPLICANT From 5be972dfb2b684bbacf90c24b5037e0f2d75b0cf Mon Sep 17 00:00:00 2001 From: Fengming Ye Date: Fri, 27 Sep 2024 12:10:04 +0900 Subject: [PATCH 2/2] west.yml: update hostap revision Update hostap revision to get crypto module test. Signed-off-by: Fengming Ye --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index b019f5d53c3be6..9ae55374a0c84b 100644 --- a/west.yml +++ b/west.yml @@ -259,7 +259,7 @@ manifest: - hal - name: hostap path: modules/lib/hostap - revision: f6792cb45d848df5d562dd9255dfc6acf62be164 + revision: d84b1ea174407f9a501976fb294e39c40c348645 - name: libmetal revision: a6851ba6dba8c9e87d00c42f171a822f7a29639b path: modules/hal/libmetal