aboutsummaryrefslogtreecommitdiffstats
path: root/wlantest
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2015-01-24 10:09:04 (GMT)
committerJouni Malinen <j@w1.fi>2015-01-24 17:37:42 (GMT)
commitcd3b5cc0796340509f34dc9be331b660b57e3b4b (patch)
tree1e5055c28e6e0a63cf50321e088bfd5e684a414b /wlantest
parentcb80fadaa7374a9ab8191d0ac45f3cb5e7ddcca4 (diff)
downloadhostap-cd3b5cc0796340509f34dc9be331b660b57e3b4b.zip
hostap-cd3b5cc0796340509f34dc9be331b660b57e3b4b.tar.gz
hostap-cd3b5cc0796340509f34dc9be331b660b57e3b4b.tar.bz2
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 <j@w1.fi>
Diffstat (limited to 'wlantest')
-rw-r--r--wlantest/bss.c13
-rw-r--r--wlantest/ctrl.c9
2 files changed, 19 insertions, 3 deletions
diff --git a/wlantest/bss.c b/wlantest/bss.c
index 0f773bf..61e2960 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 2b6d453..87f347c 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 ? "" : " ");
}