From cd3b5cc0796340509f34dc9be331b660b57e3b4b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 24 Jan 2015 12:09:04 +0200 Subject: [PATCH] wlantest: New mgmt_group_cipher values for BSS info and debug log This adds BIP-GMAC-128, BIP-GMAC-256, and BIP-CMAC-256 to info_bss command and debug log. Signed-off-by: Jouni Malinen --- wlantest/bss.c | 13 ++++++++++--- wlantest/ctrl.c | 9 +++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/wlantest/bss.c b/wlantest/bss.c index 0f773bf17..61e2960fd 100644 --- a/wlantest/bss.c +++ b/wlantest/bss.c @@ -277,7 +277,7 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, " proto=%s%s%s%s" "pairwise=%s%s%s%s%s%s%s" "group=%s%s%s%s%s%s%s%s%s" - "mgmt_group_cipher=%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", MAC2STR(bss->bssid), @@ -303,8 +303,15 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss, bss->group_cipher & WPA_CIPHER_CCMP_256 ? "CCMP-256 " : "", bss->group_cipher & WPA_CIPHER_GCMP ? "GCMP " : "", bss->group_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " : "", - bss->mgmt_group_cipher & WPA_CIPHER_AES_128_CMAC ? "BIP " : - "N/A ", + bss->mgmt_group_cipher == 0 ? "N/A " : "", + bss->mgmt_group_cipher & WPA_CIPHER_AES_128_CMAC ? + "BIP " : "", + bss->mgmt_group_cipher & WPA_CIPHER_BIP_GMAC_128 ? + "BIP-GMAC-128 " : "", + bss->mgmt_group_cipher & WPA_CIPHER_BIP_GMAC_256 ? + "BIP-GMAC-256 " : "", + bss->mgmt_group_cipher & WPA_CIPHER_BIP_CMAC_256 ? + "BIP-CMAC-256 " : "", bss->key_mgmt == 0 ? "N/A " : "", bss->key_mgmt & WPA_KEY_MGMT_IEEE8021X ? "EAP " : "", bss->key_mgmt & WPA_KEY_MGMT_PSK ? "PSK " : "", diff --git a/wlantest/ctrl.c b/wlantest/ctrl.c index 2b6d45396..87f347c20 100644 --- a/wlantest/ctrl.c +++ b/wlantest/ctrl.c @@ -906,6 +906,15 @@ static void info_print_cipher(char *buf, size_t len, int cipher) if (cipher & WPA_CIPHER_AES_128_CMAC) pos += os_snprintf(pos, end - pos, "%sBIP", pos == buf ? "" : " "); + if (cipher & WPA_CIPHER_BIP_GMAC_128) + pos += os_snprintf(pos, end - pos, "%sBIP-GMAC-128", + pos == buf ? "" : " "); + if (cipher & WPA_CIPHER_BIP_GMAC_256) + pos += os_snprintf(pos, end - pos, "%sBIP-GMAC-256", + pos == buf ? "" : " "); + if (cipher & WPA_CIPHER_BIP_CMAC_256) + pos += os_snprintf(pos, end - pos, "%sBIP-CMAC-256", + pos == buf ? "" : " "); }