diff --git a/wlantest/bss.c b/wlantest/bss.c index 92f4a5ebc..0e5b60386 100644 --- a/wlantest/bss.c +++ b/wlantest/bss.c @@ -293,8 +293,8 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, "pairwise=%s%s%s%s%s%s%s" "group=%s%s%s%s%s%s%s%s%s" "mgmt_group_cipher=%s%s%s%s%s" - "key_mgmt=%s%s%s%s%s%s%s%s%s" - "rsn_capab=%s%s%s%s%s%s%s", + "key_mgmt=%s%s%s%s%s%s%s%s%s%s%s%s%s%s" + "rsn_capab=%s%s%s%s%s%s%s%s%s%s", MAC2STR(bss->bssid), bss->proto == 0 ? "OPEN " : "", bss->proto & WPA_PROTO_WPA ? "WPA " : "", @@ -337,7 +337,14 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, "EAP-SHA256 " : "", bss->key_mgmt & WPA_KEY_MGMT_PSK_SHA256 ? "PSK-SHA256 " : "", + bss->key_mgmt & WPA_KEY_MGMT_OWE ? "OWE " : "", + bss->key_mgmt & WPA_KEY_MGMT_PASN ? "PASN " : "", bss->key_mgmt & WPA_KEY_MGMT_OSEN ? "OSEN " : "", + bss->key_mgmt & WPA_KEY_MGMT_DPP ? "DPP " : "", + bss->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B ? + "EAP-SUITE-B " : "", + bss->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 ? + "EAP-SUITE-B-192 " : "", bss->rsn_capab & WPA_CAPABILITY_PREAUTH ? "PREAUTH " : "", bss->rsn_capab & WPA_CAPABILITY_NO_PAIRWISE ? "NO_PAIRWISE " : "", @@ -345,6 +352,11 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, bss->rsn_capab & WPA_CAPABILITY_MFPC ? "MFPC " : "", bss->rsn_capab & WPA_CAPABILITY_PEERKEY_ENABLED ? "PEERKEY " : "", + bss->rsn_capab & WPA_CAPABILITY_SPP_A_MSDU_CAPABLE ? + "SPP-A-MSDU-CAPAB " : "", + bss->rsn_capab & WPA_CAPABILITY_SPP_A_MSDU_REQUIRED ? + "SPP-A-MSDU-REQUIRED " : "", + bss->rsn_capab & WPA_CAPABILITY_PBAC ? "PBAC " : "", bss->rsn_capab & WPA_CAPABILITY_OCVC ? "OCVC " : "", bss->rsn_capab & WPA_CAPABILITY_EXT_KEY_ID_FOR_UNICAST ? "ExtKeyID " : ""); diff --git a/wlantest/sta.c b/wlantest/sta.c index 62dae0790..02ecb78c3 100644 --- a/wlantest/sta.c +++ b/wlantest/sta.c @@ -180,8 +180,8 @@ skip_rsn_wpa: wpa_printf(MSG_INFO, "STA " MACSTR " proto=%s%s%s%s" "pairwise=%s%s%s%s%s%s%s" - "key_mgmt=%s%s%s%s%s%s%s%s%s%s%s" - "rsn_capab=%s%s%s%s%s%s", + "key_mgmt=%s%s%s%s%s%s%s%s%s%s%s%s%s%s" + "rsn_capab=%s%s%s%s%s%s%s%s%s%s", MAC2STR(sta->addr), sta->proto == 0 ? "OPEN " : "", sta->proto & WPA_PROTO_WPA ? "WPA " : "", @@ -206,7 +206,10 @@ skip_rsn_wpa: "EAP-SHA256 " : "", sta->key_mgmt & WPA_KEY_MGMT_PSK_SHA256 ? "PSK-SHA256 " : "", + sta->key_mgmt & WPA_KEY_MGMT_OWE ? "OWE " : "", + sta->key_mgmt & WPA_KEY_MGMT_PASN ? "PASN " : "", sta->key_mgmt & WPA_KEY_MGMT_OSEN ? "OSEN " : "", + sta->key_mgmt & WPA_KEY_MGMT_DPP ? "DPP " : "", sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B ? "EAP-SUITE-B " : "", sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 ? @@ -218,5 +221,12 @@ skip_rsn_wpa: sta->rsn_capab & WPA_CAPABILITY_MFPC ? "MFPC " : "", sta->rsn_capab & WPA_CAPABILITY_PEERKEY_ENABLED ? "PEERKEY " : "", - sta->rsn_capab & WPA_CAPABILITY_OCVC ? "OCVC " : ""); + sta->rsn_capab & WPA_CAPABILITY_SPP_A_MSDU_CAPABLE ? + "SPP-A-MSDU-CAPAB " : "", + sta->rsn_capab & WPA_CAPABILITY_SPP_A_MSDU_REQUIRED ? + "SPP-A-MSDU-REQUIRED " : "", + sta->rsn_capab & WPA_CAPABILITY_PBAC ? "PBAC " : "", + sta->rsn_capab & WPA_CAPABILITY_OCVC ? "OCVC " : "", + sta->rsn_capab & WPA_CAPABILITY_EXT_KEY_ID_FOR_UNICAST ? + "ExtKeyID " : ""); }