wlantest: Recognize CCMP-256, GCMP, and GCMP-256 ciphers

This adds support for displaying whether a BSS or STA is using one of
the newer cipher suites.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wlantest/bss.c b/wlantest/bss.c
index 67af70786819e9893b17f2a36575af7529ea511b..0f773bf1798175db89fc42df5bde0ea0908ac18f 100644 (file)
--- a/wlantest/bss.c
+++ b/wlantest/bss.c
@@ -275,8 +275,8 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
 
        wpa_printf(MSG_INFO, "BSS " MACSTR
                   " proto=%s%s%s%s"
-                  "pairwise=%s%s%s%s"
-                  "group=%s%s%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"
                   "key_mgmt=%s%s%s%s%s%s%s%s%s"
                   "rsn_capab=%s%s%s%s%s",
@@ -289,12 +289,20 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
                   bss->pairwise_cipher & WPA_CIPHER_NONE ? "NONE " : "",
                   bss->pairwise_cipher & WPA_CIPHER_TKIP ? "TKIP " : "",
                   bss->pairwise_cipher & WPA_CIPHER_CCMP ? "CCMP " : "",
+                  bss->pairwise_cipher & WPA_CIPHER_CCMP_256 ? "CCMP-256 " :
+                  "",
+                  bss->pairwise_cipher & WPA_CIPHER_GCMP ? "GCMP " : "",
+                  bss->pairwise_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " :
+                  "",
                   bss->group_cipher == 0 ? "N/A " : "",
                   bss->group_cipher & WPA_CIPHER_NONE ? "NONE " : "",
                   bss->group_cipher & WPA_CIPHER_WEP40 ? "WEP40 " : "",
                   bss->group_cipher & WPA_CIPHER_WEP104 ? "WEP104 " : "",
                   bss->group_cipher & WPA_CIPHER_TKIP ? "TKIP " : "",
                   bss->group_cipher & WPA_CIPHER_CCMP ? "CCMP " : "",
+                  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->key_mgmt == 0 ? "N/A " : "",

diff --git a/wlantest/sta.c b/wlantest/sta.c
index 6f6178d4179f3bb20749457d0df2a61da10179b4..178c28f74bef8c030ff5d5ac42043f0a246de958 100644 (file)
--- a/wlantest/sta.c
+++ b/wlantest/sta.c
@@ -169,7 +169,7 @@ void sta_update_assoc(struct wlantest_sta *sta, struct ieee802_11_elems *elems)
 skip_rsn_wpa:
        wpa_printf(MSG_INFO, "STA " MACSTR
                   " proto=%s%s%s%s"
-                  "pairwise=%s%s%s%s"
+                  "pairwise=%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",
                   MAC2STR(sta->addr),
@@ -181,6 +181,11 @@ skip_rsn_wpa:
                   sta->pairwise_cipher & WPA_CIPHER_NONE ? "NONE " : "",
                   sta->pairwise_cipher & WPA_CIPHER_TKIP ? "TKIP " : "",
                   sta->pairwise_cipher & WPA_CIPHER_CCMP ? "CCMP " : "",
+                  bss->pairwise_cipher & WPA_CIPHER_CCMP_256 ? "CCMP-256 " :
+                  "",
+                  bss->pairwise_cipher & WPA_CIPHER_GCMP ? "GCMP " : "",
+                  bss->pairwise_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " :
+                  "",
                   sta->key_mgmt == 0 ? "N/A " : "",
                   sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X ? "EAP " : "",
                   sta->key_mgmt & WPA_KEY_MGMT_PSK ? "PSK " : "",