hostapd: Fix internal crypto build without TLS

[wpasupplicant] / wpa_supplicant / ap.c

diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 113516a..999d7e0 100644 (file)
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -21,9 +21,11 @@
 #ifdef NEED_MLME
 #include "../hostapd/ieee802_11.h"
 #endif /* NEED_MLME */
+#include "../hostapd/wps_hostapd.h"
 #include "eap_common/eap_defs.h"
 #include "eap_server/eap_methods.h"
 #include "eap_common/eap_wsc_common.h"
+#include "wps/wps.h"
 #include "config_ssid.h"
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
@@ -128,8 +130,10 @@ static int ap_driver_read_sta_data(void *priv,
 static int ap_driver_sta_set_flags(void *priv, const u8 *addr, int total_flags,
                                   int flags_or, int flags_and)
 {
-       wpa_printf(MSG_DEBUG, "AP TODO: %s", __func__);
-       return -1;
+       struct ap_driver_data *drv = priv;
+       struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+       return wpa_drv_sta_set_flags(wpa_s, addr, total_flags, flags_or,
+                                    flags_and);
 }
 
 
@@ -248,6 +252,17 @@ static struct hostapd_hw_modes *ap_driver_get_hw_feature_data(void *priv,
 }
 
 
+static int ap_driver_hapd_send_eapol(void *priv, const u8 *addr,
+                                    const u8 *data, size_t data_len,
+                                    int encrypt, const u8 *own_addr)
+{
+       struct ap_driver_data *drv = priv;
+       struct wpa_supplicant *wpa_s = drv->hapd->iface->owner;
+       return wpa_drv_hapd_send_eapol(wpa_s, addr, data, data_len, encrypt,
+                                      own_addr);
+}
+
+
 struct wpa_driver_ops ap_driver_ops =
 {
        .name = "wpa_supplicant",
@@ -273,6 +288,7 @@ struct wpa_driver_ops ap_driver_ops =
        .set_short_slot_time = ap_driver_set_short_slot_time,
        .set_tx_queue_params = ap_driver_set_tx_queue_params,
        .get_hw_feature_data = ap_driver_get_hw_feature_data,
+       .hapd_send_eapol = ap_driver_hapd_send_eapol,
 };
 
 
@@ -283,7 +299,7 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
                                  struct hostapd_config *conf)
 {
        struct hostapd_bss_config *bss = &conf->bss[0];
-       int j;
+       int j, pairwise;
 
        for (j = 0; wpa_drivers[j]; j++) {
                if (os_strcmp("wpa_supplicant", wpa_drivers[j]->name) == 0) {
@@ -333,8 +349,6 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
        bss->wpa_pairwise = ssid->pairwise_cipher;
        if (ssid->passphrase) {
                bss->ssid.wpa_passphrase = os_strdup(ssid->passphrase);
-               if (hostapd_setup_wpa_psk(bss))
-                       return -1;
        } else if (ssid->psk_set) {
                os_free(bss->ssid.wpa_psk);
                bss->ssid.wpa_psk = os_zalloc(sizeof(struct hostapd_wpa_psk));
@@ -344,6 +358,43 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s,
                bss->ssid.wpa_psk->group = 1;
        }
 
+       /* Select group cipher based on the enabled pairwise cipher suites */
+       pairwise = 0;
+       if (bss->wpa & 1)
+               pairwise |= bss->wpa_pairwise;
+       if (bss->wpa & 2) {
+               if (bss->rsn_pairwise == 0)
+                       bss->rsn_pairwise = bss->wpa_pairwise;
+               pairwise |= bss->rsn_pairwise;
+       }
+       if (pairwise & WPA_CIPHER_TKIP)
+               bss->wpa_group = WPA_CIPHER_TKIP;
+       else
+               bss->wpa_group = WPA_CIPHER_CCMP;
+
+       if (bss->wpa && bss->ieee802_1x)
+               bss->ssid.security_policy = SECURITY_WPA;
+       else if (bss->wpa)
+               bss->ssid.security_policy = SECURITY_WPA_PSK;
+       else if (bss->ieee802_1x) {
+               bss->ssid.security_policy = SECURITY_IEEE_802_1X;
+               bss->ssid.wep.default_len = bss->default_wep_key_len;
+       } else if (bss->ssid.wep.keys_set)
+               bss->ssid.security_policy = SECURITY_STATIC_WEP;
+       else
+               bss->ssid.security_policy = SECURITY_PLAINTEXT;
+
+#ifdef CONFIG_WPS
+       /*
+        * Enable WPS by default, but require user interaction to actually use
+        * it. Only the internal Registrar is supported.
+        */
+       bss->eap_server = 1;
+       bss->wps_state = 2;
+       bss->ap_setup_locked = 1;
+       bss->config_methods = os_strdup("display push_button");
+#endif /* CONFIG_WPS */
+
        return 0;
 }
 
@@ -462,3 +513,38 @@ void ap_mgmt_tx_cb(void *ctx, u8 *buf, size_t len, u16 stype, int ok)
        ieee802_11_mgmt_cb(wpa_s->ap_iface->bss[0], buf, len, stype, ok);
 }
 #endif /* NEED_MLME */
+
+
+void wpa_supplicant_ap_rx_eapol(struct wpa_supplicant *wpa_s,
+                               const u8 *src_addr, const u8 *buf, size_t len)
+{
+       hostapd_eapol_receive(wpa_s->ap_iface->bss[0], src_addr, buf, len);
+}
+
+
+#ifdef CONFIG_WPS
+
+int wpa_supplicant_ap_wps_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid)
+{
+       return hostapd_wps_button_pushed(wpa_s->ap_iface->bss[0]);
+}
+
+
+int wpa_supplicant_ap_wps_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
+                             const char *pin, char *buf, size_t buflen)
+{
+       int ret, ret_len = 0;
+
+       if (pin == NULL) {
+               unsigned int rpin = wps_generate_pin();
+               ret_len = os_snprintf(buf, buflen, "%d", rpin);
+               pin = buf;
+       }
+
+       ret = hostapd_wps_add_pin(wpa_s->ap_iface->bss[0], "any", pin);
+       if (ret)
+               return -1;
+       return ret_len;
+}
+
+#endif /* CONFIG_WPS */