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

sae: support default group for H2E

Browse Source 
This was seemingly trivial at face value but doing so ended up
pointing out a bug with how group_retry is set when forcing
the default group. Since group_retry is initialized to -1 the
increment in the force_default_group block results in it being
set to zero, which is actually group 20, not 19. This did not
matter for hunt and peck, but H2E actually uses the retry value
to index its pre-generated points which then breaks SAE if
forcing the default group with H2E.

To handle H2E and force_default_group, the group selection
logic will always begin iterating the group array regardless of
SAE type.
This commit is contained in:
James Prestwood 2024-08-12 10:16:49 -07:00 committed by Denis Kenzior
parent d2f14b2951
commit 1455988efb
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/sae.c
View File

@ -152,39 +152,34 @@ static int sae_choose_next_group(struct sae_sm *sm)
{ {
const unsigned int *ecc_groups = l_ecc_supported_ike_groups(); const unsigned int *ecc_groups = l_ecc_supported_ike_groups();
bool reset = sm->group_retry >= 0; bool reset = sm->group_retry >= 0;
unsigned int group;
/* /* Find the next group in the list */
* If this is a buggy AP in which group negotiation is broken use the while ((group = ecc_groups[++sm->group_retry])) {
* default group 19 and fail if this is a retry. /*
*/ * Forcing the default group; only choose group 19. If we have
if (sm->sae_type == CRYPTO_SAE_LOOPING && sm->force_default_group) { * already passed 19 (due to a retry) we will exhaust all other
if (sm->group_retry != -1) { * groups and should fail.
l_warn("Forced default group but was rejected!"); */
return -ENOENT; if (sm->force_default_group && group != 19)
} continue;
sae_debug("Forcing default SAE group 19"); /* Ensure the PT was derived for this group */
if (sm->sae_type == CRYPTO_SAE_HASH_TO_ELEMENT &&
!sm->handshake->ecc_sae_pts[sm->group_retry])
continue;
sm->group_retry++; break;
sm->group = 19;
goto get_curve;
} }
do { if (!group)
sm->group_retry++; return -ENOENT;
if (ecc_groups[sm->group_retry] == 0) sm->group = group;
return -ENOENT;
} while (sm->sae_type != CRYPTO_SAE_LOOPING &&
!sm->handshake->ecc_sae_pts[sm->group_retry]);
if (reset) if (reset)
sae_reset_state(sm); sae_reset_state(sm);
sm->group = ecc_groups[sm->group_retry];
get_curve:
sae_debug("Using group %u", sm->group); sae_debug("Using group %u", sm->group);
sm->curve = l_ecc_curve_from_ike_group(sm->group); sm->curve = l_ecc_curve_from_ike_group(sm->group);