jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix SME to update WPA/RSN IE for rsn_supp module based on AssocReq

Browse source 
When using wpa_supplicant SME (i.e., using nl80211), the rsn_supp
module was not informed of the WPA/RSN IE that was used in
(Re)Association Request frame. This broke roaming between APs that
use different security policy (e.g., changing between WPA/TKIP and
WPA2/CCMP APs) or when using PMKSA caching.
This commit is contained in:
Jouni Malinen 2010-04-07 10:31:06 +03:00
parent 68532a9ceb
commit d9a27b0455
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/sme.c
View file

@ -16,6 +16,7 @@
#include "common.h" #include "common.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "eapol_supp/eapol_supp_sm.h" #include "eapol_supp/eapol_supp_sm.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "rsn_supp/wpa.h" #include "rsn_supp/wpa.h"
@ -294,6 +295,7 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
const u8 *bssid, u16 auth_type) const u8 *bssid, u16 auth_type)
{ {
struct wpa_driver_associate_params params; struct wpa_driver_associate_params params;
struct ieee802_11_elems elems;
os_memset(&params, 0, sizeof(params)); os_memset(&params, 0, sizeof(params));
params.bssid = bssid; params.bssid = bssid;
@ -321,6 +323,20 @@ void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode,
wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING); wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATING);
if (ieee802_11_parse_elems(params.wpa_ie, params.wpa_ie_len, &elems, 0)
< 0) {
wpa_printf(MSG_DEBUG, "SME: Could not parse own IEs?!");
os_memset(&elems, 0, sizeof(elems));
}
if (elems.rsn_ie)
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, elems.rsn_ie - 2,
elems.rsn_ie_len + 2);
else if (elems.wpa_ie)
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, elems.wpa_ie - 2,
elems.wpa_ie_len + 2);
else
wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
if (wpa_drv_associate(wpa_s, &params) < 0) { if (wpa_drv_associate(wpa_s, &params) < 0) {
wpa_msg(wpa_s, MSG_INFO, "Association request to the driver " wpa_msg(wpa_s, MSG_INFO, "Association request to the driver "
"failed"); "failed");