Use helper functions to access RSNE/RSNXE from BSS entries

This is a step towards allowing the contents of RSNE/RSNXE to be
overridden.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/wpa_supplicant/bss.c b/wpa_supplicant/bss.c
index e8aaf6fe1848fb9703b3bc825838d27b02a4f83a..6d702bb2e4c15bbba6f7016285a7057eb9d7e260 100644 (file)
--- a/wpa_supplicant/bss.c
+++ b/wpa_supplicant/bss.c
@@ -1866,3 +1866,19 @@ out:
        wpabuf_free(mlbuf);
        return removed_links;
 }
+
+
+const u8 * wpa_bss_get_rsne(struct wpa_supplicant *wpa_s,
+                           const struct wpa_bss *bss, struct wpa_ssid *ssid,
+                           bool mlo)
+{
+       return wpa_bss_get_ie(bss, WLAN_EID_RSN);
+}
+
+
+const u8 * wpa_bss_get_rsnxe(struct wpa_supplicant *wpa_s,
+                            const struct wpa_bss *bss, struct wpa_ssid *ssid,
+                            bool mlo)
+{
+       return wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+}

diff --git a/wpa_supplicant/bss.h b/wpa_supplicant/bss.h
index 2079606a9fa474caadb4a17e3a313e70b6347a32..508129c3d7475f3e65e019ba4c605d2d9e831e0c 100644 (file)
--- a/wpa_supplicant/bss.h
+++ b/wpa_supplicant/bss.h
@@ -226,4 +226,11 @@ int wpa_bss_parse_basic_ml_element(struct wpa_supplicant *wpa_s,
 u16 wpa_bss_parse_reconf_ml_element(struct wpa_supplicant *wpa_s,
                                    struct wpa_bss *bss);
 
+const u8 * wpa_bss_get_rsne(struct wpa_supplicant *wpa_s,
+                           const struct wpa_bss *bss, struct wpa_ssid *ssid,
+                           bool mlo);
+const u8 * wpa_bss_get_rsnxe(struct wpa_supplicant *wpa_s,
+                            const struct wpa_bss *bss, struct wpa_ssid *ssid,
+                            bool mlo);
+
 #endif /* BSS_H */

diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c
index bcbcb258f76fde0333910718f29395a122d48697..d245531cd07891e13ab7b459f2d6e0bfb2557994 100644 (file)
--- a/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant/ctrl_iface.c
@@ -3119,12 +3119,12 @@ static int wpa_supplicant_ctrl_iface_scan_result(
        ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
        if (ie)
                pos = wpa_supplicant_ie_txt(pos, end, "WPA", ie, 2 + ie[1]);
-       ie2 = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       ie2 = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
        if (ie2) {
                pos = wpa_supplicant_ie_txt(pos, end, mesh ? "RSN" : "WPA2",
                                            ie2, 2 + ie2[1]);
        }
-       rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+       rsnxe = wpa_bss_get_rsnxe(wpa_s, bss, NULL, false);
        if (ieee802_11_rsnx_capab(rsnxe, WLAN_RSNX_CAPAB_SAE_H2E)) {
                ret = os_snprintf(pos, end - pos, "[SAE-H2E]");
                if (os_snprintf_error(end - pos, ret))
@@ -5444,12 +5444,12 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
                if (ie)
                        pos = wpa_supplicant_ie_txt(pos, end, "WPA", ie,
                                                    2 + ie[1]);
-               ie2 = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               ie2 = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
                if (ie2)
                        pos = wpa_supplicant_ie_txt(pos, end,
                                                    mesh ? "RSN" : "WPA2", ie2,
                                                    2 + ie2[1]);
-               rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               rsnxe = wpa_bss_get_rsnxe(wpa_s, bss, NULL, false);
                if (ieee802_11_rsnx_capab(rsnxe, WLAN_RSNX_CAPAB_SAE_H2E)) {
                        ret = os_snprintf(pos, end - pos, "[SAE-H2E]");
                        if (os_snprintf_error(end - pos, ret))

diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c
index db121319626e7dd26079a7a3716c3a563bfeb02d..960b3069b49dca8565fb5800876eae951aefb556 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new_handlers.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers.c
@@ -5635,7 +5635,7 @@ dbus_bool_t wpas_dbus_getter_bss_rsn(
                return FALSE;
 
        os_memset(&wpa_data, 0, sizeof(wpa_data));
-       ie = wpa_bss_get_ie(res, WLAN_EID_RSN);
+       ie = wpa_bss_get_rsne(args->wpa_s, res, NULL, false);
        if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &wpa_data) < 0) {
                dbus_set_error_const(error, DBUS_ERROR_FAILED,
                                     "failed to parse RSN IE");

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 4044b47dd7fe0e9545cbad3d160cb396f688be2b..94d7ae99017b1d3be3391bbeab649b32159ce2e6 100644 (file)
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -4500,7 +4500,7 @@ int wpas_dpp_check_connect(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
 
        if (!(ssid->key_mgmt & WPA_KEY_MGMT_DPP) || !bss)
                return 0; /* Not using DPP AKM - continue */
-       rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
        if (rsn && wpa_parse_wpa_ie(rsn, 2 + rsn[1], &ied) == 0 &&
            !(ied.key_mgmt & WPA_KEY_MGMT_DPP))
                return 0; /* AP does not support DPP AKM - continue */

diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 49917f7aaf7233edd6b8f43d21f0de9e5da4d7c8..4e55470bb3a32825f2bcb830809bc95d5378a038 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -670,7 +670,7 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
                 (ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA));
 #endif /* CONFIG_WEP */
 
-       rsn_ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsn_ie = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
        if (is_6ghz_bss && !rsn_ie) {
                if (debug_print)
                        wpa_dbg(wpa_s, MSG_DEBUG,
@@ -1143,7 +1143,7 @@ static void owe_trans_ssid(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
        u8 ssid_len;
 
        owe = wpa_bss_get_vendor_ie(bss, OWE_IE_VENDOR_TYPE);
-       if (!owe || !wpa_bss_get_ie(bss, WLAN_EID_RSN))
+       if (!owe || !wpa_bss_get_rsne(wpa_s, bss, NULL, false))
                return;
 
        pos = owe + 6;
@@ -1247,7 +1247,7 @@ static bool sae_pk_acceptable_bss_with_pk(struct wpa_supplicant *wpa_s,
 
                if (bss == orig_bss)
                        continue;
-               ie = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               ie = wpa_bss_get_rsnxe(wpa_s, bss, ssid, false);
                if (!(ieee802_11_rsnx_capab(ie, WLAN_RSNX_CAPAB_SAE_PK)))
                        continue;
 
@@ -1286,7 +1286,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
 
        ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
        wpa = ie && ie[1];
-       ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       ie = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
        wpa |= ie && ie[1];
        if (ie && wpa_parse_wpa_ie_rsn(ie, 2 + ie[1], &data) == 0 &&
            (data.key_mgmt & WPA_KEY_MGMT_OSEN))
@@ -1295,7 +1295,7 @@ static bool wpa_scan_res_ok(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
        osen = ie != NULL;
 
 #ifdef CONFIG_SAE
-       ie = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+       ie = wpa_bss_get_rsnxe(wpa_s, bss, ssid, false);
        if (ie && ie[1] >= 1)
                rsnxe_capa = ie[2];
 #endif /* CONFIG_SAE */
@@ -1650,7 +1650,7 @@ struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s,
        ie = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
        wpa_ie_len = ie ? ie[1] : 0;
 
-       ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       ie = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
        rsn_ie_len = ie ? ie[1] : 0;
 
        ie = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
@@ -2117,7 +2117,7 @@ static void wpa_supplicant_rsn_preauth_scan_results(
                if (ssid == NULL)
                        continue;
 
-               rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               rsn = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
                if (rsn == NULL)
                        continue;
 
@@ -3267,7 +3267,7 @@ static int wpa_supplicant_use_own_rsne_params(struct wpa_supplicant *wpa_s,
        if (wpa_s->wpa_proto & (WPA_PROTO_RSN | WPA_PROTO_OSEN)) {
                const u8 *bss_rsn;
 
-               bss_rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               bss_rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
                if (bss_rsn) {
                        p = bss_rsn;
                        len = 2 + bss_rsn[1];
@@ -3721,8 +3721,8 @@ static int wpa_supplicant_assoc_update_ie(struct wpa_supplicant *wpa_s)
 
        bss_wpa = wpa_bss_get_vendor_ie(wpa_s->current_bss,
                                        WPA_IE_VENDOR_TYPE);
-       bss_rsn = wpa_bss_get_ie(wpa_s->current_bss, WLAN_EID_RSN);
-       bss_rsnx = wpa_bss_get_ie(wpa_s->current_bss, WLAN_EID_RSNX);
+       bss_rsn = wpa_bss_get_rsne(wpa_s, wpa_s->current_bss, NULL, false);
+       bss_rsnx = wpa_bss_get_rsnxe(wpa_s, wpa_s->current_bss, NULL, false);
 
        if (wpa_sm_set_ap_wpa_ie(wpa_s->wpa, bss_wpa,
                                 bss_wpa ? 2 + bss_wpa[1] : 0) ||
@@ -4110,8 +4110,8 @@ static int wpa_sm_set_ml_info(struct wpa_supplicant *wpa_s)
                        return -1;
                }
 
-               bss_rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
-               bss_rsnx = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               bss_rsn = wpa_bss_get_rsne(wpa_s, bss, NULL, true);
+               bss_rsnx = wpa_bss_get_rsnxe(wpa_s, bss, NULL, true);
 
                wpa_mlo.links[i].ap_rsne = bss_rsn ? (u8 *) bss_rsn : NULL;
                wpa_mlo.links[i].ap_rsne_len = bss_rsn ? 2 + bss_rsn[1] : 0;

diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index 6a584651effe0121ca04bccb90ff5356c0eb5dc6..3ed8813f1d42ee3e4640b8d8ea16adfb6cad51a9 100644 (file)
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -1087,7 +1087,7 @@ void hs20_osu_icon_fetch(struct wpa_supplicant *wpa_s)
                prov_anqp = bss->anqp->hs20_osu_providers_list;
                if (prov_anqp == NULL)
                        continue;
-               ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               ie = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
                if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &data) == 0 &&
                    (data.key_mgmt & WPA_KEY_MGMT_OSEN)) {
                        osu_ssid2 = bss->ssid;

diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c
index 6773a243cf546111c0fe0c916ee8c0dc364fe105..e3faca69c6543b9ae3e755f39168408797081132 100644 (file)
--- a/wpa_supplicant/interworking.c
+++ b/wpa_supplicant/interworking.c
@@ -1726,7 +1726,7 @@ int interworking_connect(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
                   " for connection",
                   MAC2STR(bss->bssid));
 
-       if (!wpa_bss_get_ie(bss, WLAN_EID_RSN)) {
+       if (!wpa_bss_get_rsne(wpa_s, bss, NULL, false)) {
                /*
                 * We currently support only HS 2.0 networks and those are
                 * required to use WPA2-Enterprise.
@@ -2459,7 +2459,7 @@ static struct wpa_bss * pick_best_roaming_partner(struct wpa_supplicant *wpa_s,
                cred2 = interworking_credentials_available(wpa_s, bss, NULL);
                if (!cred2)
                        continue;
-               if (!wpa_bss_get_ie(bss, WLAN_EID_RSN))
+               if (!wpa_bss_get_rsne(wpa_s, bss, NULL, false))
                        continue;
                prio = roaming_prio(wpa_s, cred2, bss);
                wpa_printf(MSG_DEBUG, "Interworking: roaming_prio=%u for BSS "
@@ -2511,7 +2511,7 @@ static void interworking_select_network(struct wpa_supplicant *wpa_s)
                if (!cred)
                        continue;
 
-               if (!wpa_bss_get_ie(bss, WLAN_EID_RSN)) {
+               if (!wpa_bss_get_rsne(wpa_s, bss, NULL, false)) {
                        /*
                         * We currently support only HS 2.0 networks and those
                         * are required to use WPA2-Enterprise.

diff --git a/wpa_supplicant/mbo.c b/wpa_supplicant/mbo.c
index 59b15daf6dfd492393d04d74f7107699bf7cd3de..51f8e021287aec1d09a45028f842c7bcdc245e2f 100644 (file)
--- a/wpa_supplicant/mbo.c
+++ b/wpa_supplicant/mbo.c
@@ -115,7 +115,7 @@ void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
                return;
        if (oce && oce[1] >= 1 && (oce[2] & OCE_IS_STA_CFON))
                return; /* STA-CFON is not required to enable PMF */
-       rsne = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsne = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
        if (!rsne || wpa_parse_wpa_ie(rsne, 2 + rsne[1], &ie) < 0)
                return; /* AP is not using RSN */
 

diff --git a/wpa_supplicant/pasn_supplicant.c b/wpa_supplicant/pasn_supplicant.c
index 1bb38f73dcf63d96c8fe2b50858c2ca838b386ec..89edad49e5e2615e4262532676d6e47422e49bf7 100644 (file)
--- a/wpa_supplicant/pasn_supplicant.c
+++ b/wpa_supplicant/pasn_supplicant.c
@@ -174,7 +174,7 @@ static int wpas_pasn_get_params_from_bss(struct wpa_supplicant *wpa_s,
                }
        }
 
-       rsne = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsne = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
        if (!rsne) {
                wpa_printf(MSG_DEBUG, "PASN: BSS without RSNE");
                return -1;
@@ -186,7 +186,7 @@ static int wpas_pasn_get_params_from_bss(struct wpa_supplicant *wpa_s,
                return -1;
        }
 
-       rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+       rsnxe = wpa_bss_get_rsnxe(wpa_s, bss, NULL, false);
 
        ssid_str_len = bss->ssid_len;
        ssid_str = bss->ssid;
@@ -480,7 +480,7 @@ static struct wpa_bss * wpas_pasn_allowed(struct wpa_supplicant *wpa_s,
                return NULL;
        }
 
-       rsne = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsne = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
        if (!rsne) {
                wpa_printf(MSG_DEBUG, "PASN: BSS without RSNE");
                return NULL;
@@ -544,13 +544,13 @@ static void wpas_pasn_auth_start_cb(struct wpa_radio_work *work, int deinit)
                goto fail;
        }
 
-       rsne = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       rsne = wpa_bss_get_rsne(wpa_s, bss, NULL, false);
        if (!rsne) {
                wpa_printf(MSG_DEBUG, "PASN: BSS without RSNE");
                goto fail;
        }
 
-       rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+       rsnxe = wpa_bss_get_rsnxe(wpa_s, bss, NULL, false);
 
        derive_kdk = (wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_SEC_LTF_STA) &&
                ieee802_11_rsnx_capab(rsnxe,

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index e6538e871e3a32c468a3f227eefc642e027bcd43..8df60393a1cc62feb00d6807430edf9b0c50639e 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -190,7 +190,7 @@ static struct wpabuf * sme_auth_build_sae_commit(struct wpa_supplicant *wpa_s,
        if (bss) {
                const u8 *rsnxe;
 
-               rsnxe = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               rsnxe = wpa_bss_get_rsnxe(wpa_s, bss, ssid, false);
                if (rsnxe && rsnxe[1] >= 1)
                        rsnxe_capa = rsnxe[2];
        }
@@ -643,7 +643,7 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
                const u8 *rsn;
                struct wpa_ie_data ied;
 
-               rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
                if (!rsn) {
                        wpa_dbg(wpa_s, MSG_DEBUG,
                                "SAE enabled, but target BSS does not advertise RSN");
@@ -683,7 +683,7 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
 #endif /* CONFIG_WEP */
 
        if ((wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE) ||
-            wpa_bss_get_ie(bss, WLAN_EID_RSN)) &&
+            wpa_bss_get_rsne(wpa_s, bss, ssid, false)) &&
            wpa_key_mgmt_wpa(ssid->key_mgmt)) {
                int try_opportunistic;
                const u8 *cache_id = NULL;
@@ -807,7 +807,7 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
                wpa_dbg(wpa_s, MSG_DEBUG, "SME: FT mobility domain %02x%02x",
                        md[0], md[1]);
 
-               omit_rsnxe = !wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               omit_rsnxe = !wpa_bss_get_rsnxe(wpa_s, bss, ssid, false);
                if (wpa_s->sme.assoc_req_ie_len + 5 <
                    sizeof(wpa_s->sme.assoc_req_ie)) {
                        struct rsn_mdie *mdie;
@@ -836,7 +836,7 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
 
        wpa_s->sme.mfp = wpas_get_ssid_pmf(wpa_s, ssid);
        if (wpa_s->sme.mfp != NO_MGMT_FRAME_PROTECTION) {
-               const u8 *rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               const u8 *rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
                struct wpa_ie_data _ie;
                if (rsn && wpa_parse_wpa_ie(rsn, 2 + rsn[1], &_ie) == 0 &&
                    _ie.capabilities &

diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
index 037bfa3786337fbf990cfe5a449c8a25571159bd..de8785a3c6ff350e613355a032186f92ba74b274 100644 (file)
--- a/wpa_supplicant/wpa_supplicant.c
+++ b/wpa_supplicant/wpa_supplicant.c
@@ -1700,8 +1700,8 @@ int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
 
        if (bss) {
                bss_wpa = wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE);
-               bss_rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
-               bss_rsnx = wpa_bss_get_ie(bss, WLAN_EID_RSNX);
+               bss_rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
+               bss_rsnx = wpa_bss_get_rsnxe(wpa_s, bss, ssid, false);
                bss_osen = wpa_bss_get_vendor_ie(bss, OSEN_IE_VENDOR_TYPE);
        } else {
                bss_wpa = bss_rsn = bss_rsnx = bss_osen = NULL;
@@ -3456,7 +3456,7 @@ static u8 * wpas_populate_assoc_ies(
        }
 
        if (bss && (wpa_bss_get_vendor_ie(bss, WPA_IE_VENDOR_TYPE) ||
-                   wpa_bss_get_ie(bss, WLAN_EID_RSN)) &&
+                   wpa_bss_get_rsne(wpa_s, bss, ssid, false)) &&
            wpa_key_mgmt_wpa(ssid->key_mgmt)) {
                int try_opportunistic;
                const u8 *cache_id = NULL;
@@ -4497,7 +4497,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
 
        params.mgmt_frame_protection = wpas_get_ssid_pmf(wpa_s, ssid);
        if (params.mgmt_frame_protection != NO_MGMT_FRAME_PROTECTION && bss) {
-               const u8 *rsn = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+               const u8 *rsn = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
                struct wpa_ie_data ie;
                if (!wpas_driver_bss_selection(wpa_s) && rsn &&
                    wpa_parse_wpa_ie(rsn, 2 + rsn[1], &ie) == 0 &&

diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c
index 5199f950bb478d0b289792cfdc258e2fa8016e92..9100bee0541f8f63077c6e219b27759cf3631506 100644 (file)
--- a/wpa_supplicant/wpas_glue.c
+++ b/wpa_supplicant/wpas_glue.c
@@ -425,11 +425,11 @@ static int wpa_get_beacon_ie(struct wpa_supplicant *wpa_s)
                if (wpa_sm_set_ap_wpa_ie(wpa_s->wpa, ie, ie ? 2 + ie[1] : 0))
                        ret = -1;
 
-               ie = wpa_bss_get_ie(curr, WLAN_EID_RSN);
+               ie = wpa_bss_get_rsne(wpa_s, curr, ssid, false);
                if (wpa_sm_set_ap_rsn_ie(wpa_s->wpa, ie, ie ? 2 + ie[1] : 0))
                        ret = -1;
 
-               ie = wpa_bss_get_ie(curr, WLAN_EID_RSNX);
+               ie = wpa_bss_get_rsnxe(wpa_s, curr, ssid, false);
                if (wpa_sm_set_ap_rsnxe(wpa_s->wpa, ie, ie ? 2 + ie[1] : 0))
                        ret = -1;
        } else {

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 8cd355f6b3b5c8f198338f1ddbac3dd191d94793..7b9cf7f9e510d5500d4593b23bc83b09d4af8b8f 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -226,7 +226,7 @@ static void wpas_wps_security_workaround(struct wpa_supplicant *wpa_s,
 
        wpa_printf(MSG_DEBUG, "WPS: AP found from BSS table");
 
-       ie = wpa_bss_get_ie(bss, WLAN_EID_RSN);
+       ie = wpa_bss_get_rsne(wpa_s, bss, ssid, false);
        if (ie && wpa_parse_wpa_ie(ie, 2 + ie[1], &adv) == 0) {
                wpa2 = 1;
                if (adv.pairwise_cipher & WPA_CIPHER_CCMP)