[1/3] scan: remove force_default_sae_group from scan_bss

Commit Message

James Prestwood May 13, 2024, 6 p.m. UTC

This was added to support a single buggy AP model that failed to
negotiate the SAE group correctly. This may still be a problem but
since then the [Network].UseDefaultEccGroup option has been added
which accomplishes the same thing.

Remove the special handling for this specific OUI and rely on the
user setting the new option if they have problems.
---
 src/network.c | 3 +--
 src/scan.c    | 3 ---
 src/scan.h    | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

Comments

Denis Kenzior May 14, 2024, 3:27 p.m. UTC | #1

Hi James,

On 5/13/24 1:00 PM, James Prestwood wrote:
> This was added to support a single buggy AP model that failed to
> negotiate the SAE group correctly. This may still be a problem but
> since then the [Network].UseDefaultEccGroup option has been added
> which accomplishes the same thing.
> 
> Remove the special handling for this specific OUI and rely on the
> user setting the new option if they have problems.
> ---
>   src/network.c | 3 +--
>   src/scan.c    | 3 ---
>   src/scan.h    | 1 -
>   3 files changed, 1 insertion(+), 6 deletions(-)
> 

All applied, thanks.

Regards,
-Denis

Patch

diff --git a/src/network.c b/src/network.c
index 7b996f51..09099fac 100644
--- a/src/network.c
+++ b/src/network.c
@@ -556,8 +556,7 @@  int network_handshake_setup(struct network *network, struct scan_bss *bss,
 		handshake_state_set_protocol_version(hs, eapol_proto_version);
 	}
 
-	hs->force_default_ecc_group = network->force_default_ecc_group ||
-						bss->force_default_sae_group;
+	hs->force_default_ecc_group = network->force_default_ecc_group;
 
 	/*
 	 * The randomization options in the provisioning file are dependent on
diff --git a/src/scan.c b/src/scan.c
index f48ffdef..d3f0ad31 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -1242,9 +1242,6 @@  static void scan_parse_vendor_specific(struct scan_bss *bss, const void *data,
 		bss->cost_flags = cost_flags;
 		return;
 	}
-
-	if (is_ie_default_sae_group_oui(data, len))
-		bss->force_default_sae_group = true;
 }
 
 /*
diff --git a/src/scan.h b/src/scan.h
index 65caf41c..516b6152 100644
--- a/src/scan.h
+++ b/src/scan.h
@@ -82,7 +82,6 @@  struct scan_bss {
 	bool vht_capable : 1;
 	bool anqp_capable : 1;
 	bool hs20_capable : 1;
-	bool force_default_sae_group : 1;
 	bool proxy_arp : 1;
 	bool hs20_dgaf_disable : 1;
 	uint8_t cost_level : 3;