Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

handshake: Change signature of (i)gtk setters

This commit is contained in:
Denis Kenzior 2020-04-02 00:41:02 -05:00
parent f37966a24d
commit 1cc7346d6a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/handshake.c
View File

@ -573,7 +573,7 @@ void handshake_state_install_ptk(struct handshake_state *s)
} }
void handshake_state_install_gtk(struct handshake_state *s, void handshake_state_install_gtk(struct handshake_state *s,
uint8_t gtk_key_index, uint16_t gtk_key_index,
const uint8_t *gtk, size_t gtk_len, const uint8_t *gtk, size_t gtk_len,
const uint8_t *rsc, uint8_t rsc_len) const uint8_t *rsc, uint8_t rsc_len)
{ {
@ -587,7 +587,7 @@ void handshake_state_install_gtk(struct handshake_state *s,
} }
void handshake_state_install_igtk(struct handshake_state *s, void handshake_state_install_igtk(struct handshake_state *s,
uint8_t igtk_key_index, uint16_t igtk_key_index,
const uint8_t *igtk, size_t igtk_len, const uint8_t *igtk, size_t igtk_len,
const uint8_t *ipn) const uint8_t *ipn)
{ {

8
src/handshake.h
View File

@ -61,12 +61,12 @@ typedef bool (*handshake_get_nonce_func_t)(uint8_t nonce[]);
typedef void (*handshake_install_tk_func_t)(struct handshake_state *hs, typedef void (*handshake_install_tk_func_t)(struct handshake_state *hs,
const uint8_t *tk, uint32_t cipher); const uint8_t *tk, uint32_t cipher);
typedef void (*handshake_install_gtk_func_t)(struct handshake_state *hs, typedef void (*handshake_install_gtk_func_t)(struct handshake_state *hs,
uint8_t key_index, uint16_t key_index,
const uint8_t *gtk, uint8_t gtk_len, const uint8_t *gtk, uint8_t gtk_len,
const uint8_t *rsc, uint8_t rsc_len, const uint8_t *rsc, uint8_t rsc_len,
uint32_t cipher); uint32_t cipher);
typedef void (*handshake_install_igtk_func_t)(struct handshake_state *hs, typedef void (*handshake_install_igtk_func_t)(struct handshake_state *hs,
uint8_t key_index, uint16_t key_index,
const uint8_t *igtk, uint8_t igtk_len, const uint8_t *igtk, uint8_t igtk_len,
const uint8_t *ipn, uint8_t ipn_len, const uint8_t *ipn, uint8_t ipn_len,
uint32_t cipher); uint32_t cipher);
@ -194,12 +194,12 @@ const uint8_t *handshake_state_get_kek(struct handshake_state *s);
void handshake_state_install_ptk(struct handshake_state *s); void handshake_state_install_ptk(struct handshake_state *s);
void handshake_state_install_gtk(struct handshake_state *s, void handshake_state_install_gtk(struct handshake_state *s,
uint8_t gtk_key_index, uint16_t gtk_key_index,
const uint8_t *gtk, size_t gtk_len, const uint8_t *gtk, size_t gtk_len,
const uint8_t *rsc, uint8_t rsc_len); const uint8_t *rsc, uint8_t rsc_len);
void handshake_state_install_igtk(struct handshake_state *s, void handshake_state_install_igtk(struct handshake_state *s,
uint8_t igtk_key_index, uint16_t igtk_key_index,
const uint8_t *igtk, size_t igtk_len, const uint8_t *igtk, size_t igtk_len,
const uint8_t *ipn); const uint8_t *ipn);

4
src/netdev.c
View File

@ -1219,7 +1219,7 @@ static const uint8_t *netdev_choose_key_address(
return (nhs->super.authenticator) ? nhs->super.spa : nhs->super.aa; return (nhs->super.authenticator) ? nhs->super.spa : nhs->super.aa;
} }
static void netdev_set_gtk(struct handshake_state *hs, uint8_t key_index, static void netdev_set_gtk(struct handshake_state *hs, uint16_t key_index,
const uint8_t *gtk, uint8_t gtk_len, const uint8_t *gtk, uint8_t gtk_len,
const uint8_t *rsc, uint8_t rsc_len, const uint8_t *rsc, uint8_t rsc_len,
uint32_t cipher) uint32_t cipher)
@ -1266,7 +1266,7 @@ static void netdev_set_gtk(struct handshake_state *hs, uint8_t key_index,
netdev_setting_keys_failed(nhs, -EIO); netdev_setting_keys_failed(nhs, -EIO);
} }
static void netdev_set_igtk(struct handshake_state *hs, uint8_t key_index, static void netdev_set_igtk(struct handshake_state *hs, uint16_t key_index,
const uint8_t *igtk, uint8_t igtk_len, const uint8_t *igtk, uint8_t igtk_len,
const uint8_t *ipn, uint8_t ipn_len, const uint8_t *ipn, uint8_t ipn_len,
uint32_t cipher) uint32_t cipher)