Updated through tag hostap_2_5 from git://w1.fi/hostap.git
[mech_eap.git] / libeap / wpa_supplicant / wpas_glue.c
index 4af0cd0..29c22ba 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * WPA Supplicant - Glue code to setup EAPOL and RSN modules
- * Copyright (c) 2003-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2015, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -24,7 +18,6 @@
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "rsn_supp/pmksa_cache.h"
-#include "mlme.h"
 #include "sme.h"
 #include "common/ieee802_11_defs.h"
 #include "common/wpa_ctrl.h"
@@ -32,6 +25,8 @@
 #include "wps_supplicant.h"
 #include "bss.h"
 #include "scan.h"
+#include "notify.h"
+#include "wpas_kay.h"
 
 
 #ifndef CONFIG_NO_CONFIG_BLOBS
@@ -101,11 +96,26 @@ static u8 * wpa_alloc_eapol(const struct wpa_supplicant *wpa_s, u8 type,
 static int wpa_ether_send(struct wpa_supplicant *wpa_s, const u8 *dest,
                          u16 proto, const u8 *buf, size_t len)
 {
+#ifdef CONFIG_TESTING_OPTIONS
+       if (wpa_s->ext_eapol_frame_io && proto == ETH_P_EAPOL) {
+               size_t hex_len = 2 * len + 1;
+               char *hex = os_malloc(hex_len);
+
+               if (hex == NULL)
+                       return -1;
+               wpa_snprintf_hex(hex, hex_len, buf, len);
+               wpa_msg(wpa_s, MSG_INFO, "EAPOL-TX " MACSTR " %s",
+                       MAC2STR(dest), hex);
+               os_free(hex);
+               return 0;
+       }
+#endif /* CONFIG_TESTING_OPTIONS */
+
        if (wpa_s->l2) {
                return l2_packet_send(wpa_s->l2, dest, proto, buf, len);
        }
 
-       return wpa_drv_send_eapol(wpa_s, dest, proto, buf, len);
+       return -1;
 }
 #endif /* IEEE8021X_EAPOL || !CONFIG_NO_WPA */
 
@@ -147,11 +157,29 @@ static int wpa_supplicant_eapol_send(void *ctx, int type, const u8 *buf,
 
        if (pmksa_cache_get_current(wpa_s->wpa) &&
            type == IEEE802_1X_TYPE_EAPOL_START) {
-               /* Trying to use PMKSA caching - do not send EAPOL-Start frames
-                * since they will trigger full EAPOL authentication. */
-               wpa_printf(MSG_DEBUG, "RSN: PMKSA caching - do not send "
-                          "EAPOL-Start");
-               return -1;
+               /*
+                * We were trying to use PMKSA caching and sending EAPOL-Start
+                * would abort that and trigger full EAPOL authentication.
+                * However, we've already waited for the AP/Authenticator to
+                * start 4-way handshake or EAP authentication, and apparently
+                * it has not done so since the startWhen timer has reached zero
+                * to get the state machine sending EAPOL-Start. This is not
+                * really supposed to happen, but an interoperability issue with
+                * a deployed AP has been identified where the connection fails
+                * due to that AP failing to operate correctly if PMKID is
+                * included in the Association Request frame. To work around
+                * this, assume PMKSA caching failed and try to initiate full
+                * EAP authentication.
+                */
+               if (!wpa_s->current_ssid ||
+                   wpa_s->current_ssid->eap_workaround) {
+                       wpa_printf(MSG_DEBUG,
+                                  "RSN: Timeout on waiting for the AP to initiate 4-way handshake for PMKSA caching or EAP authentication - try to force it to start EAP authentication");
+               } else {
+                       wpa_printf(MSG_DEBUG,
+                                  "RSN: PMKSA caching - do not send EAPOL-Start");
+                       return -1;
+               }
        }
 
        if (is_zero_ether_addr(wpa_s->bssid)) {
@@ -210,9 +238,8 @@ static int wpa_eapol_set_wep_key(void *ctx, int unicast, int keyidx,
                        wpa_s->group_cipher = cipher;
        }
        return wpa_drv_set_key(wpa_s, WPA_ALG_WEP,
-                              unicast ? wpa_s->bssid :
-                              (u8 *) "\xff\xff\xff\xff\xff\xff",
-                              keyidx, unicast, (u8 *) "", 0, key, keylen);
+                              unicast ? wpa_s->bssid : NULL,
+                              keyidx, unicast, NULL, 0, key, keylen);
 }
 
 
@@ -223,29 +250,50 @@ static void wpa_supplicant_aborted_cached(void *ctx)
 }
 
 
-static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol, int success,
+static const char * result_str(enum eapol_supp_result result)
+{
+       switch (result) {
+       case EAPOL_SUPP_RESULT_FAILURE:
+               return "FAILURE";
+       case EAPOL_SUPP_RESULT_SUCCESS:
+               return "SUCCESS";
+       case EAPOL_SUPP_RESULT_EXPECTED_FAILURE:
+               return "EXPECTED_FAILURE";
+       }
+       return "?";
+}
+
+
+static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol,
+                                   enum eapol_supp_result result,
                                    void *ctx)
 {
        struct wpa_supplicant *wpa_s = ctx;
        int res, pmk_len;
        u8 pmk[PMK_LEN];
 
-       wpa_printf(MSG_DEBUG, "EAPOL authentication completed %ssuccessfully",
-                  success ? "" : "un");
+       wpa_printf(MSG_DEBUG, "EAPOL authentication completed - result=%s",
+                  result_str(result));
 
        if (wpas_wps_eapol_cb(wpa_s) > 0)
                return;
 
-       if (!success) {
+       wpa_s->eap_expected_failure = result ==
+               EAPOL_SUPP_RESULT_EXPECTED_FAILURE;
+
+       if (result != EAPOL_SUPP_RESULT_SUCCESS) {
                /*
                 * Make sure we do not get stuck here waiting for long EAPOL
                 * timeout if the AP does not disconnect in case of
                 * authentication failure.
                 */
                wpa_supplicant_req_auth_timeout(wpa_s, 2, 0);
+       } else {
+               ieee802_1x_notify_create_actor(wpa_s, wpa_s->last_eapol_src);
        }
 
-       if (!success || !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
+       if (result != EAPOL_SUPP_RESULT_SUCCESS ||
+           !(wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE))
                return;
 
        if (!wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt))
@@ -255,14 +303,29 @@ static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol, int success,
                   "handshake");
 
        pmk_len = PMK_LEN;
-       res = eapol_sm_get_key(eapol, pmk, PMK_LEN);
-       if (res) {
-               /*
-                * EAP-LEAP is an exception from other EAP methods: it
-                * uses only 16-byte PMK.
-                */
-               res = eapol_sm_get_key(eapol, pmk, 16);
-               pmk_len = 16;
+       if (wpa_key_mgmt_ft(wpa_s->key_mgmt)) {
+#ifdef CONFIG_IEEE80211R
+               u8 buf[2 * PMK_LEN];
+               wpa_printf(MSG_DEBUG, "RSN: Use FT XXKey as PMK for "
+                          "driver-based 4-way hs and FT");
+               res = eapol_sm_get_key(eapol, buf, 2 * PMK_LEN);
+               if (res == 0) {
+                       os_memcpy(pmk, buf + PMK_LEN, PMK_LEN);
+                       os_memset(buf, 0, sizeof(buf));
+               }
+#else /* CONFIG_IEEE80211R */
+               res = -1;
+#endif /* CONFIG_IEEE80211R */
+       } else {
+               res = eapol_sm_get_key(eapol, pmk, PMK_LEN);
+               if (res) {
+                       /*
+                        * EAP-LEAP is an exception from other EAP methods: it
+                        * uses only 16-byte PMK.
+                        */
+                       res = eapol_sm_get_key(eapol, pmk, 16);
+                       pmk_len = 16;
+               }
        }
 
        if (res) {
@@ -271,6 +334,9 @@ static void wpa_supplicant_eapol_cb(struct eapol_sm *eapol, int success,
                return;
        }
 
+       wpa_hexdump_key(MSG_DEBUG, "RSN: Configure PMK for driver-based 4-way "
+                       "handshake", pmk, pmk_len);
+
        if (wpa_drv_set_key(wpa_s, WPA_ALG_PMK, NULL, 0, 0, NULL, 0, pmk,
                            pmk_len)) {
                wpa_printf(MSG_DEBUG, "Failed to set PMK to the driver");
@@ -395,14 +461,6 @@ static enum wpa_states _wpa_supplicant_get_state(void *wpa_s)
 }
 
 
-static void _wpa_supplicant_disassociate(void *wpa_s, int reason_code)
-{
-       wpa_supplicant_disassociate(wpa_s, reason_code);
-       /* Schedule a scan to make sure we continue looking for networks */
-       wpa_supplicant_req_scan(wpa_s, 5, 0);
-}
-
-
 static void _wpa_supplicant_deauthenticate(void *wpa_s, int reason_code)
 {
        wpa_supplicant_deauthenticate(wpa_s, reason_code);
@@ -420,10 +478,6 @@ static void * wpa_supplicant_get_network_ctx(void *wpa_s)
 static int wpa_supplicant_get_bssid(void *ctx, u8 *bssid)
 {
        struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME) {
-               os_memcpy(bssid, wpa_s->bssid, ETH_ALEN);
-               return 0;
-       }
        return wpa_drv_get_bssid(wpa_s, bssid);
 }
 
@@ -438,6 +492,13 @@ static int wpa_supplicant_set_key(void *_wpa_s, enum wpa_alg alg,
                /* Clear the MIC error counter when setting a new PTK. */
                wpa_s->mic_errors_seen = 0;
        }
+#ifdef CONFIG_TESTING_GET_GTK
+       if (key_idx > 0 && addr && is_broadcast_ether_addr(addr) &&
+           alg != WPA_ALG_NONE && key_len <= sizeof(wpa_s->last_gtk)) {
+               os_memcpy(wpa_s->last_gtk, key, key_len);
+               wpa_s->last_gtk_len = key_len;
+       }
+#endif /* CONFIG_TESTING_GET_GTK */
        return wpa_drv_set_key(wpa_s, alg, addr, key_idx, set_tx, seq, seq_len,
                               key, key_len);
 }
@@ -471,8 +532,6 @@ static int wpa_supplicant_update_ft_ies(void *ctx, const u8 *md,
                                        const u8 *ies, size_t ies_len)
 {
        struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
-               return ieee80211_sta_update_ft_ies(wpa_s, md, ies, ies_len);
        if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME)
                return sme_update_ft_ies(wpa_s, md, ies, ies_len);
        return wpa_drv_update_ft_ies(wpa_s, md, ies, ies_len);
@@ -484,10 +543,44 @@ static int wpa_supplicant_send_ft_action(void *ctx, u8 action,
                                         const u8 *ies, size_t ies_len)
 {
        struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
-               return ieee80211_sta_send_ft_action(wpa_s, action, target_ap,
-                                                   ies, ies_len);
-       return wpa_drv_send_ft_action(wpa_s, action, target_ap, ies, ies_len);
+       int ret;
+       u8 *data, *pos;
+       size_t data_len;
+
+       if (action != 1) {
+               wpa_printf(MSG_ERROR, "Unsupported send_ft_action action %d",
+                          action);
+               return -1;
+       }
+
+       /*
+        * Action frame payload:
+        * Category[1] = 6 (Fast BSS Transition)
+        * Action[1] = 1 (Fast BSS Transition Request)
+        * STA Address
+        * Target AP Address
+        * FT IEs
+        */
+
+       data_len = 2 + 2 * ETH_ALEN + ies_len;
+       data = os_malloc(data_len);
+       if (data == NULL)
+               return -1;
+       pos = data;
+       *pos++ = 0x06; /* FT Action category */
+       *pos++ = action;
+       os_memcpy(pos, wpa_s->own_addr, ETH_ALEN);
+       pos += ETH_ALEN;
+       os_memcpy(pos, target_ap, ETH_ALEN);
+       pos += ETH_ALEN;
+       os_memcpy(pos, ies, ies_len);
+
+       ret = wpa_drv_send_action(wpa_s, wpa_s->assoc_freq, 0,
+                                 wpa_s->bssid, wpa_s->own_addr, wpa_s->bssid,
+                                 data, data_len, 0);
+       os_free(data);
+
+       return ret;
 }
 
 
@@ -497,9 +590,6 @@ static int wpa_supplicant_mark_authenticated(void *ctx, const u8 *target_ap)
        struct wpa_driver_auth_params params;
        struct wpa_bss *bss;
 
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
-               return -1;
-
        bss = wpa_bss_get_bssid(wpa_s, target_ap);
        if (bss == NULL)
                return -1;
@@ -515,31 +605,211 @@ static int wpa_supplicant_mark_authenticated(void *ctx, const u8 *target_ap)
 }
 #endif /* CONFIG_IEEE80211R */
 
-#endif /* CONFIG_NO_WPA */
 
+#ifdef CONFIG_TDLS
 
-#ifdef IEEE8021X_EAPOL
-#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
-static void wpa_supplicant_eap_param_needed(void *ctx, const char *field,
-                                           const char *txt)
+static int wpa_supplicant_tdls_get_capa(void *ctx, int *tdls_supported,
+                                       int *tdls_ext_setup,
+                                       int *tdls_chan_switch)
 {
        struct wpa_supplicant *wpa_s = ctx;
-       struct wpa_ssid *ssid = wpa_s->current_ssid;
+
+       *tdls_supported = 0;
+       *tdls_ext_setup = 0;
+       *tdls_chan_switch = 0;
+
+       if (!wpa_s->drv_capa_known)
+               return -1;
+
+       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_TDLS_SUPPORT)
+               *tdls_supported = 1;
+
+       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_TDLS_EXTERNAL_SETUP)
+               *tdls_ext_setup = 1;
+
+       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_TDLS_CHANNEL_SWITCH)
+               *tdls_chan_switch = 1;
+
+       return 0;
+}
+
+
+static int wpa_supplicant_send_tdls_mgmt(void *ctx, const u8 *dst,
+                                        u8 action_code, u8 dialog_token,
+                                        u16 status_code, u32 peer_capab,
+                                        int initiator, const u8 *buf,
+                                        size_t len)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       return wpa_drv_send_tdls_mgmt(wpa_s, dst, action_code, dialog_token,
+                                     status_code, peer_capab, initiator, buf,
+                                     len);
+}
+
+
+static int wpa_supplicant_tdls_oper(void *ctx, int oper, const u8 *peer)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       return wpa_drv_tdls_oper(wpa_s, oper, peer);
+}
+
+
+static int wpa_supplicant_tdls_peer_addset(
+       void *ctx, const u8 *peer, int add, u16 aid, u16 capability,
+       const u8 *supp_rates, size_t supp_rates_len,
+       const struct ieee80211_ht_capabilities *ht_capab,
+       const struct ieee80211_vht_capabilities *vht_capab,
+       u8 qosinfo, int wmm, const u8 *ext_capab, size_t ext_capab_len,
+       const u8 *supp_channels, size_t supp_channels_len,
+       const u8 *supp_oper_classes, size_t supp_oper_classes_len)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       struct hostapd_sta_add_params params;
+
+       os_memset(&params, 0, sizeof(params));
+
+       params.addr = peer;
+       params.aid = aid;
+       params.capability = capability;
+       params.flags = WPA_STA_TDLS_PEER | WPA_STA_AUTHORIZED;
+
+       /*
+        * Don't rely only on qosinfo for WMM capability. It may be 0 even when
+        * present. Allow the WMM IE to also indicate QoS support.
+        */
+       if (wmm || qosinfo)
+               params.flags |= WPA_STA_WMM;
+
+       params.ht_capabilities = ht_capab;
+       params.vht_capabilities = vht_capab;
+       params.qosinfo = qosinfo;
+       params.listen_interval = 0;
+       params.supp_rates = supp_rates;
+       params.supp_rates_len = supp_rates_len;
+       params.set = !add;
+       params.ext_capab = ext_capab;
+       params.ext_capab_len = ext_capab_len;
+       params.supp_channels = supp_channels;
+       params.supp_channels_len = supp_channels_len;
+       params.supp_oper_classes = supp_oper_classes;
+       params.supp_oper_classes_len = supp_oper_classes_len;
+
+       return wpa_drv_sta_add(wpa_s, &params);
+}
+
+
+static int wpa_supplicant_tdls_enable_channel_switch(
+       void *ctx, const u8 *addr, u8 oper_class,
+       const struct hostapd_freq_params *params)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       return wpa_drv_tdls_enable_channel_switch(wpa_s, addr, oper_class,
+                                                 params);
+}
+
+
+static int wpa_supplicant_tdls_disable_channel_switch(void *ctx, const u8 *addr)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       return wpa_drv_tdls_disable_channel_switch(wpa_s, addr);
+}
+
+#endif /* CONFIG_TDLS */
+
+#endif /* CONFIG_NO_WPA */
+
+
+enum wpa_ctrl_req_type wpa_supplicant_ctrl_req_from_string(const char *field)
+{
+       if (os_strcmp(field, "IDENTITY") == 0)
+               return WPA_CTRL_REQ_EAP_IDENTITY;
+       else if (os_strcmp(field, "PASSWORD") == 0)
+               return WPA_CTRL_REQ_EAP_PASSWORD;
+       else if (os_strcmp(field, "NEW_PASSWORD") == 0)
+               return WPA_CTRL_REQ_EAP_NEW_PASSWORD;
+       else if (os_strcmp(field, "PIN") == 0)
+               return WPA_CTRL_REQ_EAP_PIN;
+       else if (os_strcmp(field, "OTP") == 0)
+               return WPA_CTRL_REQ_EAP_OTP;
+       else if (os_strcmp(field, "PASSPHRASE") == 0)
+               return WPA_CTRL_REQ_EAP_PASSPHRASE;
+       else if (os_strcmp(field, "SIM") == 0)
+               return WPA_CTRL_REQ_SIM;
+       else if (os_strcmp(field, "PSK_PASSPHRASE") == 0)
+               return WPA_CTRL_REQ_PSK_PASSPHRASE;
+       return WPA_CTRL_REQ_UNKNOWN;
+}
+
+
+const char * wpa_supplicant_ctrl_req_to_string(enum wpa_ctrl_req_type field,
+                                              const char *default_txt,
+                                              const char **txt)
+{
+       const char *ret = NULL;
+
+       *txt = default_txt;
+
+       switch (field) {
+       case WPA_CTRL_REQ_EAP_IDENTITY:
+               *txt = "Identity";
+               ret = "IDENTITY";
+               break;
+       case WPA_CTRL_REQ_EAP_PASSWORD:
+               *txt = "Password";
+               ret = "PASSWORD";
+               break;
+       case WPA_CTRL_REQ_EAP_NEW_PASSWORD:
+               *txt = "New Password";
+               ret = "NEW_PASSWORD";
+               break;
+       case WPA_CTRL_REQ_EAP_PIN:
+               *txt = "PIN";
+               ret = "PIN";
+               break;
+       case WPA_CTRL_REQ_EAP_OTP:
+               ret = "OTP";
+               break;
+       case WPA_CTRL_REQ_EAP_PASSPHRASE:
+               *txt = "Private key passphrase";
+               ret = "PASSPHRASE";
+               break;
+       case WPA_CTRL_REQ_SIM:
+               ret = "SIM";
+               break;
+       case WPA_CTRL_REQ_PSK_PASSPHRASE:
+               *txt = "PSK or passphrase";
+               ret = "PSK_PASSPHRASE";
+               break;
+       default:
+               break;
+       }
+
+       /* txt needs to be something */
+       if (*txt == NULL) {
+               wpa_printf(MSG_WARNING, "No message for request %d", field);
+               ret = NULL;
+       }
+
+       return ret;
+}
+
+
+void wpas_send_ctrl_req(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
+                       const char *field_name, const char *txt)
+{
        char *buf;
        size_t buflen;
        int len;
 
-       if (ssid == NULL)
-               return;
-
        buflen = 100 + os_strlen(txt) + ssid->ssid_len;
        buf = os_malloc(buflen);
        if (buf == NULL)
                return;
-       len = os_snprintf(buf, buflen,
-                         WPA_CTRL_REQ "%s-%d:%s needed for SSID ",
-                         field, ssid->id, txt);
-       if (len < 0 || (size_t) len >= buflen) {
+       len = os_snprintf(buf, buflen, "%s-%d:%s needed for SSID ",
+                         field_name, ssid->id, txt);
+       if (os_snprintf_error(buflen, len)) {
                os_free(buf);
                return;
        }
@@ -549,14 +819,62 @@ static void wpa_supplicant_eap_param_needed(void *ctx, const char *field,
                buf[len] = '\0';
        }
        buf[buflen - 1] = '\0';
-       wpa_msg(wpa_s, MSG_INFO, "%s", buf);
+       wpa_msg(wpa_s, MSG_INFO, WPA_CTRL_REQ "%s", buf);
        os_free(buf);
 }
+
+
+#ifdef IEEE8021X_EAPOL
+#if defined(CONFIG_CTRL_IFACE) || !defined(CONFIG_NO_STDOUT_DEBUG)
+static void wpa_supplicant_eap_param_needed(void *ctx,
+                                           enum wpa_ctrl_req_type field,
+                                           const char *default_txt)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       struct wpa_ssid *ssid = wpa_s->current_ssid;
+       const char *field_name, *txt = NULL;
+
+       if (ssid == NULL)
+               return;
+
+       wpas_notify_network_request(wpa_s, ssid, field, default_txt);
+
+       field_name = wpa_supplicant_ctrl_req_to_string(field, default_txt,
+                                                      &txt);
+       if (field_name == NULL) {
+               wpa_printf(MSG_WARNING, "Unhandled EAP param %d needed",
+                          field);
+               return;
+       }
+
+       wpas_notify_eap_status(wpa_s, "eap parameter needed", field_name);
+
+       wpas_send_ctrl_req(wpa_s, ssid, field_name, txt);
+}
 #else /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */
 #define wpa_supplicant_eap_param_needed NULL
 #endif /* CONFIG_CTRL_IFACE || !CONFIG_NO_STDOUT_DEBUG */
 
 
+#ifdef CONFIG_EAP_PROXY
+static void wpa_supplicant_eap_proxy_cb(void *ctx)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       size_t len;
+
+       wpa_s->mnc_len = eapol_sm_get_eap_proxy_imsi(wpa_s->eapol,
+                                                    wpa_s->imsi, &len);
+       if (wpa_s->mnc_len > 0) {
+               wpa_s->imsi[len] = '\0';
+               wpa_printf(MSG_DEBUG, "eap_proxy: IMSI %s (MNC length %d)",
+                          wpa_s->imsi, wpa_s->mnc_len);
+       } else {
+               wpa_printf(MSG_DEBUG, "eap_proxy: IMSI not available");
+       }
+}
+#endif /* CONFIG_EAP_PROXY */
+
+
 static void wpa_supplicant_port_cb(void *ctx, int authorized)
 {
        struct wpa_supplicant *wpa_s = ctx;
@@ -572,6 +890,65 @@ static void wpa_supplicant_port_cb(void *ctx, int authorized)
                   authorized ? "Authorized" : "Unauthorized");
        wpa_drv_set_supp_port(wpa_s, authorized);
 }
+
+
+static void wpa_supplicant_cert_cb(void *ctx, int depth, const char *subject,
+                                  const char *altsubject[], int num_altsubject,
+                                  const char *cert_hash,
+                                  const struct wpabuf *cert)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       wpas_notify_certification(wpa_s, depth, subject, altsubject,
+                                 num_altsubject, cert_hash, cert);
+}
+
+
+static void wpa_supplicant_status_cb(void *ctx, const char *status,
+                                    const char *parameter)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       wpas_notify_eap_status(wpa_s, status, parameter);
+}
+
+
+static void wpa_supplicant_set_anon_id(void *ctx, const u8 *id, size_t len)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       char *str;
+       int res;
+
+       wpa_hexdump_ascii(MSG_DEBUG, "EAP method updated anonymous_identity",
+                         id, len);
+
+       if (wpa_s->current_ssid == NULL)
+               return;
+
+       if (id == NULL) {
+               if (wpa_config_set(wpa_s->current_ssid, "anonymous_identity",
+                                  "NULL", 0) < 0)
+                       return;
+       } else {
+               str = os_malloc(len * 2 + 1);
+               if (str == NULL)
+                       return;
+               wpa_snprintf_hex(str, len * 2 + 1, id, len);
+               res = wpa_config_set(wpa_s->current_ssid, "anonymous_identity",
+                                    str, 0);
+               os_free(str);
+               if (res < 0)
+                       return;
+       }
+
+       if (wpa_s->conf->update_config) {
+               res = wpa_config_write(wpa_s->confname, wpa_s->conf);
+               if (res) {
+                       wpa_printf(MSG_DEBUG, "Failed to update config after "
+                                  "anonymous_id update");
+               }
+       }
+}
 #endif /* IEEE8021X_EAPOL */
 
 
@@ -592,16 +969,26 @@ int wpa_supplicant_init_eapol(struct wpa_supplicant *wpa_s)
        ctx->eapol_done_cb = wpa_supplicant_notify_eapol_done;
        ctx->eapol_send = wpa_supplicant_eapol_send;
        ctx->set_wep_key = wpa_eapol_set_wep_key;
+#ifndef CONFIG_NO_CONFIG_BLOBS
        ctx->set_config_blob = wpa_supplicant_set_config_blob;
        ctx->get_config_blob = wpa_supplicant_get_config_blob;
+#endif /* CONFIG_NO_CONFIG_BLOBS */
        ctx->aborted_cached = wpa_supplicant_aborted_cached;
        ctx->opensc_engine_path = wpa_s->conf->opensc_engine_path;
        ctx->pkcs11_engine_path = wpa_s->conf->pkcs11_engine_path;
        ctx->pkcs11_module_path = wpa_s->conf->pkcs11_module_path;
+       ctx->openssl_ciphers = wpa_s->conf->openssl_ciphers;
        ctx->wps = wpa_s->wps;
        ctx->eap_param_needed = wpa_supplicant_eap_param_needed;
+#ifdef CONFIG_EAP_PROXY
+       ctx->eap_proxy_cb = wpa_supplicant_eap_proxy_cb;
+#endif /* CONFIG_EAP_PROXY */
        ctx->port_cb = wpa_supplicant_port_cb;
        ctx->cb = wpa_supplicant_eapol_cb;
+       ctx->cert_cb = wpa_supplicant_cert_cb;
+       ctx->cert_in_cb = wpa_s->conf->cert_in_cb;
+       ctx->status_cb = wpa_supplicant_status_cb;
+       ctx->set_anon_id = wpa_supplicant_set_anon_id;
        ctx->cb_ctx = wpa_s;
        wpa_s->eapol = eapol_sm_init(ctx);
        if (wpa_s->eapol == NULL) {
@@ -616,6 +1003,33 @@ int wpa_supplicant_init_eapol(struct wpa_supplicant *wpa_s)
 }
 
 
+#ifndef CONFIG_NO_WPA
+static void wpa_supplicant_set_rekey_offload(void *ctx,
+                                            const u8 *kek, size_t kek_len,
+                                            const u8 *kck, size_t kck_len,
+                                            const u8 *replay_ctr)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       wpa_drv_set_rekey_info(wpa_s, kek, kek_len, kck, kck_len, replay_ctr);
+}
+#endif /* CONFIG_NO_WPA */
+
+
+static int wpa_supplicant_key_mgmt_set_pmk(void *ctx, const u8 *pmk,
+                                          size_t pmk_len)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+
+       if (wpa_s->conf->key_mgmt_offload &&
+           (wpa_s->drv_flags & WPA_DRIVER_FLAGS_KEY_MGMT_OFFLOAD))
+               return wpa_drv_set_key(wpa_s, WPA_ALG_PMK, NULL, 0, 0,
+                                      NULL, 0, pmk, pmk_len);
+       else
+               return 0;
+}
+
+
 int wpa_supplicant_init_wpa(struct wpa_supplicant *wpa_s)
 {
 #ifndef CONFIG_NO_WPA
@@ -631,7 +1045,6 @@ int wpa_supplicant_init_wpa(struct wpa_supplicant *wpa_s)
        ctx->set_state = _wpa_supplicant_set_state;
        ctx->get_state = _wpa_supplicant_get_state;
        ctx->deauthenticate = _wpa_supplicant_deauthenticate;
-       ctx->disassociate = _wpa_supplicant_disassociate;
        ctx->set_key = wpa_supplicant_set_key;
        ctx->get_network_ctx = wpa_supplicant_get_network_ctx;
        ctx->get_bssid = wpa_supplicant_get_bssid;
@@ -651,11 +1064,24 @@ int wpa_supplicant_init_wpa(struct wpa_supplicant *wpa_s)
        ctx->send_ft_action = wpa_supplicant_send_ft_action;
        ctx->mark_authenticated = wpa_supplicant_mark_authenticated;
 #endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_TDLS
+       ctx->tdls_get_capa = wpa_supplicant_tdls_get_capa;
+       ctx->send_tdls_mgmt = wpa_supplicant_send_tdls_mgmt;
+       ctx->tdls_oper = wpa_supplicant_tdls_oper;
+       ctx->tdls_peer_addset = wpa_supplicant_tdls_peer_addset;
+       ctx->tdls_enable_channel_switch =
+               wpa_supplicant_tdls_enable_channel_switch;
+       ctx->tdls_disable_channel_switch =
+               wpa_supplicant_tdls_disable_channel_switch;
+#endif /* CONFIG_TDLS */
+       ctx->set_rekey_offload = wpa_supplicant_set_rekey_offload;
+       ctx->key_mgmt_set_pmk = wpa_supplicant_key_mgmt_set_pmk;
 
        wpa_s->wpa = wpa_sm_init(ctx);
        if (wpa_s->wpa == NULL) {
                wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
                           "machine");
+               os_free(ctx);
                return -1;
        }
 #endif /* CONFIG_NO_WPA */
@@ -674,12 +1100,30 @@ void wpa_supplicant_rsn_supp_set_config(struct wpa_supplicant *wpa_s,
                conf.peerkey_enabled = ssid->peerkey;
                conf.allowed_pairwise_cipher = ssid->pairwise_cipher;
 #ifdef IEEE8021X_EAPOL
+               conf.proactive_key_caching = ssid->proactive_key_caching < 0 ?
+                       wpa_s->conf->okc : ssid->proactive_key_caching;
                conf.eap_workaround = ssid->eap_workaround;
                conf.eap_conf_ctx = &ssid->eap;
 #endif /* IEEE8021X_EAPOL */
                conf.ssid = ssid->ssid;
                conf.ssid_len = ssid->ssid_len;
                conf.wpa_ptk_rekey = ssid->wpa_ptk_rekey;
+#ifdef CONFIG_P2P
+               if (ssid->p2p_group && wpa_s->current_bss &&
+                   !wpa_s->p2p_disable_ip_addr_req) {
+                       struct wpabuf *p2p;
+                       p2p = wpa_bss_get_vendor_ie_multi(wpa_s->current_bss,
+                                                         P2P_IE_VENDOR_TYPE);
+                       if (p2p) {
+                               u8 group_capab;
+                               group_capab = p2p_get_group_capab(p2p);
+                               if (group_capab &
+                                   P2P_GROUP_CAPAB_IP_ADDR_ALLOCATION)
+                                       conf.p2p = 1;
+                               wpabuf_free(p2p);
+                       }
+               }
+#endif /* CONFIG_P2P */
        }
        wpa_sm_set_config(wpa_s->wpa, ssid ? &conf : NULL);
 }