Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-20 12:39:25 +01:00
Code Releases Activity

eapol: Set wpa_key_id in WPA1 Step 2 of 2

Browse Source
This commit is contained in:
Denis Kenzior 2015-05-18 14:31:11 -05:00
parent 6500fd4264
commit 8593ebaad4
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/eapol.c
View File

@ -558,14 +558,30 @@ struct eapol_key *eapol_create_gtk_2_of_2(
enum eapol_protocol_version protocol, enum eapol_protocol_version protocol,
enum eapol_key_descriptor_version version, enum eapol_key_descriptor_version version,
uint64_t key_replay_counter, uint64_t key_replay_counter,
bool is_wpa) bool is_wpa, uint8_t wpa_key_id)
{ {
uint8_t snonce[32]; uint8_t snonce[32];
struct eapol_key *step2;
memset(snonce, 0, sizeof(snonce)); memset(snonce, 0, sizeof(snonce));
return eapol_create_common(protocol, version, true, step2 = eapol_create_common(protocol, version, true,
key_replay_counter, snonce, 0, NULL, key_replay_counter, snonce, 0, NULL,
0, is_wpa); 0, is_wpa);
if (!step2)
return step2;
/*
* WPA_80211_v3_1, Section 2.2.4:
* "The Key Type and Key Index shall not both be 0 in the same message"
*
* The above means that even though sending the key index back to the
* AP has no practical value, we must still do so.
*/
if (is_wpa)
step2->wpa_key_id = wpa_key_id;
return step2;
} }
struct eapol_sm { struct eapol_sm {
@ -1082,7 +1098,8 @@ static void eapol_handle_gtk_1_of_2(uint32_t ifindex,
step2 = eapol_create_gtk_2_of_2(protocol_version, step2 = eapol_create_gtk_2_of_2(protocol_version,
ek->key_descriptor_version, ek->key_descriptor_version,
sm->replay_counter, sm->wpa_ie); sm->replay_counter, sm->wpa_ie,
ek->wpa_key_id);
/* /*
* 802.11-2012, Section 11.6.7.3, step b): * 802.11-2012, Section 11.6.7.3, step b):

2
src/eapol.h
View File

@ -147,7 +147,7 @@ struct eapol_key *eapol_create_gtk_2_of_2(
enum eapol_protocol_version protocol, enum eapol_protocol_version protocol,
enum eapol_key_descriptor_version version, enum eapol_key_descriptor_version version,
uint64_t key_replay_counter, uint64_t key_replay_counter,
bool is_wpa); bool is_wpa, uint8_t wpa_key_id);
void __eapol_rx_packet(uint32_t ifindex, const uint8_t *spa, const uint8_t *aa, void __eapol_rx_packet(uint32_t ifindex, const uint8_t *spa, const uint8_t *aa,
const uint8_t *frame, size_t len, const uint8_t *frame, size_t len,