wifi_mgmt: Implement checks for new security types (0e5c9004) · Commits · Wenxi XU / zephyr

include/zephyr/net/wifi.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,10 @@ enum wifi_security_type {
		WIFI_SECURITY_TYPE_NONE = 0,
		WIFI_SECURITY_TYPE_PSK,
		WIFI_SECURITY_TYPE_PSK_SHA256,
		WIFI_SECURITY_TYPE_SAE
		WIFI_SECURITY_TYPE_SAE,

		__WIFI_SECURITY_TYPE_AFTER_LAST,
		WIFI_SECURITY_TYPE_MAX = __WIFI_SECURITY_TYPE_AFTER_LAST - 1
		};

		/* Management frame protection (IEEE 802.11w) options */

+9 −2

Original line number	Diff line number	Diff line
		@@ -28,14 +28,21 @@ static int wifi_connect(uint32_t mgmt_request, struct net_if *iface,

		LOG_HEXDUMP_DBG(params->ssid, params->ssid_length, "ssid");
		LOG_HEXDUMP_DBG(params->psk, params->psk_length, "psk");
		if (params->sae_password) {
		LOG_HEXDUMP_DBG(params->sae_password, params->sae_password_length, "sae");
		}
		NET_DBG("ch %u sec %u", params->channel, params->security);

		if ((params->security > WIFI_SECURITY_TYPE_PSK) \|\|
		if ((params->security > WIFI_SECURITY_TYPE_MAX) \|\|
		(params->ssid_length > WIFI_SSID_MAX_LEN) \|\|
		(params->ssid_length == 0U) \|\|
		((params->security == WIFI_SECURITY_TYPE_PSK) &&
		((params->security == WIFI_SECURITY_TYPE_PSK \|\|
		params->security == WIFI_SECURITY_TYPE_PSK_SHA256) &&
		((params->psk_length < 8) \|\| (params->psk_length > 64) \|\|
		(params->psk_length == 0U) \|\| !params->psk)) \|\|
		((params->security == WIFI_SECURITY_TYPE_SAE) &&
		((params->psk_length == 0U) \|\| !params->psk) &&
		((params->sae_password_length == 0U) \|\| !params->sae_password)) \|\|
		((params->channel != WIFI_CHANNEL_ANY) &&
		(params->channel > WIFI_CHANNEL_MAX)) \|\|
		!params->ssid) {