system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-20 08:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm-util: fix WPA Ad-Hoc capability matching

Browse source 
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.
This commit is contained in:
Dan Williams 2009-03-04 12:56:10 -05:00
parent 9e0ebf36ac
commit d5bbd6dd49
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libnm-util/nm-utils.c
View file

@ -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;