From 535a8b8712b9e57986d3ea5020f68bf069f9d8a6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 22 Aug 2016 21:02:40 +0300 Subject: [PATCH] mka: Make csindex unsigned This avoids unnecessary typecasting while still being able to compare the value to CS_TABLE_SIZE without compiler warnings. Signed-off-by: Jouni Malinen --- src/pae/ieee802_1x_kay.c | 9 +++++---- src/pae/ieee802_1x_kay.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c index e5aec25..d7b76e0 100644 --- a/src/pae/ieee802_1x_kay.c +++ b/src/pae/ieee802_1x_kay.c @@ -1395,7 +1395,7 @@ ieee802_1x_mka_get_dist_sak_length( struct ieee802_1x_mka_participant *participant) { int length = MKA_HDR_LEN; - int cs_index = participant->kay->macsec_csindex; + unsigned int cs_index = participant->kay->macsec_csindex; if (participant->advised_desired) { length = sizeof(struct ieee802_1x_mka_dist_sak_body); @@ -1420,7 +1420,7 @@ ieee802_1x_mka_encode_dist_sak_body( struct ieee802_1x_mka_dist_sak_body *body; struct data_key *sak; unsigned int length; - int cs_index; + unsigned int cs_index; int sak_pos; length = ieee802_1x_mka_get_dist_sak_length(participant); @@ -3488,14 +3488,15 @@ ieee802_1x_kay_new_sak(struct ieee802_1x_kay *kay) * ieee802_1x_kay_change_cipher_suite - */ int -ieee802_1x_kay_change_cipher_suite(struct ieee802_1x_kay *kay, int cs_index) +ieee802_1x_kay_change_cipher_suite(struct ieee802_1x_kay *kay, + unsigned int cs_index) { struct ieee802_1x_mka_participant *participant; if (!kay) return -1; - if ((unsigned int) cs_index >= CS_TABLE_SIZE) { + if (cs_index >= CS_TABLE_SIZE) { wpa_printf(MSG_ERROR, "KaY: Configured cipher suite index is out of range"); return -1; diff --git a/src/pae/ieee802_1x_kay.h b/src/pae/ieee802_1x_kay.h index 763be68..f8e4058 100644 --- a/src/pae/ieee802_1x_kay.h +++ b/src/pae/ieee802_1x_kay.h @@ -124,7 +124,7 @@ struct ieee802_1x_kay { Boolean is_obliged_key_server; char if_name[IFNAMSIZ]; - int macsec_csindex; /* MACsec cipher suite table index */ + unsigned int macsec_csindex; /* MACsec cipher suite table index */ int mka_algindex; /* MKA alg table index */ u32 dist_kn; @@ -169,7 +169,7 @@ void ieee802_1x_kay_mka_participate(struct ieee802_1x_kay *kay, Boolean status); int ieee802_1x_kay_new_sak(struct ieee802_1x_kay *kay); int ieee802_1x_kay_change_cipher_suite(struct ieee802_1x_kay *kay, - int cs_index); + unsigned int cs_index); int ieee802_1x_kay_set_latest_sa_attr(struct ieee802_1x_kay *kay, struct ieee802_1x_mka_ki *lki, u8 lan, -- 2.1.4