3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 02:19:26 +01:00

handshake: add flags/key index for extended key IDs

ext_key_id_capable indicates the handshake has set the capability bit
in the RSN info. This will only be set if the AP also has the capability
set.

active_tk_index is the key index the AP chose in message 3. This is
now used for both legacy (always zero) and extended key IDs.
This commit is contained in:
James Prestwood 2021-10-07 13:49:46 -07:00 committed by Denis Kenzior
parent 898c7e636e
commit fba3b90c11
2 changed files with 3 additions and 0 deletions

View File

@ -234,6 +234,7 @@ valid_ie:
s->group_management_cipher = info.group_management_cipher; s->group_management_cipher = info.group_management_cipher;
s->akm_suite = info.akm_suites; s->akm_suite = info.akm_suites;
s->supplicant_ocvc = info.ocvc; s->supplicant_ocvc = info.ocvc;
s->ext_key_id_capable = info.extended_key_id;
/* /*
* Don't set MFP for OSEN otherwise EAPoL will attempt to negotiate a * Don't set MFP for OSEN otherwise EAPoL will attempt to negotiate a

View File

@ -128,6 +128,7 @@ struct handshake_state {
bool support_fils : 1; bool support_fils : 1;
bool authenticator_ocvc : 1; bool authenticator_ocvc : 1;
bool supplicant_ocvc : 1; bool supplicant_ocvc : 1;
bool ext_key_id_capable : 1;
uint8_t ssid[32]; uint8_t ssid[32];
size_t ssid_len; size_t ssid_len;
char *passphrase; char *passphrase;
@ -138,6 +139,7 @@ struct handshake_state {
uint8_t gtk_rsc[6]; uint8_t gtk_rsc[6];
uint8_t proto_version : 2; uint8_t proto_version : 2;
unsigned int gtk_index; unsigned int gtk_index;
uint8_t active_tk_index;
struct erp_cache_entry *erp_cache; struct erp_cache_entry *erp_cache;
bool support_ip_allocation : 1; bool support_ip_allocation : 1;
uint32_t client_ip_addr; uint32_t client_ip_addr;