SAE: Ignore commit message when waiting for confirm in STA mode

Previously, an unexpected SAE commit message resulted in forcing
disconnection. While that allowed recovery by starting from scratch,
this is not really necessary. Ignore such unexpected SAE commit message
instead and allow SAE confirm message to be processed after this. This
is somewhat more robust way of handling the cases where SAE commit
message might be retransmitted either in STA->AP or AP->STA direction.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-10-27 14:35:04 +02:00
parent 50a2c8c906
commit 1b5865a53f

View file

@ -1242,8 +1242,11 @@ static int sme_sae_auth(struct wpa_supplicant *wpa_s, u16 auth_transaction,
if ((!external && wpa_s->current_bss == NULL) || if ((!external && wpa_s->current_bss == NULL) ||
wpa_s->current_ssid == NULL) wpa_s->current_ssid == NULL)
return -1; return -1;
if (wpa_s->sme.sae.state != SAE_COMMITTED) if (wpa_s->sme.sae.state != SAE_COMMITTED) {
return -1; wpa_printf(MSG_DEBUG,
"SAE: Ignore commit message while waiting for confirm");
return 0;
}
if (groups && groups[0] <= 0) if (groups && groups[0] <= 0)
groups = NULL; groups = NULL;
res = sae_parse_commit(&wpa_s->sme.sae, data, len, NULL, NULL, res = sae_parse_commit(&wpa_s->sme.sae, data, len, NULL, NULL,