diff options
author | Jouni Malinen <jouni@qca.qualcomm.com> | 2016-10-26 17:41:59 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2016-10-27 10:03:21 -0400 |
commit | 6ec63612c3c8da200d040dd4846d646a747722df (patch) | |
tree | ef2a4712f37e690d3403a0da0d3d20bfe5441496 /net/mac80211/mlme.c | |
parent | 11b6b5a4ced2f2c76073b97ee08ca0eab8358fde (diff) |
mac80211: Allow AUTH_DATA to be used for FILS
The special SAE case should be limited only for SAE since the more
generic AUTH_DATA can now be used with other authentication algorithms
as well.
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 32fd29581d4d..00db34b204db 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -4491,9 +4491,12 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, | |||
4491 | auth_data->bss = req->bss; | 4491 | auth_data->bss = req->bss; |
4492 | 4492 | ||
4493 | if (req->auth_data_len >= 4) { | 4493 | if (req->auth_data_len >= 4) { |
4494 | __le16 *pos = (__le16 *) req->auth_data; | 4494 | if (req->auth_type == NL80211_AUTHTYPE_SAE) { |
4495 | auth_data->sae_trans = le16_to_cpu(pos[0]); | 4495 | __le16 *pos = (__le16 *) req->auth_data; |
4496 | auth_data->sae_status = le16_to_cpu(pos[1]); | 4496 | |
4497 | auth_data->sae_trans = le16_to_cpu(pos[0]); | ||
4498 | auth_data->sae_status = le16_to_cpu(pos[1]); | ||
4499 | } | ||
4497 | memcpy(auth_data->data, req->auth_data + 4, | 4500 | memcpy(auth_data->data, req->auth_data + 4, |
4498 | req->auth_data_len - 4); | 4501 | req->auth_data_len - 4); |
4499 | auth_data->data_len += req->auth_data_len - 4; | 4502 | auth_data->data_len += req->auth_data_len - 4; |