tests: FTM capability indication

[mech_eap.git] / wlantest / sta.c

diff --git a/wlantest/sta.c b/wlantest/sta.c
index 6f6178d..1268b8a 100644 (file)
--- a/wlantest/sta.c
+++ b/wlantest/sta.c
@@ -1,6 +1,6 @@
 /*
  * STA list
- * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2010-2015, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -169,8 +169,8 @@ 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"
-                  "key_mgmt=%s%s%s%s%s%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",
                   MAC2STR(sta->addr),
                   sta->proto == 0 ? "OPEN " : "",
@@ -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 " : "",
@@ -192,6 +197,10 @@ skip_rsn_wpa:
                   sta->key_mgmt & WPA_KEY_MGMT_PSK_SHA256 ?
                   "PSK-SHA256 " : "",
                   sta->key_mgmt & WPA_KEY_MGMT_OSEN ? "OSEN " : "",
+                  sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B ?
+                  "EAP-SUITE-B " : "",
+                  sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 ?
+                  "EAP-SUITE-B-192 " : "",
                   sta->rsn_capab & WPA_CAPABILITY_PREAUTH ? "PREAUTH " : "",
                   sta->rsn_capab & WPA_CAPABILITY_NO_PAIRWISE ?
                   "NO_PAIRWISE " : "",