DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

TDLS: Use proper IE parsing routine for non-EAPOL-Key cases

Browse source 
wpa_supplicant_parse_ies() was never supposed to be used as a generic IE
parser, i.e., it is for the specific purpose of parsing EAPOL-Key Key
Data IEs and KDEs. TDLS used this function for parsing generic AP IEs
and while that works, it resulted in confusing "WPA: Unrecognized
EAPOL-Key Key Data IE" debug messages. Clean this up by using
ieee802_11_parse_elems() for the cases where generic IEs are being
parsed.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-09-05 20:51:11 +03:00
parent dcc8bc82e0
commit faf427645a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/rsn_supp/tdls.c
View file

@ -12,6 +12,7 @@
#include "utils/eloop.h" #include "utils/eloop.h"
#include "utils/os.h" #include "utils/os.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"
#include "crypto/crypto.h" #include "crypto/crypto.h"
#include "crypto/aes_wrap.h" #include "crypto/aes_wrap.h"
@ -2859,14 +2860,14 @@ void wpa_tdls_disassoc(struct wpa_sm *sm)
} }
static int wpa_tdls_prohibited(struct wpa_eapol_ie_parse *elems) static int wpa_tdls_prohibited(struct ieee802_11_elems *elems)
{ {
/* bit 38 - TDLS Prohibited */ /* bit 38 - TDLS Prohibited */
return !!(elems->ext_capab[2 + 4] & 0x40); return !!(elems->ext_capab[2 + 4] & 0x40);
} }
static int wpa_tdls_chan_switch_prohibited(struct wpa_eapol_ie_parse *elems) static int wpa_tdls_chan_switch_prohibited(struct ieee802_11_elems *elems)
{ {
/* bit 39 - TDLS Channel Switch Prohibited */ /* bit 39 - TDLS Channel Switch Prohibited */
return !!(elems->ext_capab[2 + 4] & 0x80); return !!(elems->ext_capab[2 + 4] & 0x80);
@ -2875,12 +2876,13 @@ static int wpa_tdls_chan_switch_prohibited(struct wpa_eapol_ie_parse *elems)
void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len) void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
{ {
struct wpa_eapol_ie_parse elems; struct ieee802_11_elems elems;
sm->tdls_prohibited = 0; sm->tdls_prohibited = 0;
sm->tdls_chan_switch_prohibited = 0; sm->tdls_chan_switch_prohibited = 0;
if (ies == NULL || wpa_supplicant_parse_ies(ies, len, &elems) < 0 || if (ies == NULL ||
ieee802_11_parse_elems(ies, len, &elems, 0) == ParseFailed ||
elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5) elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5)
return; return;
@ -2896,9 +2898,10 @@ void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
void wpa_tdls_assoc_resp_ies(struct wpa_sm *sm, const u8 *ies, size_t len) void wpa_tdls_assoc_resp_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
{ {
struct wpa_eapol_ie_parse elems; struct ieee802_11_elems elems;
if (ies == NULL || wpa_supplicant_parse_ies(ies, len, &elems) < 0 || if (ies == NULL ||
ieee802_11_parse_elems(ies, len, &elems, 0) == ParseFailed ||
elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5) elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5)
return; return;