diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2020-04-02 00:41:02 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2020-04-02 00:41:02 -0500 |
| commit | 1cc7346d6aaf122d466e0f0e43b1806b71a0781d (patch) | |
| tree | a12fea3a32ee39428c000a711d607451b2ca8af8 | |
| parent | f37966a24dcaae12cd74e7ba77ab592074db3103 (diff) | |
| download | iwd-1cc7346d6aaf122d466e0f0e43b1806b71a0781d.tar.gz | |
handshake: Change signature of (i)gtk setters
| -rw-r--r-- | src/handshake.c | 4 | ||||
| -rw-r--r-- | src/handshake.h | 8 | ||||
| -rw-r--r-- | src/netdev.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/handshake.c b/src/handshake.c index 1cab48f11..e76cf8fb2 100644 --- a/src/handshake.c +++ b/src/handshake.c @@ -573,7 +573,7 @@ void handshake_state_install_ptk(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 *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, - uint8_t igtk_key_index, + uint16_t igtk_key_index, const uint8_t *igtk, size_t igtk_len, const uint8_t *ipn) { diff --git a/src/handshake.h b/src/handshake.h index 3f5bbab0d..c88bb0d11 100644 --- a/src/handshake.h +++ b/src/handshake.h @@ -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, const uint8_t *tk, uint32_t cipher); 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 *rsc, uint8_t rsc_len, uint32_t cipher); 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 *ipn, uint8_t ipn_len, 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_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 *rsc, uint8_t rsc_len); 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 *ipn); diff --git a/src/netdev.c b/src/netdev.c index e00f880a4..799f01e3b 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -1219,7 +1219,7 @@ static const uint8_t *netdev_choose_key_address( 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 *rsc, uint8_t rsc_len, 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); } -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 *ipn, uint8_t ipn_len, uint32_t cipher) |