wifi: Hostap prepare upmerge

.checkpatch.conf

@@ -30,6 +30,7 @@
 --ignore ENOSYS
 --ignore IS_ENABLED_CONFIG
 --ignore EMBEDDED_FUNCTION_NAME
+--ignore MACRO_WITH_FLOW_CONTROL
 --exclude ext
 --exclude samples/matter/.*/src
 --exclude applications/matter_bridge/src

modules/CMakeLists.txt

@@ -7,3 +7,4 @@
 add_subdirectory_ifdef(CONFIG_BUILD_WITH_TFM tfm/zephyr)
 add_subdirectory_ifdef(CONFIG_MEMFAULT memfault-firmware-sdk)
 add_subdirectory_ifdef(CONFIG_MCUBOOT mcuboot/hooks)
+add_subdirectory(hostap)

modules/Kconfig

@@ -6,3 +6,4 @@
 
 osource "$(NCS_MEMFAULT_FIRMWARE_SDK_KCONFIG)"
 rsource "tfm/zephyr/Kconfig"
+rsource "hostap/Kconfig"

modules/hostap/CMakeLists.txt

@@ -0,0 +1,348 @@
+#
+# Copyright (c) 2022 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+if(CONFIG_WPA_SUPP)
+
+zephyr_library()
+
+set(HOSTAP_BASE ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules/lib/hostap)
+set(WPA_SUPPLICANT_BASE ${HOSTAP_BASE}/wpa_supplicant)
+set(COMMON_SRC_BASE ${HOSTAP_BASE}/src)
+
+set(CMAKE_EXE_LINKER_FLAGS "--specs=nosys.specs -lnosys")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMISSING_SYSCALL_NAMES")
+
+zephyr_compile_definitions(
+	CONFIG_ZEPHYR
+)
+
+zephyr_include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/src
+	${HOSTAP_BASE}/
+	${WPA_SUPPLICANT_BASE}/
+	${COMMON_SRC_BASE}/
+)
+
+zephyr_library_compile_definitions(
+	TLS_DEFAULT_CIPHERS=\""DEFAULT:!EXP:!LOW"\"
+	CONFIG_SHA256
+	CONFIG_SME
+	CONFIG_NO_CONFIG_WRITE
+	CONFIG_NO_CONFIG_BLOBS
+	CONFIG_WPA_S_ZEPHYR_L2_WIFI_MGMT
+	CONFIG_CTRL_IFACE
+	CONFIG_CTRL_IFACE_ZEPHYR
+	CONFIG_NO_RANDOM_POOL
+	CONFIG_MBO
+	CONFIG_WNM
+	CONFIG_SUITEB192
+	)
+
+zephyr_library_compile_definitions_ifndef(CONFIG_WPA_SUPP_CRYPTO
+	CONFIG_NO_PBKDF2
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_NO_DEBUG
+	CONFIG_NO_STDOUT_DEBUG
+)
+
+zephyr_library_include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/src
+	${HOSTAP_BASE}/
+	${COMMON_SRC_BASE}/utils
+	${COMMON_SRC_BASE}/drivers
+	${HOSTAP_BASE}/src
+	${ZEPHYR_BASE}/include
+	${ZEPHYR_BASE}/include/net
+)
+
+zephyr_library_sources(
+	${COMMON_SRC_BASE}/common/wpa_common.c
+	${COMMON_SRC_BASE}/common/ieee802_11_common.c
+	${COMMON_SRC_BASE}/common/hw_features_common.c
+	${COMMON_SRC_BASE}/common/wpa_ctrl.c
+	${COMMON_SRC_BASE}/common/cli.c
+
+	${COMMON_SRC_BASE}/drivers/driver_common.c
+	${COMMON_SRC_BASE}/drivers/drivers.c
+	${COMMON_SRC_BASE}/l2_packet/l2_packet_zephyr.c
+	${COMMON_SRC_BASE}/drivers/driver_zephyr.c
+	${COMMON_SRC_BASE}/utils/common.c
+	${COMMON_SRC_BASE}/utils/wpabuf.c
+	${COMMON_SRC_BASE}/utils/bitfield.c
+	${COMMON_SRC_BASE}/utils/eloop.c
+	${COMMON_SRC_BASE}/utils/os_zephyr.c
+	${COMMON_SRC_BASE}/utils/radiotap.c
+	${WPA_SUPPLICANT_BASE}/config.c
+	${WPA_SUPPLICANT_BASE}/notify.c
+	${WPA_SUPPLICANT_BASE}/bss.c
+	${WPA_SUPPLICANT_BASE}/eap_register.c
+	${WPA_SUPPLICANT_BASE}/op_classes.c
+	${WPA_SUPPLICANT_BASE}/rrm.c
+	${WPA_SUPPLICANT_BASE}/wmm_ac.c
+	${WPA_SUPPLICANT_BASE}/config_none.c
+	${WPA_SUPPLICANT_BASE}/sme.c
+	${WPA_SUPPLICANT_BASE}/wpa_supplicant.c
+	${WPA_SUPPLICANT_BASE}/events.c
+	${WPA_SUPPLICANT_BASE}/bssid_ignore.c
+	${WPA_SUPPLICANT_BASE}/wpas_glue.c
+	${WPA_SUPPLICANT_BASE}/scan.c
+	${WPA_SUPPLICANT_BASE}/robust_av.c
+	${WPA_SUPPLICANT_BASE}/ctrl_iface.c
+	${WPA_SUPPLICANT_BASE}/mbo.c
+	${WPA_SUPPLICANT_BASE}/wnm_sta.c
+	${WPA_SUPPLICANT_BASE}/wpa_cli_cmds.c
+	${WPA_SUPPLICANT_BASE}/ctrl_iface_zephyr.c
+	${WPA_SUPPLICANT_BASE}/wpa_cli_zephyr.c
+	# Zephyr main
+	src/supp_main.c
+	src/utils/wpa_debug.c
+	src/supp_api.c
+	src/supp_events.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_CLI
+	src/wpa_cli.c
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_AP
+	${WPA_SUPPLICANT_BASE}/ap.c
+	${COMMON_SRC_BASE}/ap/ap_config.c
+	${COMMON_SRC_BASE}/ap/ap_drv_ops.c
+	${COMMON_SRC_BASE}/ap/ap_list.c
+	${COMMON_SRC_BASE}/ap/ap_mlme.c
+	${COMMON_SRC_BASE}/ap/authsrv.c
+	${COMMON_SRC_BASE}/ap/beacon.c
+	${COMMON_SRC_BASE}/ap/bss_load.c
+	${COMMON_SRC_BASE}/ap/dfs.c
+	${COMMON_SRC_BASE}/ap/drv_callbacks.c
+	${COMMON_SRC_BASE}/ap/eap_user_db.c
+	${COMMON_SRC_BASE}/ap/hostapd.c
+	${COMMON_SRC_BASE}/ap/hw_features.c
+	${COMMON_SRC_BASE}/ap/ieee802_11_auth.c
+	${COMMON_SRC_BASE}/ap/ieee802_11.c
+	${COMMON_SRC_BASE}/ap/ieee802_11_he.c
+	${COMMON_SRC_BASE}/ap/ieee802_11_ht.c
+	${COMMON_SRC_BASE}/ap/ieee802_11_shared.c
+	${COMMON_SRC_BASE}/ap/ieee802_11_vht.c
+	${COMMON_SRC_BASE}/ap/ieee802_1x.c
+	${COMMON_SRC_BASE}/ap/neighbor_db.c
+	${COMMON_SRC_BASE}/ap/p2p_hostapd.c
+	${COMMON_SRC_BASE}/ap/pmksa_cache_auth.c
+	${COMMON_SRC_BASE}/ap/preauth_auth.c
+	${COMMON_SRC_BASE}/ap/rrm.c
+	${COMMON_SRC_BASE}/ap/sta_info.c
+	${COMMON_SRC_BASE}/ap/tkip_countermeasures.c
+	${COMMON_SRC_BASE}/ap/utils.c
+	${COMMON_SRC_BASE}/ap/wmm.c
+
+	${COMMON_SRC_BASE}/ap/wpa_auth.c
+	${COMMON_SRC_BASE}/ap/wpa_auth_ie.c
+	${COMMON_SRC_BASE}/ap/wpa_auth_ft.c
+	${COMMON_SRC_BASE}/ap/wpa_auth_glue.c
+
+	${COMMON_SRC_BASE}/eap_common/eap_common.c
+	${COMMON_SRC_BASE}/eap_server/eap_server.c
+	${COMMON_SRC_BASE}/eap_server/eap_server_identity.c
+	${COMMON_SRC_BASE}/eap_server/eap_server_methods.c
+	${COMMON_SRC_BASE}/eapol_auth/eapol_auth_sm.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_AP
+	CONFIG_AP
+	CONFIG_NO_RADIUS
+	CONFIG_NO_VLAN
+	CONFIG_NO_ACCOUNTING
+	CONFIG_NEED_AP_MLME
+	CONFIG_IEEE80211AX
+	CONFIG_EAP_SERVER
+	CONFIG_EAP_SERVER_IDENTITY
+)
+
+
+zephyr_library_sources_ifndef(CONFIG_WPA_SUPP_CRYPTO
+	${COMMON_SRC_BASE}/crypto/crypto_none.c
+	${COMMON_SRC_BASE}/crypto/tls_none.c
+)
+
+zephyr_library_compile_definitions_ifndef(CONFIG_WPA_SUPP_CRYPTO
+	CONFIG_NO_WPA
+	CONFIG_CRYPTO_INTERNAL
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_CRYPTO
+	CONFIG_WEP
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_CRYPTO
+	${COMMON_SRC_BASE}/common/wpa_common.c
+	${COMMON_SRC_BASE}/rsn_supp/wpa.c
+	${COMMON_SRC_BASE}/rsn_supp/preauth.c
+	${COMMON_SRC_BASE}/rsn_supp/wpa_ie.c
+
+	${COMMON_SRC_BASE}/crypto/crypto_mbedtls-bignum.c
+	${COMMON_SRC_BASE}/crypto/crypto_mbedtls-ec.c
+	${COMMON_SRC_BASE}/crypto/crypto_mbedtls.c
+	${COMMON_SRC_BASE}/crypto/tls_mbedtls.c
+	${COMMON_SRC_BASE}/crypto/aes-wrap.c
+	${COMMON_SRC_BASE}/crypto/aes-unwrap.c
+	${COMMON_SRC_BASE}/crypto/rc4.c
+	#${COMMON_SRC_BASE}/crypto/random.c
+	${COMMON_SRC_BASE}/crypto/sha1-prf.c
+	${COMMON_SRC_BASE}/crypto/sha256-prf.c
+	${COMMON_SRC_BASE}/crypto/sha256-prf.c
+	${COMMON_SRC_BASE}/crypto/sha384-prf.c
+)
+
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_WPA3
+	${COMMON_SRC_BASE}/common/sae.c
+	${COMMON_SRC_BASE}/common/dragonfly.c
+
+	${COMMON_SRC_BASE}/crypto/dh_groups.c
+	${COMMON_SRC_BASE}/crypto/sha256-kdf.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_WPA3
+	CONFIG_SAE
+	CONFIG_ECC
+)
+
+zephyr_library_include_directories_ifdef(CONFIG_WPA_SUPP_CRYPTO
+	${CMAKE_SOURCE_DIR}
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_P2P
+	${WPA_SUPPLICANT_BASE}/p2p_supplicant.c
+	${WPA_SUPPLICANT_BASE}/p2p_supplicant_sd.c
+	${COMMON_SRC_BASE}/p2p/p2p.c
+	${COMMON_SRC_BASE}/p2p/p2p_utils.c
+	${COMMON_SRC_BASE}/p2p/p2p_parse.c
+	${COMMON_SRC_BASE}/p2p/p2p_build.c
+	${COMMON_SRC_BASE}/p2p/p2p_go_neg.c
+	${COMMON_SRC_BASE}/p2p/p2p_sd.c
+	${COMMON_SRC_BASE}/p2p/p2p_pd.c
+	${COMMON_SRC_BASE}/p2p/p2p_invitation.c
+	${COMMON_SRC_BASE}/p2p/p2p_dev_disc.c
+	${COMMON_SRC_BASE}/p2p/p2p_group.c
+	${COMMON_SRC_BASE}/ap/p2p_hostapd.c
+	${COMMON_SRC_BASE}/common/gas.c
+	${WPA_SUPPLICANT_BASE}/gas_query.c
+	${WPA_SUPPLICANT_BASE}/offchannel.c
+)
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_WPS
+	${WPA_SUPPLICANT_BASE}/wps_supplicant.c
+	${COMMON_SRC_BASE}/utils/uuid.c
+	${COMMON_SRC_BASE}/eap_peer/eap_wsc.c
+	${COMMON_SRC_BASE}/eap_common/eap_wsc_common.c
+	${COMMON_SRC_BASE}/wps/wps.c
+	${COMMON_SRC_BASE}/ap/wps_hostapd.c
+	${COMMON_SRC_BASE}/wps/wps_common.c
+	${COMMON_SRC_BASE}/wps/wps_attr_parse.c
+	${COMMON_SRC_BASE}/wps/wps_attr_build.c
+	${COMMON_SRC_BASE}/wps/wps_attr_process.c
+	${COMMON_SRC_BASE}/wps/wps_dev_attr.c
+	${COMMON_SRC_BASE}/wps/wps_enrollee.c
+	${COMMON_SRC_BASE}/wps/wps_registrar.c
+	${COMMON_SRC_BASE}/crypto/dh_groups.c
+	${COMMON_SRC_BASE}/crypto/dh_group5.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_P2P
+	CONFIG_P2P
+	CONFIG_GAS
+	CONFIG_OFFCHANNEL
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_WPS
+	CONFIG_WPS
+	EAP_WSC
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_CRYPTO_ENTERPRISE
+	${COMMON_SRC_BASE}/eap_peer/eap_tls.c
+	${COMMON_SRC_BASE}/eap_peer/eap_tls_common.c
+
+
+	${COMMON_SRC_BASE}/eap_peer/eap_peap.c
+	${COMMON_SRC_BASE}/eap_common/eap_peap_common.c
+	${COMMON_SRC_BASE}/eap_peer/eap_ttls.c
+	${COMMON_SRC_BASE}/eap_peer/eap_md5.c
+	${COMMON_SRC_BASE}/eap_peer/eap_mschapv2.c
+	${COMMON_SRC_BASE}/eap_common/chap.c
+	${COMMON_SRC_BASE}/eap_peer/mschapv2.c
+	${COMMON_SRC_BASE}/eap_peer/eap_leap.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_psk.c
+	${COMMON_SRC_BASE}/eap_common/eap_psk_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_fast.c
+	${COMMON_SRC_BASE}/eap_peer/eap_fast_pac.c
+	${COMMON_SRC_BASE}/eap_common/eap_fast_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_pax.c
+	${COMMON_SRC_BASE}/eap_common/eap_pax_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_sake.c
+	${COMMON_SRC_BASE}/eap_common/eap_sake_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_gpsk.c
+	${COMMON_SRC_BASE}/eap_common/eap_gpsk_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_pwd.c
+	${COMMON_SRC_BASE}/eap_common/eap_pwd_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_eke.c
+	${COMMON_SRC_BASE}/eap_common/eap_eke_common.c
+
+	${COMMON_SRC_BASE}/eap_peer/eap_ikev2.c
+	${COMMON_SRC_BASE}/eap_peer/ikev2.c
+	${COMMON_SRC_BASE}/eap_common/eap_ikev2_common.c
+	${COMMON_SRC_BASE}/eap_common/ikev2_common.c
+
+	# common
+	${COMMON_SRC_BASE}/crypto/sha384-tlsprf.c
+	${COMMON_SRC_BASE}/crypto/sha256-tlsprf.c
+	${COMMON_SRC_BASE}/crypto/sha1-tlsprf.c
+	${COMMON_SRC_BASE}/crypto/sha1-tprf.c
+	${COMMON_SRC_BASE}/crypto/ms_funcs.c
+	${COMMON_SRC_BASE}/crypto/aes-eax.c
+	# MD4 removed from MbedTLS
+	${COMMON_SRC_BASE}/crypto/md4-internal
+	${COMMON_SRC_BASE}/crypto/aes-encblock.c
+
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_CRYPTO_ENTERPRISE
+	CONFIG_EAP_TLS
+	CONFIG_IEEE8021X_EAPOL
+	CONFIG_EAP_PEAP
+	CONFIG_EAP_TTLS
+	CONFIG_EAP_MD5
+	CONFIG_EAP_MSCHAPv2
+	CONFIG_EAP_LEAP
+	CONFIG_EAP_PSK
+	CONFIG_EAP_FAST
+	CONFIG_EAP_PAX
+	CONFIG_EAP_SAKE
+	CONFIG_EAP_GPSK
+	CONFIG_EAP_PWD
+	CONFIG_EAP_EKE
+	CONFIG_EAP_IKEv2
+)
+
+zephyr_library_sources_ifdef(CONFIG_WPA_SUPP_EAPOL
+	${COMMON_SRC_BASE}/eapol_supp/eapol_supp_sm.c
+	${COMMON_SRC_BASE}/eap_peer/eap.c
+	${COMMON_SRC_BASE}/eap_peer/eap_methods.c
+	${COMMON_SRC_BASE}/eap_common/eap_common.c
+	${COMMON_SRC_BASE}/rsn_supp/pmksa_cache.c
+)
+
+zephyr_library_compile_definitions_ifdef(CONFIG_WPA_SUPP_EAPOL
+	IEEE8021X_EAPOL
+)
+endif()