Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 13:02:44 +01:00
Code Releases Activity

sae: fix sae to not hard code peer address

Browse Source 
SAE is meant to work in a peer-to-peer fashion where neither side acts
as a dedicated authenticator or supplicant. This was not the case with
the current code. The handshake state authenticator address was hard
coded as the destination address for all packets, which will not work
when mesh comes into play. This also made unit testing the full SAE
procedure with two sae_sm's impossible.

This patch adds a peer address element to sae_sm which is filled with
either aa/spa based on the value of handshake->authenticator
This commit is contained in:
James Prestwood 2018-08-15 10:36:20 -07:00 committed by Denis Kenzior
parent 986f66a3c6
commit b9fac0fd14
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sae.c
View File

@ -61,6 +61,8 @@ struct sae_sm {
uint16_t sc; uint16_t sc;
/* received value of the send-confirm counter */ /* received value of the send-confirm counter */
uint16_t rc; uint16_t rc;
/* remote peer */
uint8_t peer[6];
sae_tx_packet_func_t tx; sae_tx_packet_func_t tx;
sae_complete_func_t complete; sae_complete_func_t complete;
@ -238,7 +240,7 @@ static void sae_reject_authentication(struct sae_sm *sm, uint16_t reason)
ptr += 2; ptr += 2;
} }
sm->tx(sm->handshake->aa, reject, ptr - reject, sm->user_data); sm->tx(sm->peer, reject, ptr - reject, sm->user_data);
sae_authentication_failed(sm, reason); sae_authentication_failed(sm, reason);
} }
@ -470,7 +472,7 @@ static void sae_send_confirm(struct sae_sm *sm)
sm->state = SAE_STATE_CONFIRMED; sm->state = SAE_STATE_CONFIRMED;
sm->tx(sm->handshake->aa, body, 38, sm->user_data); sm->tx(sm->peer, body, 38, sm->user_data);
} }
static void sae_process_commit(struct sae_sm *sm, const uint8_t *from, static void sae_process_commit(struct sae_sm *sm, const uint8_t *from,
@ -664,7 +666,7 @@ static void sae_send_commit(struct sae_sm *sm, bool retry)
sm->state = SAE_STATE_COMMITTED; sm->state = SAE_STATE_COMMITTED;
sm->tx(hs->aa, commit, len, sm->user_data); sm->tx(sm->peer, commit, len, sm->user_data);
} }
void sae_timeout(struct sae_sm *sm) void sae_timeout(struct sae_sm *sm)
@ -981,6 +983,11 @@ reject:
void sae_start(struct sae_sm *sm) void sae_start(struct sae_sm *sm)
{ {
if (sm->handshake->authenticator)
memcpy(sm->peer, sm->handshake->spa, 6);
else
memcpy(sm->peer, sm->handshake->aa, 6);
sae_send_commit(sm, false); sae_send_commit(sm, false);
} }