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

eapol: Use the Preauthentication ethertype in eapol_write 

Select the right ether type for the eapol frame in eapol_write and pass
it to pae_write.
This commit is contained in:
Andrew Zaborowski 2017-04-15 13:58:50 +02:00 committed by Denis Kenzior
parent 4e9ed2d686
commit 0a4bd616c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eapol.c
View File

@ -121,7 +121,7 @@ static void pae_destroy()
} }
static void pae_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa, static void pae_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa,
const struct eapol_frame *ef) uint16_t proto, const struct eapol_frame *ef)
{ {
size_t frame_size; size_t frame_size;
struct sockaddr_ll sll; struct sockaddr_ll sll;
@ -140,7 +140,7 @@ static void pae_write(uint32_t ifindex, const uint8_t *aa, const uint8_t *spa,
memset(&sll, 0, sizeof(sll)); memset(&sll, 0, sizeof(sll));
sll.sll_family = AF_PACKET; sll.sll_family = AF_PACKET;
sll.sll_ifindex = ifindex; sll.sll_ifindex = ifindex;
sll.sll_protocol = htons(ETH_P_PAE); sll.sll_protocol = htons(proto);
sll.sll_halen = ETH_ALEN; sll.sll_halen = ETH_ALEN;
memcpy(sll.sll_addr, aa, ETH_ALEN); memcpy(sll.sll_addr, aa, ETH_ALEN);
@ -807,8 +807,10 @@ static void eapol_timeout(struct l_timeout *timeout, void *user_data)
static void eapol_write(struct eapol_sm *sm, const struct eapol_frame *ef) static void eapol_write(struct eapol_sm *sm, const struct eapol_frame *ef)
{ {
uint16_t proto = sm->preauth ? 0x88c7 : ETH_P_PAE;
pae_write(sm->handshake->ifindex, pae_write(sm->handshake->ifindex,
sm->handshake->aa, sm->handshake->spa, ef); sm->handshake->aa, sm->handshake->spa, proto, ef);
} }
static void send_eapol_start(struct l_timeout *timeout, void *user_data) static void send_eapol_start(struct l_timeout *timeout, void *user_data)