mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-26 18:20:49 +02:00
clients/cli: if the AP supports SAE, claim WPA3 support
RSN with SAE is what's called WPA3-Personal. Also, if there's neither PSK nor 802.1x, it's not WPA2.
This commit is contained in:
Lubomir Rintel
parent
640164e979
commit
fab1116494
3 changed files with 271 additions and 267 deletions
|
|
@ -1165,9 +1165,13 @@ fill_output_access_point (gpointer data, gpointer user_data)
|
|||
if (wpa_flags != NM_802_11_AP_SEC_NONE) {
|
||||
g_string_append (security_str, "WPA1 ");
|
||||
}
|
||||
if (rsn_flags != NM_802_11_AP_SEC_NONE) {
|
||||
if ( (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_PSK)
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
|
||||
g_string_append (security_str, "WPA2 ");
|
||||
}
|
||||
if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) {
|
||||
g_string_append (security_str, "WPA3 ");
|
||||
}
|
||||
if ( (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
|
||||
|| (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)) {
|
||||
g_string_append (security_str, "802.1X ");
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ AP[1].CHAN: 1
|
|||
AP[1].RATE: 54 Mbit/s
|
||||
AP[1].SIGNAL: 55
|
||||
AP[1].BARS: **
|
||||
AP[1].SECURITY: WPA2
|
||||
AP[1].SECURITY: WPA3
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID: wlan0-ap-1
|
||||
AP[2].MODE: Infra
|
||||
|
|
@ -179,7 +179,7 @@ AP[1].CHAN: 1
|
|||
AP[1].RATE: 54 Mb/s
|
||||
AP[1].SIGNAL: 55
|
||||
AP[1].BARS: **
|
||||
AP[1].SECURITY: WPA2
|
||||
AP[1].SECURITY: WPA3
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID: wlan0-ap-1
|
||||
AP[2].MODE: Infrastruktura
|
||||
|
|
@ -215,7 +215,7 @@ AP[1].CHAN: 1
|
|||
AP[1].RATE: 54 Mbit/s
|
||||
AP[1].SIGNAL: 55
|
||||
AP[1].BARS: **
|
||||
AP[1].SECURITY: WPA2
|
||||
AP[1].SECURITY: WPA3
|
||||
-------------------------------------------------------------------------------
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID: wlan0-ap-1
|
||||
|
|
@ -254,7 +254,7 @@ AP[1].CHAN: 1
|
|||
AP[1].RATE: 54 Mb/s
|
||||
AP[1].SIGNAL: 55
|
||||
AP[1].BARS: **
|
||||
AP[1].SECURITY: WPA2
|
||||
AP[1].SECURITY: WPA3
|
||||
-------------------------------------------------------------------------------
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID: wlan0-ap-1
|
||||
|
|
@ -290,7 +290,7 @@ AP[1].CHAN:1
|
|||
AP[1].RATE:54 Mbit/s
|
||||
AP[1].SIGNAL:55
|
||||
AP[1].BARS:**
|
||||
AP[1].SECURITY:WPA2
|
||||
AP[1].SECURITY:WPA3
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID:wlan0-ap-1
|
||||
AP[2].MODE:Infra
|
||||
|
|
@ -323,7 +323,7 @@ AP[1].CHAN:1
|
|||
AP[1].RATE:54 Mb/s
|
||||
AP[1].SIGNAL:55
|
||||
AP[1].BARS:**
|
||||
AP[1].SECURITY:WPA2
|
||||
AP[1].SECURITY:WPA3
|
||||
AP[2].IN-USE:
|
||||
AP[2].SSID:wlan0-ap-1
|
||||
AP[2].MODE:Infrastruktura
|
||||
|
|
@ -350,7 +350,7 @@ returncode: 0
|
|||
stdout: 304 bytes
|
||||
>>>
|
||||
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
|
||||
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA2
|
||||
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA3
|
||||
AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1
|
||||
AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
|
||||
|
||||
|
|
@ -363,7 +363,7 @@ returncode: 0
|
|||
stdout: 338 bytes
|
||||
>>>
|
||||
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
|
||||
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA2
|
||||
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA3
|
||||
AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1
|
||||
AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2
|
||||
|
||||
|
|
@ -380,7 +380,7 @@ stdout: 460 bytes
|
|||
==========================
|
||||
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
|
||||
----------------------------------------------------------------------------
|
||||
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA2
|
||||
AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA3
|
||||
AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1
|
||||
AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2
|
||||
|
||||
|
|
@ -397,7 +397,7 @@ stdout: 530 bytes
|
|||
===================================
|
||||
NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY
|
||||
-----------------------------------------------------------------------------------
|
||||
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA2
|
||||
AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA3
|
||||
AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1
|
||||
AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2
|
||||
|
||||
|
|
@ -409,7 +409,7 @@ lang: C
|
|||
returncode: 0
|
||||
stdout: 155 bytes
|
||||
>>>
|
||||
AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA2
|
||||
AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA3
|
||||
AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1
|
||||
AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2
|
||||
|
||||
|
|
@ -421,7 +421,7 @@ lang: pl_PL.UTF-8
|
|||
returncode: 0
|
||||
stdout: 182 bytes
|
||||
>>>
|
||||
AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA2
|
||||
AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA3
|
||||
AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:** :WPA1
|
||||
AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:** :WPA1 WPA2
|
||||
|
||||
|
|
@ -434,7 +434,7 @@ returncode: 0
|
|||
stdout: 1840 bytes
|
||||
>>>
|
||||
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
|
||||
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA2 (none) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
|
||||
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA3 (none) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3
|
||||
AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infra 1 2412 MHz 54 Mbit/s 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (none) wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1
|
||||
AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2
|
||||
|
||||
|
|
@ -452,7 +452,7 @@ returncode: 0
|
|||
stdout: 1898 bytes
|
||||
>>>
|
||||
NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH
|
||||
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA2 (brak) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
|
||||
AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA3 (brak) pair_tkip pair_ccmp group_tkip group_ccmp sae wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3
|
||||
AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infrastruktura 1 2412 MHz 54 Mb/s 44 ** WPA1 pair_tkip pair_ccmp group_tkip group_ccmp psk (brak) wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1
|
||||
AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue