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

mka: Fix a typo in macsec_capbility

Browse source 
Spell "capability" correctly in the variable name.

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 cb320a6d2d
commit 2e9448989f
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/pae/ieee802_1x_kay.c
View file

@ -122,7 +122,7 @@ ieee802_1x_mka_dump_basic_body(struct ieee802_1x_mka_basic_body *body)
wpa_printf(MSG_DEBUG, "\tPriority......: %d", body->priority); wpa_printf(MSG_DEBUG, "\tPriority......: %d", body->priority);
wpa_printf(MSG_DEBUG, "\tKeySvr........: %d", body->key_server); wpa_printf(MSG_DEBUG, "\tKeySvr........: %d", body->key_server);
wpa_printf(MSG_DEBUG, "\tMACSecDesired.: %d", body->macsec_desired); wpa_printf(MSG_DEBUG, "\tMACSecDesired.: %d", body->macsec_desired);
wpa_printf(MSG_DEBUG, "\tMACSecCapable.: %d", body->macsec_capbility); wpa_printf(MSG_DEBUG, "\tMACSecCapable.: %d", body->macsec_capability);
wpa_printf(MSG_DEBUG, "\tBody Length...: %d", (int) body_len); wpa_printf(MSG_DEBUG, "\tBody Length...: %d", (int) body_len);
wpa_printf(MSG_DEBUG, "\tSCI MAC.......: " MACSTR, wpa_printf(MSG_DEBUG, "\tSCI MAC.......: " MACSTR,
MAC2STR(body->actor_sci.addr)); MAC2STR(body->actor_sci.addr));
@ -680,7 +680,7 @@ ieee802_1x_mka_encode_basic_body(
body->key_server = participant->can_be_key_server; body->key_server = participant->can_be_key_server;
body->macsec_desired = kay->macsec_desired; body->macsec_desired = kay->macsec_desired;
body->macsec_capbility = kay->macsec_capable; body->macsec_capability = kay->macsec_capable;
set_mka_param_body_len(body, length - MKA_HDR_LEN); set_mka_param_body_len(body, length - MKA_HDR_LEN);
os_memcpy(body->actor_sci.addr, kay->actor_sci.addr, os_memcpy(body->actor_sci.addr, kay->actor_sci.addr,
@ -766,14 +766,14 @@ ieee802_1x_mka_decode_basic_body(struct ieee802_1x_kay *kay, const u8 *mka_msg,
return NULL; return NULL;
peer->macsec_desired = body->macsec_desired; peer->macsec_desired = body->macsec_desired;
peer->macsec_capbility = body->macsec_capbility; peer->macsec_capability = body->macsec_capability;
peer->is_key_server = (Boolean) body->key_server; peer->is_key_server = (Boolean) body->key_server;
peer->key_server_priority = body->priority; peer->key_server_priority = body->priority;
} else if (peer->mn < be_to_host32(body->actor_mn)) { } else if (peer->mn < be_to_host32(body->actor_mn)) {
peer->mn = be_to_host32(body->actor_mn); peer->mn = be_to_host32(body->actor_mn);
peer->expire = time(NULL) + MKA_LIFE_TIME / 1000; peer->expire = time(NULL) + MKA_LIFE_TIME / 1000;
peer->macsec_desired = body->macsec_desired; peer->macsec_desired = body->macsec_desired;
peer->macsec_capbility = body->macsec_capbility; peer->macsec_capability = body->macsec_capability;
peer->is_key_server = (Boolean) body->key_server; peer->is_key_server = (Boolean) body->key_server;
peer->key_server_priority = body->priority; peer->key_server_priority = body->priority;
} else { } else {
@ -2237,11 +2237,11 @@ ieee802_1x_kay_decide_macsec_use(
if (!peer->macsec_desired) if (!peer->macsec_desired)
continue; continue;
if (peer->macsec_capbility == MACSEC_CAP_NOT_IMPLEMENTED) if (peer->macsec_capability == MACSEC_CAP_NOT_IMPLEMENTED)
continue; continue;
less_capability = (less_capability < peer->macsec_capbility) ? less_capability = (less_capability < peer->macsec_capability) ?
less_capability : peer->macsec_capbility; less_capability : peer->macsec_capability;
has_peer = TRUE; has_peer = TRUE;
} }

6
src/pae/ieee802_1x_kay_i.h
View file

@ -49,7 +49,7 @@ struct ieee802_1x_kay_peer {
Boolean is_key_server; Boolean is_key_server;
u8 key_server_priority; u8 key_server_priority;
Boolean macsec_desired; Boolean macsec_desired;
enum macsec_cap macsec_capbility; enum macsec_cap macsec_capability;
Boolean sak_used; Boolean sak_used;
struct dl_list list; struct dl_list list;
}; };
@ -268,13 +268,13 @@ struct ieee802_1x_mka_basic_body {
/* octet 3 */ /* octet 3 */
#if __BYTE_ORDER == __LITTLE_ENDIAN #if __BYTE_ORDER == __LITTLE_ENDIAN
u32 length:4; u32 length:4;
u32 macsec_capbility:2; u32 macsec_capability:2;
u32 macsec_desired:1; u32 macsec_desired:1;
u32 key_server:1; u32 key_server:1;
#elif __BYTE_ORDER == __BIG_ENDIAN #elif __BYTE_ORDER == __BIG_ENDIAN
u32 key_server:1; u32 key_server:1;
u32 macsec_desired:1; u32 macsec_desired:1;
u32 macsec_capbility:2; u32 macsec_capability:2;
u32 length:4; u32 length:4;
#endif #endif
/* octet 4 */ /* octet 4 */