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: Don't re-build the AP RSNE in authenticator mode

Browse Source 
sm->handshake already contains our RSN/WPA IE so there's no need to
rebuild it for msg 3/4, especially since we hardcode the fact that we
only support one pairwise cipher.  If we start declaring more supported
ciphers and need to include a second RSNE we can first parse
sm->hs->authenticator_ie into a struct ir_rsn_info, overwrite the cipher
and rebuild it from that struct.

This way we duplicate less code and we hardcode fewer facts about the AP
in eapol.c which also helps in adding EAP-WSC.
This commit is contained in:
Andrew Zaborowski 2020-08-13 02:50:13 +02:00 committed by Denis Kenzior
parent 69259b3a3f
commit b40d7460b3
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/eapol.c
View File

@ -1267,17 +1267,16 @@ static void eapol_send_ptk_3_of_4(struct eapol_sm *sm)
{ {
uint32_t ifindex = sm->handshake->ifindex; uint32_t ifindex = sm->handshake->ifindex;
uint8_t frame_buf[512]; uint8_t frame_buf[512];
uint8_t key_data_buf[128]; unsigned int rsne_len = sm->handshake->authenticator_ie[1] + 2;
uint8_t key_data_buf[128 + rsne_len];
int key_data_len = rsne_len;
struct eapol_key *ek = (struct eapol_key *) frame_buf; struct eapol_key *ek = (struct eapol_key *) frame_buf;
int key_data_len;
enum crypto_cipher cipher = ie_rsn_cipher_suite_to_cipher( enum crypto_cipher cipher = ie_rsn_cipher_suite_to_cipher(
sm->handshake->pairwise_cipher); sm->handshake->pairwise_cipher);
enum crypto_cipher group_cipher = ie_rsn_cipher_suite_to_cipher( enum crypto_cipher group_cipher = ie_rsn_cipher_suite_to_cipher(
sm->handshake->group_cipher); sm->handshake->group_cipher);
const uint8_t *kck; const uint8_t *kck;
const uint8_t *kek; const uint8_t *kek;
struct ie_rsn_info rsn;
uint8_t *rsne;
sm->replay_counter++; sm->replay_counter++;
@ -1304,17 +1303,7 @@ static void eapol_send_ptk_3_of_4(struct eapol_sm *sm)
* Just one RSNE in Key Data as we only set one cipher in ap->ciphers * Just one RSNE in Key Data as we only set one cipher in ap->ciphers
* currently. * currently.
*/ */
memcpy(key_data_buf, sm->handshake->authenticator_ie, rsne_len);
memset(&rsn, 0, sizeof(rsn));
rsn.akm_suites = IE_RSN_AKM_SUITE_PSK;
rsn.pairwise_ciphers = sm->handshake->pairwise_cipher;
rsn.group_cipher = sm->handshake->group_cipher;
rsne = key_data_buf;
if (!ie_build_rsne(&rsn, rsne))
return;
key_data_len = rsne[1] + 2;
if (group_cipher) { if (group_cipher) {
uint8_t *gtk_kde = key_data_buf + key_data_len; uint8_t *gtk_kde = key_data_buf + key_data_len;