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

mka: Reorganize live peer creation and key server election

Browse source 
This modifies ieee802_1x_kay_decode_mkpdu() check for peer including me
in its peer list.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-08-15 11:43:42 +02:00 • committed by Jouni Malinen
parent 34dbe90ac5
commit 343eb3b036
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/pae/ieee802_1x_kay.c
View file

@ -339,18 +339,6 @@ ieee802_1x_kay_is_in_live_peer(
} }
/**
* ieee802_1x_kay_is_in_peer
*/
static Boolean
ieee802_1x_kay_is_in_peer(struct ieee802_1x_mka_participant *participant,
const u8 *mi)
{
return ieee802_1x_kay_is_in_live_peer(participant, mi) ||
ieee802_1x_kay_is_in_potential_peer(participant, mi);
}
/** /**
* ieee802_1x_kay_get_peer * ieee802_1x_kay_get_peer
*/ */
@ -2974,7 +2962,6 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay,
u8 body_type; u8 body_type;
int i; int i;
const u8 *pos; const u8 *pos;
Boolean my_included;
Boolean handled[256]; Boolean handled[256];
if (ieee802_1x_kay_mkpdu_sanity_check(kay, buf, len)) if (ieee802_1x_kay_mkpdu_sanity_check(kay, buf, len))
@ -2995,21 +2982,10 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay,
left_len -= body_len + MKA_HDR_LEN; left_len -= body_len + MKA_HDR_LEN;
/* check i am in the peer's peer list */ /* check i am in the peer's peer list */
my_included = ieee802_1x_mka_i_in_peerlist(participant, pos, left_len); if (ieee802_1x_mka_i_in_peerlist(participant, pos, left_len) &&
if (my_included) { !ieee802_1x_kay_is_in_live_peer(participant,
participant->current_peer_id.mi)) {
/* accept the peer as live peer */ /* accept the peer as live peer */
if (!ieee802_1x_kay_is_in_peer(
participant,
participant->current_peer_id.mi)) {
if (!ieee802_1x_kay_create_live_peer(
participant,
participant->current_peer_id.mi,
be_to_host32(
participant->current_peer_id.mn)))
return -1;
ieee802_1x_kay_elect_key_server(participant);
ieee802_1x_kay_decide_macsec_use(participant);
}
if (ieee802_1x_kay_is_in_potential_peer( if (ieee802_1x_kay_is_in_potential_peer(
participant, participant->current_peer_id.mi)) { participant, participant->current_peer_id.mi)) {
if (!ieee802_1x_kay_move_live_peer( if (!ieee802_1x_kay_move_live_peer(
@ -3018,9 +2994,15 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay,
be_to_host32(participant-> be_to_host32(participant->
current_peer_id.mn))) current_peer_id.mn)))
return -1; return -1;
ieee802_1x_kay_elect_key_server(participant); } else if (!ieee802_1x_kay_create_live_peer(
ieee802_1x_kay_decide_macsec_use(participant); participant, participant->current_peer_id.mi,
be_to_host32(participant->
current_peer_id.mn))) {
return -1;
} }
ieee802_1x_kay_elect_key_server(participant);
ieee802_1x_kay_decide_macsec_use(participant);
} }
/* /*