Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

eapol: Separate EAPOL header from struct eapol_key

Browse Source 
This is needed so we can better handle sending and receiving EAPoL
packets other than EAPoL-Key.
This commit is contained in:
Andrew Zaborowski 2015-10-30 11:12:18 +01:00 committed by Denis Kenzior
parent 830161399e
commit ef9b6f41ce
4 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
monitor/nlmon.c
View File

@ -4735,7 +4735,7 @@ void nlmon_print_pae(struct nlmon *nlmon, const struct timeval *tv,
if (!ek) if (!ek)
return; return;
switch (ek->protocol_version) { switch (ek->header.protocol_version) {
case 0x01: case 0x01:
str = "802.11X-2001"; str = "802.11X-2001";
break; break;
@ -4747,9 +4747,9 @@ void nlmon_print_pae(struct nlmon *nlmon, const struct timeval *tv,
break; break;
} }
print_attr(1, "Version: %u (%s)", ek->protocol_version, str); print_attr(1, "Version: %u (%s)", ek->header.protocol_version, str);
switch (ek->packet_type) { switch (ek->header.packet_type) {
case 0x00: case 0x00:
str = "Packet"; str = "Packet";
break; break;
@ -4767,8 +4767,8 @@ void nlmon_print_pae(struct nlmon *nlmon, const struct timeval *tv,
break; break;
} }
print_attr(1, "Type: %u (%s)", ek->packet_type, str); print_attr(1, "Type: %u (%s)", ek->header.packet_type, str);
print_attr(1, "Length: %d", L_BE16_TO_CPU(ek->packet_len)); print_attr(1, "Length: %d", L_BE16_TO_CPU(ek->header.packet_len));
print_attr(1, "Descriptor Type: %u", ek->descriptor_type); print_attr(1, "Descriptor Type: %u", ek->descriptor_type);
print_attr(1, "Key MIC: %s", ek->key_mic ? "true" : "false"); print_attr(1, "Key MIC: %s", ek->key_mic ? "true" : "false");
print_attr(1, "Secure: %s", ek->secure ? "true" : "false"); print_attr(1, "Secure: %s", ek->secure ? "true" : "false");

29
src/eapol.c
View File

@ -202,11 +202,12 @@ const struct eapol_key *eapol_key_validate(const uint8_t *frame, size_t len)
ek = (const struct eapol_key *) frame; ek = (const struct eapol_key *) frame;
if (ek->protocol_version != EAPOL_PROTOCOL_VERSION_2001 && if (ek->header.protocol_version != EAPOL_PROTOCOL_VERSION_2001 &&
ek->protocol_version != EAPOL_PROTOCOL_VERSION_2004) ek->header.protocol_version !=
EAPOL_PROTOCOL_VERSION_2004)
return NULL; return NULL;
if (ek->packet_type != 3) if (ek->header.packet_type != 3)
return NULL; return NULL;
switch (ek->descriptor_type) { switch (ek->descriptor_type) {
@ -501,9 +502,9 @@ static struct eapol_key *eapol_create_common(
memset(out_frame, 0, to_alloc + extra_len); memset(out_frame, 0, to_alloc + extra_len);
out_frame->protocol_version = protocol; out_frame->header.protocol_version = protocol;
out_frame->packet_type = 0x3; out_frame->header.packet_type = 0x3;
out_frame->packet_len = L_CPU_TO_BE16(to_alloc + extra_len - 4); out_frame->header.packet_len = L_CPU_TO_BE16(to_alloc + extra_len - 4);
out_frame->descriptor_type = is_wpa ? EAPOL_DESCRIPTOR_TYPE_WPA : out_frame->descriptor_type = is_wpa ? EAPOL_DESCRIPTOR_TYPE_WPA :
EAPOL_DESCRIPTOR_TYPE_80211; EAPOL_DESCRIPTOR_TYPE_80211;
out_frame->key_descriptor_version = version; out_frame->key_descriptor_version = version;
@ -813,7 +814,8 @@ static void eapol_handle_ptk_1_of_4(uint32_t ifindex, struct eapol_sm *sm,
} }
memcpy(step2->key_mic_data, mic, sizeof(mic)); memcpy(step2->key_mic_data, mic, sizeof(mic));
tx_packet(ifindex, sm->aa, sm->spa, step2, user_data); tx_packet(ifindex, sm->aa, sm->spa,
(struct eapol_frame *) step2, user_data);
l_free(step2); l_free(step2);
l_timeout_remove(sm->timeout); l_timeout_remove(sm->timeout);
@ -1139,7 +1141,8 @@ static void eapol_handle_ptk_3_of_4(uint32_t ifindex,
goto fail; goto fail;
memcpy(step4->key_mic_data, mic, sizeof(mic)); memcpy(step4->key_mic_data, mic, sizeof(mic));
tx_packet(ifindex, sm->aa, sm->spa, step4, user_data); tx_packet(ifindex, sm->aa, sm->spa,
(struct eapol_frame *) step4, user_data);
sm->ptk_complete = true; sm->ptk_complete = true;
@ -1218,7 +1221,8 @@ static void eapol_handle_gtk_1_of_2(uint32_t ifindex,
goto done; goto done;
memcpy(step2->key_mic_data, mic, sizeof(mic)); memcpy(step2->key_mic_data, mic, sizeof(mic));
tx_packet(ifindex, sm->aa, sm->spa, step2, user_data); tx_packet(ifindex, sm->aa, sm->spa,
(struct eapol_frame *) step2, user_data);
if (install_gtk) { if (install_gtk) {
uint32_t cipher = uint32_t cipher =
@ -1432,7 +1436,7 @@ struct l_io *eapol_open_pae(uint32_t index)
* This function expects an fd to be passed as user_data * This function expects an fd to be passed as user_data
*/ */
static int eapol_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa, static int eapol_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa,
const struct eapol_key *ek, void *user_data) const struct eapol_frame *ef, void *user_data)
{ {
int fd = L_PTR_TO_INT(user_data); int fd = L_PTR_TO_INT(user_data);
size_t frame_size; size_t frame_size;
@ -1446,9 +1450,10 @@ static int eapol_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa,
sll.sll_halen = ETH_ALEN; sll.sll_halen = ETH_ALEN;
memcpy(sll.sll_addr, aa, ETH_ALEN); memcpy(sll.sll_addr, aa, ETH_ALEN);
frame_size = sizeof(struct eapol_key) + L_BE16_TO_CPU(ek->key_data_len); frame_size = sizeof(struct eapol_header) +
L_BE16_TO_CPU(ef->header.packet_len);
r = sendto(fd, ek, frame_size, 0, r = sendto(fd, ef, frame_size, 0,
(struct sockaddr *) &sll, sizeof(sll)); (struct sockaddr *) &sll, sizeof(sll));
if (r < 0) { if (r < 0) {
l_error("EAPoL write socket: %s", strerror(errno)); l_error("EAPoL write socket: %s", strerror(errno));

14
src/eapol.h
View File

@ -49,10 +49,19 @@ enum eapol_key_descriptor_version {
struct eapol_sm; struct eapol_sm;
struct eapol_key { struct eapol_header {
uint8_t protocol_version; uint8_t protocol_version;
uint8_t packet_type; uint8_t packet_type;
__be16 packet_len; __be16 packet_len;
} __attribute__ ((packed));
struct eapol_frame {
struct eapol_header header;
uint8_t data[0];
} __attribute__ ((packed));
struct eapol_key {
struct eapol_header header;
uint8_t descriptor_type; uint8_t descriptor_type;
#if defined(__LITTLE_ENDIAN_BITFIELD) #if defined(__LITTLE_ENDIAN_BITFIELD)
bool key_mic:1; bool key_mic:1;
@ -96,7 +105,8 @@ struct eapol_key {
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef int (*eapol_tx_packet_func_t)(uint32_t ifindex, const uint8_t *aa, typedef int (*eapol_tx_packet_func_t)(uint32_t ifindex, const uint8_t *aa,
const uint8_t *spa, const struct eapol_key *ek, const uint8_t *spa,
const struct eapol_frame *ef,
void *user_data); void *user_data);
typedef bool (*eapol_get_nonce_func_t)(uint8_t nonce[]); typedef bool (*eapol_get_nonce_func_t)(uint8_t nonce[]);
typedef void (*eapol_install_tk_func_t)(uint32_t ifindex, const uint8_t *aa, typedef void (*eapol_install_tk_func_t)(uint32_t ifindex, const uint8_t *aa,

18
unit/test-eapol.c
View File

@ -1177,9 +1177,9 @@ static void eapol_key_test(const void *data)
packet = eapol_key_validate(test->frame, test->frame_len); packet = eapol_key_validate(test->frame, test->frame_len);
assert(packet); assert(packet);
assert(packet->protocol_version == test->protocol_version); assert(packet->header.protocol_version == test->protocol_version);
assert(packet->packet_type == 0x03); assert(packet->header.packet_type == 0x03);
assert(L_BE16_TO_CPU(packet->packet_len) == test->packet_len); assert(L_BE16_TO_CPU(packet->header.packet_len) == test->packet_len);
assert(packet->descriptor_type == test->descriptor_type); assert(packet->descriptor_type == test->descriptor_type);
assert(packet->key_descriptor_version == test->key_descriptor_version); assert(packet->key_descriptor_version == test->key_descriptor_version);
assert(packet->key_type == test->key_type); assert(packet->key_type == test->key_type);
@ -1640,9 +1640,9 @@ static void eapol_wpa_handshake_test(const void *data)
static int verify_step2(uint32_t ifindex, const uint8_t *aa_addr, static int verify_step2(uint32_t ifindex, const uint8_t *aa_addr,
const uint8_t *sta_addr, const uint8_t *sta_addr,
const struct eapol_key *ek, const struct eapol_frame *ef, void *user_data)
void *user_data)
{ {
const struct eapol_key *ek = (const struct eapol_key *) ef;
size_t ek_len = sizeof(struct eapol_key) + size_t ek_len = sizeof(struct eapol_key) +
L_BE16_TO_CPU(ek->key_data_len); L_BE16_TO_CPU(ek->key_data_len);
@ -1659,9 +1659,9 @@ static int verify_step2(uint32_t ifindex, const uint8_t *aa_addr,
static int verify_step4(uint32_t ifindex, const uint8_t *aa_addr, static int verify_step4(uint32_t ifindex, const uint8_t *aa_addr,
const uint8_t *sta_addr, const uint8_t *sta_addr,
const struct eapol_key *ek, const struct eapol_frame *ef, void *user_data)
void *user_data)
{ {
const struct eapol_key *ek = (const struct eapol_key *) ef;
size_t ek_len = sizeof(struct eapol_key) + size_t ek_len = sizeof(struct eapol_key) +
L_BE16_TO_CPU(ek->key_data_len); L_BE16_TO_CPU(ek->key_data_len);
@ -1678,9 +1678,9 @@ static int verify_step4(uint32_t ifindex, const uint8_t *aa_addr,
static int verify_step2_gtk(uint32_t ifindex, const uint8_t *aa_addr, static int verify_step2_gtk(uint32_t ifindex, const uint8_t *aa_addr,
const uint8_t *sta_addr, const uint8_t *sta_addr,
const struct eapol_key *ek, const struct eapol_frame *ef, void *user_data)
void *user_data)
{ {
const struct eapol_key *ek = (const struct eapol_key *) ef;
size_t ek_len = sizeof(struct eapol_key) + size_t ek_len = sizeof(struct eapol_key) +
L_BE16_TO_CPU(ek->key_data_len); L_BE16_TO_CPU(ek->key_data_len);