tests: FTM capability indication

[mech_eap.git] / wlantest / bss.c

diff --git a/wlantest/bss.c b/wlantest/bss.c
index d554853..f021956 100644 (file)
--- a/wlantest/bss.c
+++ b/wlantest/bss.c
@@ -154,11 +154,31 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
                bss_add_pmk(wt, bss);
        }
 
+       if (elems->osen == NULL) {
+               if (bss->osenie[0]) {
+                       add_note(wt, MSG_INFO, "BSS " MACSTR
+                                " - OSEN IE removed", MAC2STR(bss->bssid));
+                       bss->rsnie[0] = 0;
+                       update = 1;
+               }
+       } else {
+               if (bss->osenie[0] == 0 ||
+                   os_memcmp(bss->osenie, elems->osen - 2,
+                             elems->osen_len + 2) != 0) {
+                       wpa_printf(MSG_INFO, "BSS " MACSTR " - OSEN IE "
+                                  "stored", MAC2STR(bss->bssid));
+                       wpa_hexdump(MSG_DEBUG, "OSEN IE", elems->osen - 2,
+                                   elems->osen_len + 2);
+                       update = 1;
+               }
+               os_memcpy(bss->osenie, elems->osen - 2,
+                         elems->osen_len + 2);
+       }
 
        if (elems->rsn_ie == NULL) {
                if (bss->rsnie[0]) {
-                       wpa_printf(MSG_INFO, "BSS " MACSTR " - RSN IE removed",
-                                  MAC2STR(bss->bssid));
+                       add_note(wt, MSG_INFO, "BSS " MACSTR
+                                " - RSN IE removed", MAC2STR(bss->bssid));
                        bss->rsnie[0] = 0;
                        update = 1;
                }
@@ -178,8 +198,8 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
 
        if (elems->wpa_ie == NULL) {
                if (bss->wpaie[0]) {
-                       wpa_printf(MSG_INFO, "BSS " MACSTR " - WPA IE removed",
-                                  MAC2STR(bss->bssid));
+                       add_note(wt, MSG_INFO, "BSS " MACSTR
+                                " - WPA IE removed", MAC2STR(bss->bssid));
                        bss->wpaie[0] = 0;
                        update = 1;
                }
@@ -197,6 +217,9 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
                          elems->wpa_ie_len + 2);
        }
 
+       if (elems->mdie)
+               os_memcpy(bss->mdid, elems->mdie, 2);
+
        if (!update)
                return;
 
@@ -211,8 +234,8 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
        if (bss->wpaie[0]) {
                if (wpa_parse_wpa_ie_wpa(bss->wpaie, 2 + bss->wpaie[1], &data)
                    < 0) {
-                       wpa_printf(MSG_INFO, "Failed to parse WPA IE from "
-                                  MACSTR, MAC2STR(bss->bssid));
+                       add_note(wt, MSG_INFO, "Failed to parse WPA IE from "
+                                MACSTR, MAC2STR(bss->bssid));
                } else {
                        bss->proto |= data.proto;
                        bss->pairwise_cipher |= data.pairwise_cipher;
@@ -226,8 +249,8 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
        if (bss->rsnie[0]) {
                if (wpa_parse_wpa_ie_rsn(bss->rsnie, 2 + bss->rsnie[1], &data)
                    < 0) {
-                       wpa_printf(MSG_INFO, "Failed to parse RSN IE from "
-                                  MACSTR, MAC2STR(bss->bssid));
+                       add_note(wt, MSG_INFO, "Failed to parse RSN IE from "
+                                MACSTR, MAC2STR(bss->bssid));
                } else {
                        bss->proto |= data.proto;
                        bss->pairwise_cipher |= data.pairwise_cipher;
@@ -238,37 +261,60 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
                }
        }
 
+       if (bss->osenie[0]) {
+               bss->proto |= WPA_PROTO_OSEN;
+               bss->pairwise_cipher |= WPA_CIPHER_CCMP;
+               bss->group_cipher |= WPA_CIPHER_CCMP;
+               bss->key_mgmt |= WPA_KEY_MGMT_OSEN;
+       }
+
        if (!(bss->proto & WPA_PROTO_RSN) ||
            !(bss->rsn_capab & WPA_CAPABILITY_MFPC))
                bss->mgmt_group_cipher = 0;
 
-       if (!bss->wpaie[0] && !bss->rsnie[0] &&
+       if (!bss->wpaie[0] && !bss->rsnie[0] && !bss->osenie[0] &&
            (bss->capab_info & WLAN_CAPABILITY_PRIVACY))
                bss->group_cipher = WPA_CIPHER_WEP40;
 
        wpa_printf(MSG_INFO, "BSS " MACSTR
-                  " proto=%s%s%s"
-                  "pairwise=%s%s%s%s"
-                  "group=%s%s%s%s%s%s"
-                  "mgmt_group_cipher=%s"
-                  "key_mgmt=%s%s%s%s%s%s%s%s"
+                  " 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%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),
                   bss->proto == 0 ? "OPEN " : "",
                   bss->proto & WPA_PROTO_WPA ? "WPA " : "",
                   bss->proto & WPA_PROTO_RSN ? "WPA2 " : "",
+                  bss->proto & WPA_PROTO_OSEN ? "OSEN " : "",
                   bss->pairwise_cipher == 0 ? "N/A " : "",
                   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->mgmt_group_cipher & WPA_CIPHER_AES_128_CMAC ? "BIP " :
-                  "N/A ",
+                  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 == 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 " : "",
@@ -279,6 +325,7 @@ void bss_update(struct wlantest *wt, struct wlantest_bss *bss,
                   "EAP-SHA256 " : "",
                   bss->key_mgmt & WPA_KEY_MGMT_PSK_SHA256 ?
                   "PSK-SHA256 " : "",
+                  bss->key_mgmt & WPA_KEY_MGMT_OSEN ? "OSEN " : "",
                   bss->rsn_capab & WPA_CAPABILITY_PREAUTH ? "PREAUTH " : "",
                   bss->rsn_capab & WPA_CAPABILITY_NO_PAIRWISE ?
                   "NO_PAIRWISE " : "",