From 31aac7a9d8f817708fa8b6ef2fb4f1a45e1affe1 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 7 Jan 2020 11:28:25 +0100 Subject: [PATCH] libnm: let nm_utils_security_valid() reject adhoc mode with SAE --- libnm-core/nm-utils.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 5e1f70e41f..cf5c1de28c 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -1282,16 +1282,10 @@ nm_utils_security_valid (NMUtilsSecurityType type, case NMU_SEC_SAE: if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN)) return FALSE; + if (adhoc) + return FALSE; if (!have_ap) return TRUE; - if (adhoc) { - if (!(wifi_caps & NM_WIFI_DEVICE_CAP_IBSS_RSN)) - return FALSE; - if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_CCMP) - && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_CCMP)) - return TRUE; - return FALSE; - } if (ap_rsn & NM_802_11_AP_SEC_KEY_MGMT_SAE) { if ( (ap_rsn & NM_802_11_AP_SEC_PAIR_TKIP) && (wifi_caps & NM_WIFI_DEVICE_CAP_CIPHER_TKIP))