network: set use default ECC group in handshake setup

If either the settings specify it, or the scan_bss is flagged, set
the use_default_ecc_group flag in the handshake.

This also renames the flag to cover both OWE and SAE
This commit is contained in:
James Prestwood 2024-02-27 10:33:58 -08:00 committed by Denis Kenzior
parent b38f71f221
commit 988f68e916
3 changed files with 4 additions and 4 deletions

View File

@ -140,7 +140,7 @@ struct handshake_state {
bool authenticator_ocvc : 1;
bool supplicant_ocvc : 1;
bool ext_key_id_capable : 1;
bool force_default_owe_group : 1;
bool force_default_ecc_group : 1;
uint8_t ssid[32];
size_t ssid_len;
char *passphrase;

View File

@ -556,8 +556,8 @@ int network_handshake_setup(struct network *network, struct scan_bss *bss,
handshake_state_set_protocol_version(hs, eapol_proto_version);
}
if (hs->akm_suite == IE_RSN_AKM_SUITE_OWE)
hs->force_default_owe_group = network->force_default_ecc_group;
hs->force_default_ecc_group = network->force_default_ecc_group ||
bss->force_default_sae_group;
/*
* The randomization options in the provisioning file are dependent on

View File

@ -45,7 +45,7 @@ struct owe_sm {
static bool owe_reset(struct owe_sm *owe)
{
if (owe->hs->force_default_owe_group) {
if (owe->hs->force_default_ecc_group) {
if (owe->retry != 0) {
l_warn("Forced default OWE group but was rejected!");
return false;