Accumulative patch from commit d5b559b6418c2bd09663e0d09e93a6592357fdce

[android-x86/external-wpa_supplicant_8.git] / wpa_supplicant / hs20_supplicant.c

diff --git a/wpa_supplicant/hs20_supplicant.c b/wpa_supplicant/hs20_supplicant.c
index 0eb6119..4048cf7 100644 (file)
--- a/wpa_supplicant/hs20_supplicant.c
+++ b/wpa_supplicant/hs20_supplicant.c
@@ -33,6 +33,35 @@ void wpas_hs20_add_indication(struct wpabuf *buf)
 }
 
 
+int is_hs20_network(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
+                   struct wpa_bss *bss)
+{
+       if (!wpa_s->conf->hs20 || !ssid)
+               return 0;
+
+       if (ssid->parent_cred)
+               return 1;
+
+       if (bss && !wpa_bss_get_vendor_ie(bss, HS20_IE_VENDOR_TYPE))
+               return 0;
+
+       /*
+        * This may catch some non-Hotspot 2.0 cases, but it is safer to do that
+        * than cause Hotspot 2.0 connections without indication element getting
+        * added. Non-Hotspot 2.0 APs should ignore the unknown vendor element.
+        */
+
+       if (!(ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X))
+               return 0;
+       if (!(ssid->pairwise_cipher & WPA_CIPHER_CCMP))
+               return 0;
+       if (ssid->proto != WPA_PROTO_RSN)
+               return 0;
+
+       return 1;
+}
+
+
 struct wpabuf * hs20_build_anqp_req(u32 stypes, const u8 *payload,
                                    size_t payload_len)
 {
@@ -79,8 +108,10 @@ int hs20_anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, u32 stypes,
 
        freq = wpa_s->assoc_freq;
        bss = wpa_bss_get_bssid(wpa_s, dst);
-       if (bss)
+       if (bss) {
+               wpa_bss_anqp_unshare_alloc(bss);
                freq = bss->freq;
+       }
        if (freq <= 0)
                return -1;
 
@@ -141,9 +172,16 @@ void hs20_parse_rx_hs20_anqp_resp(struct wpa_supplicant *wpa_s,
                }
                break;
        case HS20_STYPE_WAN_METRICS:
+               wpa_hexdump(MSG_DEBUG, "WAN Metrics", pos, slen);
+               if (slen < 13) {
+                       wpa_dbg(wpa_s, MSG_DEBUG, "HS 2.0: Too short WAN "
+                               "Metrics value from " MACSTR, MAC2STR(sa));
+                       break;
+               }
                wpa_msg(wpa_s, MSG_INFO, "RX-HS20-ANQP " MACSTR
-                       " WAN Metrics", MAC2STR(sa));
-               wpa_hexdump_ascii(MSG_DEBUG, "WAN Metrics", pos, slen);
+                       " WAN Metrics %02x:%u:%u:%u:%u:%u", MAC2STR(sa),
+                       pos[0], WPA_GET_LE32(pos + 1), WPA_GET_LE32(pos + 5),
+                       pos[9], pos[10], WPA_GET_LE16(pos + 11));
                if (anqp) {
                        wpabuf_free(anqp->hs20_wan_metrics);
                        anqp->hs20_wan_metrics = wpabuf_alloc_copy(pos, slen);