colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client/cli: add support for OWE key management flag

Browse Source
This commit is contained in:
David Bauer
2019-11-17 22:24:19 +01:00
committed by Beniamino Galvani
parent f7aa5b3a36
commit 977c0c2387
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
clients/cli/devices.c
View File

@@ -28,7 +28,7 @@
static char * static char *
ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags) ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags)
{ {
char *flags_str[13]; char *flags_str[14];
int i = 0; int i = 0;
if (flags & NM_802_11_AP_SEC_PAIR_WEP40) if (flags & NM_802_11_AP_SEC_PAIR_WEP40)
@@ -53,6 +53,8 @@ ap_wpa_rsn_flags_to_string (NM80211ApSecurityFlags flags)
flags_str[i++] = "802.1X"; flags_str[i++] = "802.1X";
if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) if (flags & NM_802_11_AP_SEC_KEY_MGMT_SAE)
flags_str[i++] = "sae"; flags_str[i++] = "sae";
if (flags & NM_802_11_AP_SEC_KEY_MGMT_OWE)
flags_str[i++] = "owe";
/* Make sure you grow flags_str when adding items here. */ /* Make sure you grow flags_str when adding items here. */
if (i == 0) if (i == 0)
@@ -1204,6 +1206,9 @@ fill_output_access_point (gpointer data, gpointer user_data)
if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) { if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_SAE) {
g_string_append (security_str, "WPA3 "); g_string_append (security_str, "WPA3 ");
} }
if (rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE) {
g_string_append (security_str, "OWE ");
}
if ( (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X) if ( (wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_802_1X)
|| (rsn_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 "); g_string_append (security_str, "802.1X ");
@@ -3558,8 +3563,8 @@ do_device_wifi_connect (NmCli *nmc, int argc, char **argv)
/* Set password for WEP or WPA-PSK. */ /* Set password for WEP or WPA-PSK. */
if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY)
|| ap_wpa_flags != NM_802_11_AP_SEC_NONE || (ap_wpa_flags != NM_802_11_AP_SEC_NONE && !(ap_wpa_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE))
|| ap_rsn_flags != NM_802_11_AP_SEC_NONE) { || (ap_rsn_flags != NM_802_11_AP_SEC_NONE && !(ap_rsn_flags & NM_802_11_AP_SEC_KEY_MGMT_OWE))) {
const char *con_password = NULL; const char *con_password = NULL;
NMSettingWirelessSecurity *s_wsec = NULL; NMSettingWirelessSecurity *s_wsec = NULL;
@@ -4231,6 +4236,9 @@ print_wifi_connection (const NmcConfig *nmc_config, NMConnection *connection)
|| strcmp (key_mgmt, "sae") == 0) { || strcmp (key_mgmt, "sae") == 0) {
type = "WPA"; type = "WPA";
g_print ("%s: WPA\n", _("Security")); g_print ("%s: WPA\n", _("Security"));
} else if ( strcmp (key_mgmt, "owe") == 0) {
type = "nopass";
g_print ("%s: OWE\n", _("Security"));
} }
if (psk) if (psk)