Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-10-05 19:08:52 +02:00
Code Releases Activity

eapol: Relax VERIFY_IS_ZERO condition

Browse Source 
On certain routers, the 4-Way handshake message 3 of 4 contains a key iv
field which is not zero as it is supposed to.  This causes us to fail
the handshake.

Since the iv field is not utilized in this particular case, it is safe
to simply warn rather than fail the handshake outright.
This commit is contained in:
Denis Kenzior 2016-11-18 10:32:17 -06:00
parent d26e224bfc
commit 413287d5cf
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/eapol.c
View File

@ -167,12 +167,21 @@ void eapol_pae_close()
l_io_destroy(pae_io);
}
static inline bool mem_is_zero(const uint8_t *field, size_t size)
{
size_t i;
for (i = 0; i < size; i++)
if (field[i] != 0)
return false;
return true;
}
#define VERIFY_IS_ZERO(field) \
do { \
unsigned int i; \
for (i = 0; i < sizeof(field); i++) \
if ((field)[i] != 0) \
return false; \
if (!mem_is_zero((field), sizeof((field)))) \
return false; \
} while (false) \
/*
@ -474,7 +483,8 @@ bool eapol_verify_ptk_3_of_4(const struct eapol_key *ek, bool is_wpa)
/* 0 (Version 2) or random (Version 1) */
if (ek->key_descriptor_version ==
EAPOL_KEY_DESCRIPTOR_VERSION_HMAC_SHA1_AES)
VERIFY_IS_ZERO(ek->eapol_key_iv);
L_WARN_ON(!mem_is_zero(ek->eapol_key_iv,
sizeof(ek->eapol_key_iv)));
return true;
}