From 2a6a48691e1aab15132192f94ac912b847066e92 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 11 Dec 2024 23:49:44 +0530 Subject: [PATCH 1/2] net: lib: hostap_crypto: Add a check for nRF SoC's The hostap external crypto module relies on nRF security which is only available for nRF family of SoC's. Fix NCSDK-30884. Signed-off-by: Chaitanya Tata --- subsys/net/lib/hostap_crypto/CMakeLists.txt | 5 +++++ subsys/net/lib/hostap_crypto/Kconfig | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/subsys/net/lib/hostap_crypto/CMakeLists.txt b/subsys/net/lib/hostap_crypto/CMakeLists.txt index 6450265fca0d..0cfb8518d772 100644 --- a/subsys/net/lib/hostap_crypto/CMakeLists.txt +++ b/subsys/net/lib/hostap_crypto/CMakeLists.txt @@ -4,6 +4,11 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # +# This is for use in NCS with nRF security which works only on nRF platforms +if(NOT DEFINED CONFIG_SOC_FAMILY_NORDIC_NRF) + return() +endif() + zephyr_interface_library_named(hostap_crypto) set(HOSTAP_BASE ${ZEPHYR_HOSTAP_MODULE_DIR}) diff --git a/subsys/net/lib/hostap_crypto/Kconfig b/subsys/net/lib/hostap_crypto/Kconfig index 09b9f3f3fee6..440ee011d116 100644 --- a/subsys/net/lib/hostap_crypto/Kconfig +++ b/subsys/net/lib/hostap_crypto/Kconfig @@ -4,7 +4,7 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if WIFI_NM_WPA_SUPPLICANT +if WIFI_NM_WPA_SUPPLICANT && SOC_FAMILY_NORDIC_NRF choice WIFI_NM_WPA_SUPPLICANT_CRYPTO_BACKEND default WIFI_NM_WPA_SUPPLICANT_CRYPTO_EXT From aeb30993f226be0570298bdb732ed6552bcf8d32 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 11 Dec 2024 23:51:14 +0530 Subject: [PATCH 2/2] quarantine: zephyr: Remove Wi-Fi tests These are now fixed to be run in NCS. Signed-off-by: Chaitanya Tata --- scripts/quarantine_zephyr.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index 8804c304bc83..47f3c55c0648 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -187,20 +187,6 @@ - nrf54l15dk/nrf54l15/cpuapp comment: "Test not aligned for nrf54l15 - missing snippet settings" -- scenarios: - - wifi.build.crypto_enterprise - - wifi.build.wps - - wifi.build.wpa3 - - wifi.build.crypto_alt - - wifi.build.crypto_none - - wifi.build.crypto_default - - wifi.build.hostapd_ap - - wifi.build.dpp - - wifi.build.p2p - platforms: - - native_sim - comment: "https://nordicsemi.atlassian.net/browse/NCSDK-30884" - - scenarios: - net.sockets.tls12.ec_kex - net.sockets.tls13.ephemeral_kex