WPS: Use only os_get_random() for PIN generation

[mech_eap.git] / wpa_supplicant / ap.c

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 16ebfaf..60f8c0d 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -56,12 +56,32 @@ static void wpas_conf_ap_vht(struct wpa_supplicant *wpa_s,
        if (!conf->secondary_channel)
                goto no_vht;
 
-       center_chan = wpas_p2p_get_vht80_center(wpa_s, mode, channel);
+       switch (conf->vht_oper_chwidth) {
+       case VHT_CHANWIDTH_80MHZ:
+       case VHT_CHANWIDTH_80P80MHZ:
+               center_chan = wpas_p2p_get_vht80_center(wpa_s, mode, channel);
+               break;
+       case VHT_CHANWIDTH_160MHZ:
+               center_chan = wpas_p2p_get_vht160_center(wpa_s, mode, channel);
+               break;
+       default:
+               /*
+                * conf->vht_oper_chwidth might not be set for non-P2P GO cases,
+                * try oper_cwidth 160 MHz first then VHT 80 MHz, if 160 MHz is
+                * not supported.
+                */
+               conf->vht_oper_chwidth = VHT_CHANWIDTH_160MHZ;
+               center_chan = wpas_p2p_get_vht160_center(wpa_s, mode, channel);
+               if (!center_chan) {
+                       conf->vht_oper_chwidth = VHT_CHANWIDTH_80MHZ;
+                       center_chan = wpas_p2p_get_vht80_center(wpa_s, mode,
+                                                               channel);
+               }
+               break;
+       }
        if (!center_chan)
                goto no_vht;
 
-       /* Use 80 MHz channel */
-       conf->vht_oper_chwidth = 1;
        conf->vht_oper_centr_freq_seg0_idx = center_chan;
        return;
 
@@ -72,14 +92,24 @@ no_vht:
        conf->vht_oper_centr_freq_seg0_idx =
                conf->channel + conf->secondary_channel * 2;
 #endif /* CONFIG_P2P */
+       conf->vht_oper_chwidth = VHT_CHANWIDTH_USE_HT;
 }
 #endif /* CONFIG_IEEE80211N */
 
 
-void wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
-                              struct wpa_ssid *ssid,
-                              struct hostapd_config *conf)
+int wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
+                             struct wpa_ssid *ssid,
+                             struct hostapd_config *conf)
 {
+       conf->hw_mode = ieee80211_freq_to_chan(ssid->frequency,
+                                              &conf->channel);
+
+       if (conf->hw_mode == NUM_HOSTAPD_MODES) {
+               wpa_printf(MSG_ERROR, "Unsupported AP mode frequency: %d MHz",
+                          ssid->frequency);
+               return -1;
+       }
+
        /* TODO: enable HT40 if driver supports it;
         * drop to 11b if driver does not support 11g */
 
@@ -166,6 +196,8 @@ void wpa_supplicant_conf_ap_ht(struct wpa_supplicant *wpa_s,
                }
        }
 #endif /* CONFIG_IEEE80211N */
+
+       return 0;
 }
 
 
@@ -179,15 +211,16 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
 
        os_strlcpy(bss->iface, wpa_s->ifname, sizeof(bss->iface));
 
-       conf->hw_mode = ieee80211_freq_to_chan(ssid->frequency,
-                                              &conf->channel);
-       if (conf->hw_mode == NUM_HOSTAPD_MODES) {
-               wpa_printf(MSG_ERROR, "Unsupported AP mode frequency: %d MHz",
-                          ssid->frequency);
+       if (wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf))
                return -1;
-       }
 
-       wpa_supplicant_conf_ap_ht(wpa_s, ssid, conf);
+#ifdef CONFIG_ACS
+       if (ssid->acs) {
+               /* Setting channel to 0 in order to enable ACS */
+               conf->channel = 0;
+               wpa_printf(MSG_DEBUG, "Use automatic channel selection");
+       }
+#endif /* CONFIG_ACS */
 
        if (ieee80211_is_dfs(ssid->frequency) && wpa_s->conf->country[0]) {
                conf->ieee80211h = 1;
@@ -297,13 +330,17 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
                conf->beacon_int = wpa_s->conf->beacon_int;
 
 #ifdef CONFIG_P2P
-       if (wpa_s->conf->p2p_go_ctwindow > conf->beacon_int) {
-               wpa_printf(MSG_INFO,
-                          "CTWindow (%d) is bigger than beacon interval (%d) - avoid configuring it",
-                          wpa_s->conf->p2p_go_ctwindow, conf->beacon_int);
-               conf->p2p_go_ctwindow = 0;
-       } else {
-               conf->p2p_go_ctwindow = wpa_s->conf->p2p_go_ctwindow;
+       if (ssid->mode == WPAS_MODE_P2P_GO ||
+           ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
+               if (wpa_s->conf->p2p_go_ctwindow > conf->beacon_int) {
+                       wpa_printf(MSG_INFO,
+                                  "CTWindow (%d) is bigger than beacon interval (%d) - avoid configuring it",
+                                  wpa_s->conf->p2p_go_ctwindow,
+                                  conf->beacon_int);
+                       conf->p2p_go_ctwindow = 0;
+               } else {
+                       conf->p2p_go_ctwindow = wpa_s->conf->p2p_go_ctwindow;
+               }
        }
 #endif /* CONFIG_P2P */
 
@@ -416,6 +453,8 @@ no_wps:
                        wpabuf_dup(wpa_s->conf->ap_vendor_elements);
        }
 
+       bss->pbss = ssid->pbss;
+
        return 0;
 }
 
@@ -530,6 +569,11 @@ static void wpas_ap_configured_cb(void *ctx)
 {
        struct wpa_supplicant *wpa_s = ctx;
 
+#ifdef CONFIG_ACS
+       if (wpa_s->current_ssid && wpa_s->current_ssid->acs)
+               wpa_s->assoc_freq = wpa_s->ap_iface->freq;
+#endif /* CONFIG_ACS */
+
        wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
 
        if (wpa_s->ap_configured_cb)
@@ -627,6 +671,13 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
                return -1;
        }
 
+       /* Use the maximum oper channel width if it's given. */
+       if (ssid->max_oper_chwidth)
+               conf->vht_oper_chwidth = ssid->max_oper_chwidth;
+
+       ieee80211_freq_to_chan(ssid->vht_center_freq2,
+                              &conf->vht_oper_centr_freq_seg1_idx);
+
        os_memcpy(wpa_s->ap_iface->conf->wmm_ac_params,
                  wpa_s->conf->wmm_ac_params,
                  sizeof(wpa_s->conf->wmm_ac_params));
@@ -864,7 +915,10 @@ int wpa_supplicant_ap_wps_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
                return -1;
 
        if (pin == NULL) {
-               unsigned int rpin = wps_generate_pin();
+               unsigned int rpin;
+
+               if (wps_generate_pin(&rpin) < 0)
+                       return -1;
                ret_len = os_snprintf(buf, buflen, "%08d", rpin);
                if (os_snprintf_error(buflen, ret_len))
                        return -1;
@@ -930,7 +984,8 @@ const char * wpas_wps_ap_pin_random(struct wpa_supplicant *wpa_s, int timeout)
        if (wpa_s->ap_iface == NULL)
                return NULL;
        hapd = wpa_s->ap_iface->bss[0];
-       pin = wps_generate_pin();
+       if (wps_generate_pin(&pin) < 0)
+               return NULL;
        os_snprintf(pin_txt, sizeof(pin_txt), "%08u", pin);
        os_free(hapd->conf->ap_pin);
        hapd->conf->ap_pin = os_strdup(pin_txt);
@@ -1207,7 +1262,8 @@ void wpas_ap_ch_switch(struct wpa_supplicant *wpa_s, int freq, int ht,
        wpa_s->assoc_freq = freq;
        if (wpa_s->current_ssid)
                wpa_s->current_ssid->frequency = freq;
-       hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht, offset, width, cf1, cf1);
+       hostapd_event_ch_switch(wpa_s->ap_iface->bss[0], freq, ht,
+                               offset, width, cf1, cf2);
 }