mirror of
https://github.com/vanhoefm/fragattacks.git
synced 2024-11-28 10:18:21 -05:00
sme: Try all authentication algorithms when the first one fails
When passing several authentication algorithms through auth_alg, we should try all of them when the first one fails. The wext driver goes through the connect nl80211 command and the retries are then handled by the kernel. The nl80211 doesn't and we have to handle that from userspace. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
cb30b297bd
commit
cb1583f64b
@ -2513,10 +2513,6 @@ retry:
|
||||
wpa_hexdump(MSG_DEBUG, " * IEs", params->ie, params->ie_len);
|
||||
if (params->ie)
|
||||
NLA_PUT(msg, NL80211_ATTR_IE, params->ie_len, params->ie);
|
||||
/*
|
||||
* TODO: if multiple auth_alg options enabled, try them one by one if
|
||||
* the AP rejects authentication due to unknown auth alg
|
||||
*/
|
||||
if (params->auth_alg & WPA_AUTH_ALG_OPEN)
|
||||
type = NL80211_AUTHTYPE_OPEN_SYSTEM;
|
||||
else if (params->auth_alg & WPA_AUTH_ALG_SHARED)
|
||||
|
@ -274,7 +274,33 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
|
||||
if (data->auth.status_code != WLAN_STATUS_SUCCESS) {
|
||||
wpa_printf(MSG_DEBUG, "SME: Authentication failed (status "
|
||||
"code %d)", data->auth.status_code);
|
||||
return;
|
||||
|
||||
if (data->auth.status_code !=
|
||||
WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG ||
|
||||
wpa_s->sme.auth_alg == data->auth.auth_type ||
|
||||
wpa_s->current_ssid->auth_alg == WPA_AUTH_ALG_LEAP)
|
||||
return;
|
||||
|
||||
switch (data->auth.auth_type) {
|
||||
case WLAN_AUTH_OPEN:
|
||||
wpa_s->current_ssid->auth_alg = WPA_AUTH_ALG_SHARED;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "SME: Trying SHARED auth");
|
||||
wpa_supplicant_associate(wpa_s, wpa_s->current_bss,
|
||||
wpa_s->current_ssid);
|
||||
return;
|
||||
|
||||
case WLAN_AUTH_SHARED_KEY:
|
||||
wpa_s->current_ssid->auth_alg = WPA_AUTH_ALG_LEAP;
|
||||
|
||||
wpa_printf(MSG_DEBUG, "SME: Trying LEAP auth");
|
||||
wpa_supplicant_associate(wpa_s, wpa_s->current_bss,
|
||||
wpa_s->current_ssid);
|
||||
return;
|
||||
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_IEEE80211R
|
||||
|
Loading…
Reference in New Issue
Block a user