mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2024-11-25 09:39:25 +01:00
sae: remove sae_sm_set_force_group_19, use handshake
Use the flag set into the handshake to force the default ECC group
This commit is contained in:
parent
988f68e916
commit
a559bd7c40
@ -3834,9 +3834,6 @@ static void netdev_connect_common(struct netdev *netdev,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bss->force_default_sae_group)
|
|
||||||
sae_sm_set_force_group_19(netdev->ap);
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case IE_RSN_AKM_SUITE_OWE:
|
case IE_RSN_AKM_SUITE_OWE:
|
||||||
netdev->owe_sm = owe_sm_new(hs);
|
netdev->owe_sm = owe_sm_new(hs);
|
||||||
|
@ -1459,13 +1459,6 @@ bool sae_sm_is_h2e(struct auth_proto *ap)
|
|||||||
return sm->sae_type != CRYPTO_SAE_LOOPING;
|
return sm->sae_type != CRYPTO_SAE_LOOPING;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sae_sm_set_force_group_19(struct auth_proto *ap)
|
|
||||||
{
|
|
||||||
struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap);
|
|
||||||
|
|
||||||
sm->force_default_group = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void sae_free(struct auth_proto *ap)
|
static void sae_free(struct auth_proto *ap)
|
||||||
{
|
{
|
||||||
struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap);
|
struct sae_sm *sm = l_container_of(ap, struct sae_sm, ap);
|
||||||
@ -1501,6 +1494,7 @@ struct auth_proto *sae_sm_new(struct handshake_state *hs,
|
|||||||
sm->user_data = user_data;
|
sm->user_data = user_data;
|
||||||
sm->handshake = hs;
|
sm->handshake = hs;
|
||||||
sm->state = SAE_STATE_NOTHING;
|
sm->state = SAE_STATE_NOTHING;
|
||||||
|
sm->force_default_group = hs->force_default_ecc_group;
|
||||||
|
|
||||||
sm->ap.start = sae_start;
|
sm->ap.start = sae_start;
|
||||||
sm->ap.free = sae_free;
|
sm->ap.free = sae_free;
|
||||||
|
@ -30,8 +30,6 @@ typedef void (*sae_tx_associate_func_t)(void *user_data);
|
|||||||
|
|
||||||
bool sae_sm_is_h2e(struct auth_proto *ap);
|
bool sae_sm_is_h2e(struct auth_proto *ap);
|
||||||
|
|
||||||
void sae_sm_set_force_group_19(struct auth_proto *ap);
|
|
||||||
|
|
||||||
struct auth_proto *sae_sm_new(struct handshake_state *hs,
|
struct auth_proto *sae_sm_new(struct handshake_state *hs,
|
||||||
sae_tx_authenticate_func_t tx_auth,
|
sae_tx_authenticate_func_t tx_auth,
|
||||||
sae_tx_associate_func_t tx_assoc,
|
sae_tx_associate_func_t tx_assoc,
|
||||||
|
Loading…
Reference in New Issue
Block a user