[nrf fromlist] net: wifi: Expand security enumeration for scan display

Expand the security modes identified in the display-scan
results. Add appropriate strings for corresponding
enumerations.

Signed-off-by: Ravi Dondaputi <[email protected]>

Author: rado17

drivers/wifi/nrf_wifi/src/wifi_mgmt_scan.c

@@ -299,6 +299,18 @@ static inline enum wifi_security_type drv_to_wifi_mgmt(int drv_security_type)
 		return WIFI_SECURITY_TYPE_EAP;
 	case NRF_WIFI_EAP_TLS_SHA256:
 		return WIFI_SECURITY_TYPE_EAP_TLS_SHA256;
+	case NRF_WIFI_FT_EAP:
+		return WIFI_SECURITY_TYPE_FT_EAP;
+	case NRF_WIFI_EAP_SUITEB_SHA256:
+		return WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA256;
+	case NRF_WIFI_EAP_SUITEB_SHA384:
+		return WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA384;
+	case NRF_WIFI_FT_EAP_SHA384:
+		return WIFI_SECURITY_TYPE_FT_EAP_SHA384;
+	case NRF_WIFI_FT_PSK_SHA384:
+		return WIFI_SECURITY_TYPE_FT_PSK;
+	case NRF_WIFI_PSK_SHA384:
+		return WIFI_SECURITY_TYPE_PSK_SHA384;
 	default:
 		return WIFI_SECURITY_TYPE_UNKNOWN;
 	}

include/zephyr/net/wifi.h

@@ -46,6 +46,8 @@ enum wifi_security_type {
 	WIFI_SECURITY_TYPE_PSK,
 	/** WPA2-PSK-SHA256 security. */
 	WIFI_SECURITY_TYPE_PSK_SHA256,
+	/** WPA2-PSK-SHA384 security. */
+	WIFI_SECURITY_TYPE_PSK_SHA384,
 	/** WPA3-SAE security. */
 	WIFI_SECURITY_TYPE_SAE,
 	/** WPA3-SAE security with hunting-and-pecking loop. */
@@ -78,6 +80,18 @@ enum wifi_security_type {
 	WIFI_SECURITY_TYPE_EAP_PEAP_TLS,
 	/** EAP TLS SHA256 security - Enterprise. */
 	WIFI_SECURITY_TYPE_EAP_TLS_SHA256,
+	/** EAP TLS SUITEB-SHA256 security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA256,
+	/** EAP TLS SUITEB-192 security - Enterprise. */
+	WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA384,
+	/** FT-PSK security */
+	WIFI_SECURITY_TYPE_FT_PSK,
+	/** FT-SAE security */
+	WIFI_SECURITY_TYPE_FT_SAE,
+	/** FT-EAP security */
+	WIFI_SECURITY_TYPE_FT_EAP,
+	/** FT-EAP-SHA384 security */
+	WIFI_SECURITY_TYPE_FT_EAP_SHA384,
 
 	/** @cond INTERNAL_HIDDEN */
 	__WIFI_SECURITY_TYPE_AFTER_LAST,

subsys/net/l2/wifi/wifi_mgmt.c

@@ -43,6 +43,30 @@ const char *wifi_security_txt(enum wifi_security_type security)
 		return "EAP";
 	case WIFI_SECURITY_TYPE_WPA_AUTO_PERSONAL:
 		return "WPA/WPA2/WPA3 PSK";
+	case WIFI_SECURITY_TYPE_DPP:
+		return "DPP";
+	case WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2:
+		return "EAP-PEAP-MSCHAPV2";
+	case WIFI_SECURITY_TYPE_EAP_PEAP_GTC:
+		return "EAP-PEAP-GTC";
+	case WIFI_SECURITY_TYPE_EAP_TTLS_MSCHAPV2:
+		return "EAP-TTLS-MSCHAPV2";
+	case WIFI_SECURITY_TYPE_EAP_PEAP_TLS:
+		return "EAP-PEAP-TLS";
+	case WIFI_SECURITY_TYPE_EAP_TLS_SHA256:
+		return "EAP-TLS-SHA256";
+	case WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA256:
+		return "WPA3-SUITEB-EAP-TLS";
+	case WIFI_SECURITY_TYPE_EAP_TLS_SUITEB_SHA384:
+		return "WPA3-SUITEB192-EAP-TLS";
+	case WIFI_SECURITY_TYPE_FT_PSK:
+		return "FT-PSK";
+	case WIFI_SECURITY_TYPE_FT_SAE:
+		return "FT-SAE";
+	case WIFI_SECURITY_TYPE_FT_EAP:
+		return "FT-EAP";
+	case WIFI_SECURITY_TYPE_FT_EAP_SHA384:
+		return "FT-EAP-SHA384";
 	case WIFI_SECURITY_TYPE_UNKNOWN:
 	default:
 		return "UNKNOWN";

subsys/net/l2/wifi/wifi_shell.c

@@ -175,14 +175,14 @@ static void handle_wifi_scan_result(struct net_mgmt_event_callback *cb)
 	context.scan_result++;
 
 	if (context.scan_result == 1U) {
-		PR("\n%-4s | %-32s %-5s | %-13s | %-4s | %-15s | %-17s | %-8s\n",
+		PR("\n%-4s | %-32s %-5s | %-13s | %-4s | %-24s | %-17s | %-8s\n",
 		   "Num", "SSID", "(len)", "Chan (Band)", "RSSI", "Security", "BSSID", "MFP");
 	}
 
 	strncpy(ssid_print, entry->ssid, sizeof(ssid_print) - 1);
 	ssid_print[sizeof(ssid_print) - 1] = '\0';
 
-	PR("%-4d | %-32s %-5u | %-4u (%-6s) | %-4d | %-15s | %-17s | %-8s\n",
+	PR("%-4d | %-32s %-5u | %-4u (%-6s) | %-4d | %-24s | %-17s | %-8s\n",
 	   context.scan_result, ssid_print, entry->ssid_length, entry->channel,
 	   wifi_band_txt(entry->band),
 	   entry->rssi,