jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wlantest: New mgmt_group_cipher values for BSS info and debug log

Browse source 
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>
This commit is contained in:
Jouni Malinen 2015-01-24 12:09:04 +02:00
parent cb80fadaa7
commit cd3b5cc079
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wlantest/bss.c
View file

@ -277,7 +277,7 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
" proto=%s%s%s%s" " proto=%s%s%s%s"
"pairwise=%s%s%s%s%s%s%s" "pairwise=%s%s%s%s%s%s%s"
"group=%s%s%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" "key_mgmt=%s%s%s%s%s%s%s%s%s"
"rsn_capab=%s%s%s%s%s", "rsn_capab=%s%s%s%s%s",
MAC2STR(bss->bssid), 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_CCMP_256 ? "CCMP-256 " : "",
bss->group_cipher & WPA_CIPHER_GCMP ? "GCMP " : "", bss->group_cipher & WPA_CIPHER_GCMP ? "GCMP " : "",
bss->group_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " : "", bss->group_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " : "",
bss->mgmt_group_cipher & WPA_CIPHER_AES_128_CMAC ? "BIP " : bss->mgmt_group_cipher == 0 ? "N/A " : "",
"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 == 0 ? "N/A " : "",
bss->key_mgmt & WPA_KEY_MGMT_IEEE8021X ? "EAP " : "", bss->key_mgmt & WPA_KEY_MGMT_IEEE8021X ? "EAP " : "",
bss->key_mgmt & WPA_KEY_MGMT_PSK ? "PSK " : "", bss->key_mgmt & WPA_KEY_MGMT_PSK ? "PSK " : "",

9
wlantest/ctrl.c
View file

@ -906,6 +906,15 @@ static void info_print_cipher(char *buf, size_t len, int cipher)
if (cipher & WPA_CIPHER_AES_128_CMAC) if (cipher & WPA_CIPHER_AES_128_CMAC)
pos += os_snprintf(pos, end - pos, "%sBIP", pos += os_snprintf(pos, end - pos, "%sBIP",
pos == buf ? "" : " "); 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 ? "" : " ");
} }