Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-01-18 10:54:03 -05:00
Code Issues Projects Releases Wiki Activity

mka: Add a helper function, sci_equal(), for sci comparison

Browse Source 
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-08-15 11:43:41 +02:00 committed by Jouni Malinen
parent cefeb8e382
commit a33e3c3214
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pae/ieee802_1x_kay.c
View File

@ -381,6 +381,13 @@ ieee802_1x_kay_get_cipher_suite(struct ieee802_1x_mka_participant *participant,
} }
static Boolean sci_equal(const struct ieee802_1x_mka_sci *a,
const struct ieee802_1x_mka_sci *b)
{
return os_memcmp(a, b, sizeof(struct ieee802_1x_mka_sci)) == 0;
}
/** /**
* ieee802_1x_kay_get_peer_sci * ieee802_1x_kay_get_peer_sci
*/ */
@ -392,13 +399,13 @@ ieee802_1x_kay_get_peer_sci(struct ieee802_1x_mka_participant *participant,
dl_list_for_each(peer, &participant->live_peers, dl_list_for_each(peer, &participant->live_peers,
struct ieee802_1x_kay_peer, list) { struct ieee802_1x_kay_peer, list) {
if (os_memcmp(&peer->sci, sci, sizeof(peer->sci)) == 0) if (sci_equal(&peer->sci, sci))
return peer; return peer;
} }
dl_list_for_each(peer, &participant->potential_peers, dl_list_for_each(peer, &participant->potential_peers,
struct ieee802_1x_kay_peer, list) { struct ieee802_1x_kay_peer, list) {
if (os_memcmp(&peer->sci, sci, sizeof(peer->sci)) == 0) if (sci_equal(&peer->sci, sci))
return peer; return peer;
} }
@ -1581,8 +1588,7 @@ ieee802_1x_mka_decode_dist_sak_body(
"KaY: The key server is not in my live peers list"); "KaY: The key server is not in my live peers list");
return -1; return -1;
} }
if (os_memcmp(&participant->kay->key_server_sci, if (!sci_equal(&participant->kay->key_server_sci, &peer->sci)) {
&peer->sci, sizeof(struct ieee802_1x_mka_sci)) != 0) {
wpa_printf(MSG_ERROR, "KaY: The key server is not elected"); wpa_printf(MSG_ERROR, "KaY: The key server is not elected");
return -1; return -1;
} }
@ -2160,8 +2166,7 @@ ieee802_1x_kay_elect_key_server(struct ieee802_1x_mka_participant *participant)
if (i_is_key_server) { if (i_is_key_server) {
ieee802_1x_cp_set_electedself(kay->cp, TRUE); ieee802_1x_cp_set_electedself(kay->cp, TRUE);
if (os_memcmp(&kay->key_server_sci, &kay->actor_sci, if (!sci_equal(&kay->key_server_sci, &kay->actor_sci)) {
sizeof(kay->key_server_sci))) {
ieee802_1x_cp_signal_chgdserver(kay->cp); ieee802_1x_cp_signal_chgdserver(kay->cp);
ieee802_1x_cp_sm_step(kay->cp); ieee802_1x_cp_sm_step(kay->cp);
} }
@ -2178,8 +2183,7 @@ ieee802_1x_kay_elect_key_server(struct ieee802_1x_mka_participant *participant)
kay->key_server_priority = kay->actor_priority; kay->key_server_priority = kay->actor_priority;
} else if (key_server) { } else if (key_server) {
ieee802_1x_cp_set_electedself(kay->cp, FALSE); ieee802_1x_cp_set_electedself(kay->cp, FALSE);
if (os_memcmp(&kay->key_server_sci, &key_server->sci, if (!sci_equal(&kay->key_server_sci, &key_server->sci)) {
sizeof(kay->key_server_sci))) {
ieee802_1x_cp_signal_chgdserver(kay->cp); ieee802_1x_cp_signal_chgdserver(kay->cp);
ieee802_1x_cp_sm_step(kay->cp); ieee802_1x_cp_sm_step(kay->cp);
} }
@ -2408,8 +2412,7 @@ static void ieee802_1x_participant_timer(void *eloop_ctx, void *timeout_ctx)
dl_list_for_each_safe(rxsc, pre_rxsc, dl_list_for_each_safe(rxsc, pre_rxsc,
&participant->rxsc_list, &participant->rxsc_list,
struct receive_sc, list) { struct receive_sc, list) {
if (os_memcmp(&rxsc->sci, &peer->sci, if (sci_equal(&rxsc->sci, &peer->sci)) {
sizeof(rxsc->sci)) == 0) {
secy_delete_receive_sc(kay, rxsc); secy_delete_receive_sc(kay, rxsc);
ieee802_1x_kay_deinit_receive_sc( ieee802_1x_kay_deinit_receive_sc(
participant, rxsc); participant, rxsc);