From d1ccade397f0432e4b101fb6608d15b1a7168282 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 4 Mar 2009 12:56:10 -0500 Subject: [PATCH] libnm-util: fix WPA Ad-Hoc capability matching Drivers won't necessarily add the "PSK" flag to the beacon for Ad-Hoc APs, which is fine because PSK is the only type of security that Ad-Hoc can do. --- libnm-util/nm-utils.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index e8a3027ed0..47c0f7c15c 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -904,7 +904,8 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA)) return FALSE; if (have_ap) { - if (ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) { + /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ + if ((ap_wpa & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { if ( (ap_wpa & NM_802_11_AP_SEC_PAIR_TKIP) && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) return TRUE; @@ -919,7 +920,8 @@ nm_utils_security_valid (NMUtilsSecurityType type, if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) return FALSE; if (have_ap) { - if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) { + /* Ad-Hoc WPA APs won't necessarily have the PSK flag set */ + if ((ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_PSK) || adhoc) { if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP)) return TRUE;