diff options
| author | Antonio Cardace <acardace@redhat.com> | 2020-12-22 18:30:34 +0100 |
|---|---|---|
| committer | Antonio Cardace <acardace@redhat.com> | 2020-12-22 18:30:34 +0100 |
| commit | ff6cb8f5282ee0051fa6fc3c0c87ab0eb72d2568 (patch) | |
| tree | 00d0350e9800d907d31e5848cc91d2c93c0aac14 /clients/cli | |
| parent | ee4f806959a2783c2fa8db4a3d6bfc1bcfbc519b (diff) | |
| parent | e874ccc9177c32ef8e19e094a2ddcec32b3b71e1 (diff) | |
| download | NetworkManager-ff6cb8f5282ee0051fa6fc3c0c87ab0eb72d2568.tar.gz | |
wifi: merge branch 'ac/wpa3eap_suiteb192'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/709
Diffstat (limited to 'clients/cli')
| -rw-r--r-- | clients/cli/devices.c | 2 | ||||
| -rw-r--r-- | clients/cli/generate-docs-nm-settings-nmcli.xml.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index c45bbc2319..c592e7001a 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -54,6 +54,8 @@ ap_wpa_rsn_flags_to_string(NM80211ApSecurityFlags flags, NMMetaAccessorGetType g flags_str[i++] = "802.1X"; if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) flags_str[i++] = "sae"; + if (flags & NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192) + flags_str[i++] = "wpa-eap-suite-b-192"; if (NM_FLAGS_ANY(flags, NM_802_11_AP_SEC_KEY_MGMT_OWE | NM_802_11_AP_SEC_KEY_MGMT_OWE_TM)) flags_str[i++] = "owe"; diff --git a/clients/cli/generate-docs-nm-settings-nmcli.xml.in b/clients/cli/generate-docs-nm-settings-nmcli.xml.in index 1d1a09ba4a..a4e6715cc8 100644 --- a/clients/cli/generate-docs-nm-settings-nmcli.xml.in +++ b/clients/cli/generate-docs-nm-settings-nmcli.xml.in @@ -63,7 +63,7 @@ <setting name="802-11-wireless-security" alias="wifi-sec" > <property name="key-mgmt" - description="Key management used for the connection. One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE), "owe" (Opportunistic Wireless Encryption) or "wpa-eap" (WPA-Enterprise). This property must be set for any Wi-Fi connection that uses security." /> + description="Key management used for the connection. One of "none" (WEP), "ieee8021x" (Dynamic WEP), "wpa-psk" (infrastructure WPA-PSK), "sae" (SAE), "owe" (Opportunistic Wireless Encryption), "wpa-eap" (WPA-Enterprise) or "wpa-eap-suite-b-192" (WPA3-Enterprise Suite B). This property must be set for any Wi-Fi connection that uses security." /> <property name="wep-tx-keyidx" description="When static WEP is used (ie, key-mgmt = "none") and a non-default WEP key index is used by the AP, put that WEP key index here. Valid values are 0 (default key) through 3. Note that some consumer access points (like the Linksys WRT54G) number the keys 1 - 4." /> <property name="auth-alg" |