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

mka: Clean up ieee802_1x_mka_decode_potential_peer_body()

Browse source 
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-08-12 15:07:33 +02:00 committed by Jouni Malinen
parent cf375eb2da
commit 46bbda2b83
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/pae/ieee802_1x_kay.c
View file

@ -1069,14 +1069,11 @@ ieee802_1x_mka_decode_potential_peer_body(
struct ieee802_1x_mka_participant *participant, struct ieee802_1x_mka_participant *participant,
const u8 *peer_msg, size_t msg_len) const u8 *peer_msg, size_t msg_len)
{ {
struct ieee802_1x_mka_hdr *hdr; const struct ieee802_1x_mka_hdr *hdr;
size_t body_len; size_t body_len;
u32 peer_mn;
be32 _peer_mn;
const u8 *peer_mi;
size_t i; size_t i;
hdr = (struct ieee802_1x_mka_hdr *) peer_msg; hdr = (const struct ieee802_1x_mka_hdr *) peer_msg;
body_len = get_mka_param_body_len(hdr); body_len = get_mka_param_body_len(hdr);
if (body_len % 16 != 0) { if (body_len % 16 != 0) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
@ -1085,10 +1082,13 @@ ieee802_1x_mka_decode_potential_peer_body(
return -1; return -1;
} }
for (i = 0; i < body_len; i += MI_LEN + sizeof(peer_mn)) { for (i = 0; i < body_len; i += sizeof(struct ieee802_1x_mka_peer_id)) {
peer_mi = MKA_HDR_LEN + peer_msg + i; const struct ieee802_1x_mka_peer_id *peer_mi;
os_memcpy(&_peer_mn, peer_mi + MI_LEN, sizeof(_peer_mn)); u32 peer_mn;
peer_mn = be_to_host32(_peer_mn);
peer_mi = (struct ieee802_1x_mka_peer_id *)
(peer_msg + MKA_HDR_LEN + i);
peer_mn = be_to_host32(peer_mi->mn);
/* it is myself */ /* it is myself */
if (os_memcmp(peer_mi, participant->mi, MI_LEN) == 0) { if (os_memcmp(peer_mi, participant->mi, MI_LEN) == 0) {