DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Recognize FTE MLO subelements

Browse source 
Recognize the new MLO GTK/IGTK/BIGTK subelements when parsing an FTE.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-08-08 11:57:06 +03:00 committed by Jouni Malinen
parent 605034240e
commit 053bd8af8e
2 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/common/wpa_common.c
View file

@ -1013,6 +1013,7 @@ static int wpa_ft_parse_ftie(const u8 *ie, size_t ie_len,
struct wpa_ft_ies *parse, const u8 *opt) struct wpa_ft_ies *parse, const u8 *opt)
{ {
const u8 *end, *pos; const u8 *end, *pos;
u8 link_id;
parse->ftie = ie; parse->ftie = ie;
parse->ftie_len = ie_len; parse->ftie_len = ie_len;
@ -1078,6 +1079,51 @@ static int wpa_ft_parse_ftie(const u8 *ie, size_t ie_len,
parse->bigtk = pos; parse->bigtk = pos;
parse->bigtk_len = len; parse->bigtk_len = len;
break; break;
case FTIE_SUBELEM_MLO_GTK:
if (len < 2 + 1 + 1 + 8) {
wpa_printf(MSG_DEBUG,
"FT: Too short MLO GTK in FTE");
return -1;
}
link_id = pos[2] & 0x0f;
wpa_printf(MSG_DEBUG, "FT: MLO GTK (Link ID %u)",
link_id);
if (link_id >= MAX_NUM_MLO_LINKS)
break;
parse->valid_mlo_gtks |= BIT(link_id);
parse->mlo_gtk[link_id] = pos;
parse->mlo_gtk_len[link_id] = len;
break;
case FTIE_SUBELEM_MLO_IGTK:
if (len < 2 + 6 + 1 + 1) {
wpa_printf(MSG_DEBUG,
"FT: Too short MLO IGTK in FTE");
return -1;
}
link_id = pos[2 + 6] & 0x0f;
wpa_printf(MSG_DEBUG, "FT: MLO IGTK (Link ID %u)",
link_id);
if (link_id >= MAX_NUM_MLO_LINKS)
break;
parse->valid_mlo_igtks |= BIT(link_id);
parse->mlo_igtk[link_id] = pos;
parse->mlo_igtk_len[link_id] = len;
break;
case FTIE_SUBELEM_MLO_BIGTK:
if (len < 2 + 6 + 1 + 1) {
wpa_printf(MSG_DEBUG,
"FT: Too short MLO BIGTK in FTE");
return -1;
}
link_id = pos[2 + 6] & 0x0f;
wpa_printf(MSG_DEBUG, "FT: MLO BIGTK (Link ID %u)",
link_id);
if (link_id >= MAX_NUM_MLO_LINKS)
break;
parse->valid_mlo_bigtks |= BIT(link_id);
parse->mlo_bigtk[link_id] = pos;
parse->mlo_bigtk_len[link_id] = len;
break;
default: default:
wpa_printf(MSG_DEBUG, "FT: Unknown subelem id %u", id); wpa_printf(MSG_DEBUG, "FT: Unknown subelem id %u", id);
break; break;

15
src/common/wpa_common.h
View file

@ -427,6 +427,9 @@ struct rsn_ftie_sha512 {
#define FTIE_SUBELEM_IGTK 4 #define FTIE_SUBELEM_IGTK 4
#define FTIE_SUBELEM_OCI 5 #define FTIE_SUBELEM_OCI 5
#define FTIE_SUBELEM_BIGTK 6 #define FTIE_SUBELEM_BIGTK 6
#define FTIE_SUBELEM_MLO_GTK 8
#define FTIE_SUBELEM_MLO_IGTK 9
#define FTIE_SUBELEM_MLO_BIGTK 10
struct rsn_rdie { struct rsn_rdie {
u8 id; u8 id;
@ -553,6 +556,8 @@ int wpa_compare_rsn_ie(int ft_initial_assoc,
const u8 *ie2, size_t ie2len); const u8 *ie2, size_t ie2len);
int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid); int wpa_insert_pmkid(u8 *ies, size_t *ies_len, const u8 *pmkid);
#define MAX_NUM_MLO_LINKS 15
struct wpa_ft_ies { struct wpa_ft_ies {
const u8 *mdie; const u8 *mdie;
size_t mdie_len; size_t mdie_len;
@ -589,6 +594,15 @@ struct wpa_ft_ies {
int pairwise_cipher; int pairwise_cipher;
const u8 *rsnxe; const u8 *rsnxe;
size_t rsnxe_len; size_t rsnxe_len;
u16 valid_mlo_gtks; /* bitmap of valid link GTK subelements */
const u8 *mlo_gtk[MAX_NUM_MLO_LINKS];
size_t mlo_gtk_len[MAX_NUM_MLO_LINKS];
u16 valid_mlo_igtks; /* bitmap of valid link IGTK subelements */
const u8 *mlo_igtk[MAX_NUM_MLO_LINKS];
size_t mlo_igtk_len[MAX_NUM_MLO_LINKS];
u16 valid_mlo_bigtks; /* bitmap of valid link BIGTK subelements */
const u8 *mlo_bigtk[MAX_NUM_MLO_LINKS];
size_t mlo_bigtk_len[MAX_NUM_MLO_LINKS];
}; };
/* IEEE P802.11az/D2.6 - 9.4.2.303 PASN Parameters element */ /* IEEE P802.11az/D2.6 - 9.4.2.303 PASN Parameters element */
@ -679,7 +693,6 @@ struct wpa_eapol_ie_parse {
u16 aid; u16 aid;
const u8 *wmm; const u8 *wmm;
size_t wmm_len; size_t wmm_len;
#define MAX_NUM_MLO_LINKS 15
u16 valid_mlo_gtks; /* bitmap of valid link GTK KDEs */ u16 valid_mlo_gtks; /* bitmap of valid link GTK KDEs */
const u8 *mlo_gtk[MAX_NUM_MLO_LINKS]; const u8 *mlo_gtk[MAX_NUM_MLO_LINKS];
size_t mlo_gtk_len[MAX_NUM_MLO_LINKS]; size_t mlo_gtk_len[MAX_NUM_MLO_LINKS];