Merge commit 'garage/master'
[wpasupplicant] / wpa_supplicant / events.c
index a3859c4..159b024 100644 (file)
 #include "eapol_supp/eapol_supp_sm.h"
 #include "wpa.h"
 #include "eloop.h"
-#include "drivers/driver.h"
 #include "config.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_supplicant_i.h"
+#include "driver_i.h"
 #include "pcsc_funcs.h"
 #include "preauth.h"
 #include "pmksa_cache.h"
@@ -31,6 +31,9 @@
 #include "ieee802_11_defs.h"
 #include "blacklist.h"
 #include "wpas_glue.h"
+#include "wps_supplicant.h"
+#include "ibss_rsn.h"
+#include "sme.h"
 
 
 static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
@@ -58,8 +61,9 @@ static int wpa_supplicant_select_config(struct wpa_supplicant *wpa_s)
                   "AP");
        if (ssid->key_mgmt & (WPA_KEY_MGMT_PSK | WPA_KEY_MGMT_IEEE8021X |
                              WPA_KEY_MGMT_WPA_NONE |
-                             WPA_KEY_MGMT_FT_PSK | WPA_KEY_MGMT_FT_IEEE8021X))
-       {
+                             WPA_KEY_MGMT_FT_PSK | WPA_KEY_MGMT_FT_IEEE8021X |
+                             WPA_KEY_MGMT_PSK_SHA256 |
+                             WPA_KEY_MGMT_IEEE8021X_SHA256)) {
                u8 wpa_ie[80];
                size_t wpa_ie_len = sizeof(wpa_ie);
                wpa_supplicant_set_suites(wpa_s, NULL, ssid,
@@ -99,8 +103,7 @@ void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s)
        os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
        eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
        eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
-       if (wpa_s->key_mgmt == WPA_KEY_MGMT_PSK ||
-           wpa_s->key_mgmt == WPA_KEY_MGMT_FT_PSK)
+       if (wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt))
                eapol_sm_notify_eap_success(wpa_s->eapol, FALSE);
        wpa_s->ap_ies_from_associnfo = 0;
 }
@@ -250,6 +253,11 @@ static int wpa_supplicant_match_privacy(struct wpa_scan_res *bss,
        if (ssid->mixed_cell)
                return 1;
 
+#ifdef CONFIG_WPS
+       if (ssid->key_mgmt & WPA_KEY_MGMT_WPS)
+               return 1;
+#endif /* CONFIG_WPS */
+
        for (i = 0; i < NUM_WEP_KEYS; i++) {
                if (ssid->wep_key_len[i]) {
                        privacy = 1;
@@ -269,12 +277,18 @@ static int wpa_supplicant_match_privacy(struct wpa_scan_res *bss,
 }
 
 
-static int wpa_supplicant_ssid_bss_match(struct wpa_ssid *ssid,
+static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
+                                        struct wpa_ssid *ssid,
                                         struct wpa_scan_res *bss)
 {
        struct wpa_ie_data ie;
        int proto_match = 0;
        const u8 *rsn_ie, *wpa_ie;
+       int ret;
+
+       ret = wpas_wps_ssid_bss_match(wpa_s, ssid, bss);
+       if (ret >= 0)
+               return ret;
 
        rsn_ie = wpa_scan_get_ie(bss, WLAN_EID_RSN);
        while ((ssid->proto & WPA_PROTO_RSN) && rsn_ie) {
@@ -365,23 +379,18 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_ssid *ssid,
 
 
 static struct wpa_scan_res *
-wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
-                         struct wpa_ssid **selected_ssid)
+wpa_supplicant_select_bss_wpa(struct wpa_supplicant *wpa_s,
+                             struct wpa_ssid *group,
+                             struct wpa_ssid **selected_ssid)
 {
        struct wpa_ssid *ssid;
-       struct wpa_scan_res *bss, *selected = NULL;
+       struct wpa_scan_res *bss;
        size_t i;
        struct wpa_blacklist *e;
        const u8 *ie;
 
-       wpa_printf(MSG_DEBUG, "Selecting BSS from priority group %d",
-                  group->priority);
-
-       bss = NULL;
-       ssid = NULL;
-       /* First, try to find WPA-enabled AP */
        wpa_printf(MSG_DEBUG, "Try to find WPA-enabled AP");
-       for (i = 0; i < wpa_s->scan_res->num && !selected; i++) {
+       for (i = 0; i < wpa_s->scan_res->num; i++) {
                const u8 *ssid_;
                u8 wpa_ie_len, rsn_ie_len, ssid_len;
                bss = wpa_s->scan_res->res[i];
@@ -401,6 +410,7 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                           (int) i, MAC2STR(bss->bssid),
                           wpa_ssid_txt(ssid_, ssid_len),
                           wpa_ie_len, rsn_ie_len, bss->caps);
+
                e = wpa_blacklist_get(wpa_s, bss->bssid);
                if (e && e->count > 1) {
                        wpa_printf(MSG_DEBUG, "   skip - blacklisted");
@@ -413,16 +423,27 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                }
 
                for (ssid = group; ssid; ssid = ssid->pnext) {
+                       int check_ssid = 1;
+
                        if (ssid->disabled) {
                                wpa_printf(MSG_DEBUG, "   skip - disabled");
                                continue;
                        }
-                       if (ssid_len != ssid->ssid_len ||
-                           os_memcmp(ssid_, ssid->ssid, ssid_len) != 0) {
+
+#ifdef CONFIG_WPS
+                       if (ssid->ssid_len == 0 &&
+                           wpas_wps_ssid_wildcard_ok(wpa_s, ssid, bss))
+                               check_ssid = 0;
+#endif /* CONFIG_WPS */
+
+                       if (check_ssid &&
+                           (ssid_len != ssid->ssid_len ||
+                            os_memcmp(ssid_, ssid->ssid, ssid_len) != 0)) {
                                wpa_printf(MSG_DEBUG, "   skip - "
                                           "SSID mismatch");
                                continue;
                        }
+
                        if (ssid->bssid_set &&
                            os_memcmp(bss->bssid, ssid->bssid, ETH_ALEN) != 0)
                        {
@@ -430,22 +451,36 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                                           "BSSID mismatch");
                                continue;
                        }
-                       if (wpa_supplicant_ssid_bss_match(ssid, bss)) {
-                               selected = bss;
-                               *selected_ssid = ssid;
-                               wpa_printf(MSG_DEBUG, "   selected WPA AP "
-                                          MACSTR " ssid='%s'",
-                                          MAC2STR(bss->bssid),
-                                          wpa_ssid_txt(ssid_, ssid_len));
-                               break;
-                       }
+
+                       if (!wpa_supplicant_ssid_bss_match(wpa_s, ssid, bss))
+                               continue;
+
+                       wpa_printf(MSG_DEBUG, "   selected WPA AP "
+                                  MACSTR " ssid='%s'",
+                                  MAC2STR(bss->bssid),
+                                  wpa_ssid_txt(ssid_, ssid_len));
+                       *selected_ssid = ssid;
+                       return bss;
                }
        }
 
-       /* If no WPA-enabled AP found, try to find non-WPA AP, if configuration
-        * allows this. */
+       return NULL;
+}
+
+
+static struct wpa_scan_res *
+wpa_supplicant_select_bss_non_wpa(struct wpa_supplicant *wpa_s,
+                                 struct wpa_ssid *group,
+                                 struct wpa_ssid **selected_ssid)
+{
+       struct wpa_ssid *ssid;
+       struct wpa_scan_res *bss;
+       size_t i;
+       struct wpa_blacklist *e;
+       const u8 *ie;
+
        wpa_printf(MSG_DEBUG, "Try to find non-WPA AP");
-       for (i = 0; i < wpa_s->scan_res->num && !selected; i++) {
+       for (i = 0; i < wpa_s->scan_res->num; i++) {
                const u8 *ssid_;
                u8 wpa_ie_len, rsn_ie_len, ssid_len;
                bss = wpa_s->scan_res->res[i];
@@ -465,17 +500,35 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                           (int) i, MAC2STR(bss->bssid),
                           wpa_ssid_txt(ssid_, ssid_len),
                           wpa_ie_len, rsn_ie_len, bss->caps);
+
                e = wpa_blacklist_get(wpa_s, bss->bssid);
                if (e && e->count > 1) {
                        wpa_printf(MSG_DEBUG, "   skip - blacklisted");
                        continue;
                }
+
                for (ssid = group; ssid; ssid = ssid->pnext) {
+                       int check_ssid = ssid->ssid_len != 0;
+
                        if (ssid->disabled) {
                                wpa_printf(MSG_DEBUG, "   skip - disabled");
                                continue;
                        }
-                       if (ssid->ssid_len != 0 &&
+
+#ifdef CONFIG_WPS
+                       if (ssid->key_mgmt & WPA_KEY_MGMT_WPS) {
+                               /* Only allow wildcard SSID match if an AP
+                                * advertises active WPS operation that matches
+                                * with our mode. */
+                               check_ssid = 1;
+                               if (ssid->ssid_len == 0 &&
+                                   wpas_wps_ssid_wildcard_ok(wpa_s, ssid,
+                                                             bss))
+                                       check_ssid = 0;
+                       }
+#endif /* CONFIG_WPS */
+
+                       if (check_ssid &&
                            (ssid_len != ssid->ssid_len ||
                             os_memcmp(ssid_, ssid->ssid, ssid_len) != 0)) {
                                wpa_printf(MSG_DEBUG, "   skip - "
@@ -492,6 +545,7 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                        }
                        
                        if (!(ssid->key_mgmt & WPA_KEY_MGMT_NONE) &&
+                           !(ssid->key_mgmt & WPA_KEY_MGMT_WPS) &&
                            !(ssid->key_mgmt & WPA_KEY_MGMT_IEEE8021X_NO_WPA))
                        {
                                wpa_printf(MSG_DEBUG, "   skip - "
@@ -500,7 +554,10 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                        }
 
                        if ((ssid->key_mgmt & 
-                            (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK)) &&
+                            (WPA_KEY_MGMT_IEEE8021X | WPA_KEY_MGMT_PSK |
+                             WPA_KEY_MGMT_FT_IEEE8021X | WPA_KEY_MGMT_FT_PSK |
+                             WPA_KEY_MGMT_IEEE8021X_SHA256 |
+                             WPA_KEY_MGMT_PSK_SHA256)) &&
                            (wpa_ie_len != 0 || rsn_ie_len != 0)) {
                                wpa_printf(MSG_DEBUG, "   skip - "
                                           "WPA network");
@@ -519,17 +576,36 @@ wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
                                continue;
                        }
 
-                       selected = bss;
-                       *selected_ssid = ssid;
                        wpa_printf(MSG_DEBUG, "   selected non-WPA AP "
                                   MACSTR " ssid='%s'",
                                   MAC2STR(bss->bssid),
                                   wpa_ssid_txt(ssid_, ssid_len));
-                       break;
+                       *selected_ssid = ssid;
+                       return bss;
                }
        }
 
-       return selected;
+       return NULL;
+}
+
+
+static struct wpa_scan_res *
+wpa_supplicant_select_bss(struct wpa_supplicant *wpa_s, struct wpa_ssid *group,
+                         struct wpa_ssid **selected_ssid)
+{
+       struct wpa_scan_res *selected;
+
+       wpa_printf(MSG_DEBUG, "Selecting BSS from priority group %d",
+                  group->priority);
+
+       /* First, try to find WPA-enabled AP */
+       selected = wpa_supplicant_select_bss_wpa(wpa_s, group, selected_ssid);
+       if (selected)
+               return selected;
+
+       /* If no WPA-enabled AP found, try to find non-WPA AP, if configuration
+        * allows this. */
+       return wpa_supplicant_select_bss_non_wpa(wpa_s, group, selected_ssid);
 }
 
 
@@ -539,6 +615,8 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
        struct wpa_scan_res *selected = NULL;
        struct wpa_ssid *ssid = NULL;
 
+       wpa_supplicant_notify_scanning(wpa_s, 0);
+
        if (wpa_supplicant_get_scan_results(wpa_s) < 0) {
                if (wpa_s->conf->ap_scan == 2)
                        return;
@@ -548,11 +626,22 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
                goto req_scan;
        }
 
-       wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
-
-       wpa_supplicant_dbus_notify_scan_results(wpa_s);
+       /*
+        * Don't post the results if this was the initial cached
+        * and there were no results.
+        */
+       if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1 &&
+           wpa_s->scan_res->num == 0) {
+               wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
+                       "empty - not posting");
+       } else {
+               wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+               wpa_supplicant_dbus_notify_scan_results(wpa_s);
+               wpas_wps_notify_scan_results(wpa_s);
+       }
 
-       if (wpa_s->conf->ap_scan == 2 || wpa_s->disconnected)
+       if ((wpa_s->conf->ap_scan == 2 && !wpas_wps_searching(wpa_s)) ||
+           wpa_s->disconnected)
                return;
 
        while (selected == NULL) {
@@ -567,12 +656,20 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s)
                        wpa_printf(MSG_DEBUG, "No APs found - clear blacklist "
                                   "and try again");
                        wpa_blacklist_clear(wpa_s);
+                       wpa_s->blacklist_cleared++;
                } else if (selected == NULL) {
                        break;
                }
        }
 
        if (selected) {
+               if (wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) {
+                       wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
+                               "PBC session overlap");
+                       timeout = 10;
+                       goto req_scan;
+               }
+
                /* Do not trigger new association unless the BSSID has changed
                 * or if reassociation is requested. If we are in process of
                 * associating with the selected BSSID, do not trigger new
@@ -614,11 +711,58 @@ req_scan:
 #endif /* CONFIG_NO_SCAN_PROCESSING */
 
 
+#ifdef CONFIG_IEEE80211R
+static void wpa_assoc_set_ft_params(struct wpa_supplicant *wpa_s,
+                                   const u8 *ftie, const u8 *mdie)
+{
+       const u8 *mobility_domain = NULL;
+       const u8 *r0kh_id = NULL;
+       size_t r0kh_id_len = 0;
+       const u8 *r1kh_id = NULL;
+       struct rsn_ftie *hdr;
+       const u8 *pos, *end;
+
+       if (mdie == NULL || ftie == NULL)
+               return;
+
+       if (mdie[1] >= MOBILITY_DOMAIN_ID_LEN) {
+               mobility_domain = mdie + 2;
+#ifdef CONFIG_SME
+               wpa_s->sme.ft_used = 1;
+               os_memcpy(wpa_s->sme.mobility_domain, mobility_domain, 2);
+#endif /* CONFIG_SME */
+       }
+       if (ftie[1] >= sizeof(struct rsn_ftie)) {
+               end = ftie + 2 + ftie[1];
+               hdr = (struct rsn_ftie *) (ftie + 2);
+               pos = (const u8 *) (hdr + 1);
+               while (pos + 1 < end) {
+                       if (pos + 2 + pos[1] > end)
+                               break;
+                       if (pos[0] == FTIE_SUBELEM_R1KH_ID &&
+                           pos[1] == FT_R1KH_ID_LEN)
+                               r1kh_id = pos + 2;
+                       else if (pos[0] == FTIE_SUBELEM_R0KH_ID &&
+                                pos[1] >= 1 && pos[1] <= FT_R0KH_ID_MAX_LEN) {
+                               r0kh_id = pos + 2;
+                               r0kh_id_len = pos[1];
+                       }
+                       pos += 2 + pos[1];
+               }
+       }
+       wpa_sm_set_ft_params(wpa_s->wpa, mobility_domain, r0kh_id,
+                            r0kh_id_len, r1kh_id);
+}
+#endif /* CONFIG_IEEE80211R */
+
 static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
                                           union wpa_event_data *data)
 {
        int l, len, found = 0, wpa_found, rsn_found;
-       u8 *p;
+       const u8 *p;
+#ifdef CONFIG_IEEE80211R
+       const u8 *mdie = NULL, *ftie = NULL;
+#endif /* CONFIG_IEEE80211R */
 
        wpa_printf(MSG_DEBUG, "Association info event");
        if (data->assoc_info.req_ies)
@@ -658,6 +802,29 @@ static void wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
        if (!found && data->assoc_info.req_ies)
                wpa_sm_set_assoc_wpa_ie(wpa_s->wpa, NULL, 0);
 
+#ifdef CONFIG_IEEE80211R
+       p = data->assoc_info.resp_ies;
+       l = data->assoc_info.resp_ies_len;
+
+       /* Go through the IEs and make a copy of the WPA/RSN IE, if present. */
+       while (p && l >= 2) {
+               len = p[1] + 2;
+               if (len > l) {
+                       wpa_hexdump(MSG_DEBUG, "Truncated IE in assoc_info",
+                                   p, l);
+                       break;
+               }
+               if (p[0] == WLAN_EID_FAST_BSS_TRANSITION)
+                       ftie = p;
+               else if (p[0] == WLAN_EID_MOBILITY_DOMAIN)
+                       mdie = p;
+               l -= len;
+               p += len;
+       }
+
+       wpa_assoc_set_ft_params(wpa_s, ftie, mdie);
+#endif /* CONFIG_IEEE80211R */
+
        /* WPA/RSN IE from Beacon/ProbeResp */
        p = data->assoc_info.beacon_ies;
        l = data->assoc_info.beacon_ies_len;
@@ -708,9 +875,9 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                wpa_supplicant_event_associnfo(wpa_s, data);
 
        wpa_supplicant_set_state(wpa_s, WPA_ASSOCIATED);
-       if (wpa_s->use_client_mlme)
+       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
                os_memcpy(bssid, wpa_s->bssid, ETH_ALEN);
-       if (wpa_s->use_client_mlme ||
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME) ||
            (wpa_drv_get_bssid(wpa_s, bssid) >= 0 &&
             os_memcmp(bssid, wpa_s->bssid, ETH_ALEN) != 0)) {
                wpa_msg(wpa_s, MSG_DEBUG, "Associated to a new BSS: BSSID="
@@ -750,8 +917,7 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
                eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
                eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
        }
-       if (wpa_s->key_mgmt == WPA_KEY_MGMT_PSK ||
-           wpa_s->key_mgmt == WPA_KEY_MGMT_FT_PSK || ft_completed)
+       if (wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt) || ft_completed)
                eapol_sm_notify_eap_success(wpa_s->eapol, FALSE);
        /* 802.1X::portControl = Auto */
        eapol_sm_notify_portEnabled(wpa_s->eapol, TRUE);
@@ -766,9 +932,8 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
        }
        wpa_supplicant_cancel_scan(wpa_s);
 
-       if (wpa_s->driver_4way_handshake &&
-           (wpa_s->key_mgmt == WPA_KEY_MGMT_PSK ||
-            wpa_s->key_mgmt == WPA_KEY_MGMT_FT_PSK)) {
+       if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) &&
+           wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
                /*
                 * We are done; the driver will take care of RSN 4-way
                 * handshake.
@@ -797,8 +962,7 @@ static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s)
        }
 
        if (wpa_s->wpa_state == WPA_4WAY_HANDSHAKE &&
-           (wpa_s->key_mgmt == WPA_KEY_MGMT_PSK ||
-            wpa_s->key_mgmt == WPA_KEY_MGMT_FT_PSK)) {
+           wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
                wpa_msg(wpa_s, MSG_INFO, "WPA: 4-Way Handshake failed - "
                        "pre-shared key may be incorrect");
        }
@@ -819,6 +983,22 @@ static void wpa_supplicant_event_disassoc(struct wpa_supplicant *wpa_s)
 }
 
 
+#ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+static void wpa_supplicant_delayed_mic_error_report(void *eloop_ctx,
+                                                   void *sock_ctx)
+{
+       struct wpa_supplicant *wpa_s = eloop_ctx;
+
+       if (!wpa_s->pending_mic_error_report)
+               return;
+
+       wpa_printf(MSG_DEBUG, "WPA: Sending pending MIC error report");
+       wpa_sm_key_request(wpa_s->wpa, 1, wpa_s->pending_mic_error_pairwise);
+       wpa_s->pending_mic_error_report = 0;
+}
+#endif /* CONFIG_DELAYED_MIC_ERROR_REPORT */
+
+
 static void
 wpa_supplicant_event_michael_mic_failure(struct wpa_supplicant *wpa_s,
                                         union wpa_event_data *data)
@@ -828,10 +1008,25 @@ wpa_supplicant_event_michael_mic_failure(struct wpa_supplicant *wpa_s,
 
        wpa_msg(wpa_s, MSG_WARNING, "Michael MIC failure detected");
        pairwise = (data && data->michael_mic_failure.unicast);
-       wpa_sm_key_request(wpa_s->wpa, 1, pairwise);
        os_get_time(&t);
-       if (wpa_s->last_michael_mic_error &&
-           t.sec - wpa_s->last_michael_mic_error <= 60) {
+       if ((wpa_s->last_michael_mic_error &&
+            t.sec - wpa_s->last_michael_mic_error <= 60) ||
+           wpa_s->pending_mic_error_report) {
+               if (wpa_s->pending_mic_error_report) {
+                       /*
+                        * Send the pending MIC error report immediately since
+                        * we are going to start countermeasures and AP better
+                        * do the same.
+                        */
+                       wpa_sm_key_request(wpa_s->wpa, 1,
+                                          wpa_s->pending_mic_error_pairwise);
+               }
+
+               /* Send the new MIC error report immediately since we are going
+                * to start countermeasures and AP better do the same.
+                */
+               wpa_sm_key_request(wpa_s->wpa, 1, pairwise);
+
                /* initialize countermeasures */
                wpa_s->countermeasures = 1;
                wpa_msg(wpa_s, MSG_WARNING, "TKIP countermeasures started");
@@ -852,11 +1047,62 @@ wpa_supplicant_event_michael_mic_failure(struct wpa_supplicant *wpa_s,
                                       wpa_s, NULL);
                /* TODO: mark the AP rejected for 60 second. STA is
                 * allowed to associate with another AP.. */
+       } else {
+#ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+               if (wpa_s->mic_errors_seen) {
+                       /*
+                        * Reduce the effectiveness of Michael MIC error
+                        * reports as a means for attacking against TKIP if
+                        * more than one MIC failure is noticed with the same
+                        * PTK. We delay the transmission of the reports by a
+                        * random time between 0 and 60 seconds in order to
+                        * force the attacker wait 60 seconds before getting
+                        * the information on whether a frame resulted in a MIC
+                        * failure.
+                        */
+                       u8 rval[4];
+                       int sec;
+
+                       if (os_get_random(rval, sizeof(rval)) < 0)
+                               sec = os_random() % 60;
+                       else
+                               sec = WPA_GET_BE32(rval) % 60;
+                       wpa_printf(MSG_DEBUG, "WPA: Delay MIC error report %d "
+                                  "seconds", sec);
+                       wpa_s->pending_mic_error_report = 1;
+                       wpa_s->pending_mic_error_pairwise = pairwise;
+                       eloop_cancel_timeout(
+                               wpa_supplicant_delayed_mic_error_report,
+                               wpa_s, NULL);
+                       eloop_register_timeout(
+                               sec, os_random() % 1000000,
+                               wpa_supplicant_delayed_mic_error_report,
+                               wpa_s, NULL);
+               } else {
+                       wpa_sm_key_request(wpa_s->wpa, 1, pairwise);
+               }
+#else /* CONFIG_DELAYED_MIC_ERROR_REPORT */
+               wpa_sm_key_request(wpa_s->wpa, 1, pairwise);
+#endif /* CONFIG_DELAYED_MIC_ERROR_REPORT */
        }
        wpa_s->last_michael_mic_error = t.sec;
+       wpa_s->mic_errors_seen++;
 }
 
 
+#ifdef CONFIG_TERMINATE_ONLASTIF
+static int any_interfaces(struct wpa_supplicant *head)
+{
+       struct wpa_supplicant *wpa_s;
+
+       for (wpa_s = head; wpa_s != NULL; wpa_s = wpa_s->next)
+               if (!wpa_s->interface_removed)
+                       return 1;
+       return 0;
+}
+#endif /* CONFIG_TERMINATE_ONLASTIF */
+
+
 static void
 wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s,
                                      union wpa_event_data *data)
@@ -881,6 +1127,11 @@ wpa_supplicant_event_interface_status(struct wpa_supplicant *wpa_s,
                wpa_supplicant_mark_disassoc(wpa_s);
                l2_packet_deinit(wpa_s->l2);
                wpa_s->l2 = NULL;
+#ifdef CONFIG_TERMINATE_ONLASTIF
+               /* check if last interface */
+               if (!any_interfaces(wpa_s->global->ifaces))
+                       eloop_terminate();
+#endif /* CONFIG_TERMINATE_ONLASTIF */
                break;
        }
 }
@@ -909,22 +1160,39 @@ wpa_supplicant_event_ft_response(struct wpa_supplicant *wpa_s,
        if (wpa_ft_process_response(wpa_s->wpa, data->ft_ies.ies,
                                    data->ft_ies.ies_len,
                                    data->ft_ies.ft_action,
-                                   data->ft_ies.target_ap) < 0) {
+                                   data->ft_ies.target_ap,
+                                   data->ft_ies.ric_ies,
+                                   data->ft_ies.ric_ies_len) < 0) {
                /* TODO: prevent MLME/driver from trying to associate? */
        }
 }
 #endif /* CONFIG_IEEE80211R */
 
 
+#ifdef CONFIG_IBSS_RSN
+static void wpa_supplicant_event_ibss_rsn_start(struct wpa_supplicant *wpa_s,
+                                               union wpa_event_data *data)
+{
+       if (data == NULL)
+               return;
+       ibss_rsn_start(wpa_s->ibss_rsn, data->ibss_rsn_start.peer);
+}
+#endif /* CONFIG_IBSS_RSN */
+
+
 void wpa_supplicant_event(void *ctx, wpa_event_type event,
                          union wpa_event_data *data)
 {
        struct wpa_supplicant *wpa_s = ctx;
 
        switch (event) {
+       case EVENT_AUTH:
+               sme_event_auth(wpa_s, data);
+               break;
        case EVENT_ASSOC:
                wpa_supplicant_event_assoc(wpa_s, data);
                break;
+       case EVENT_DEAUTH:
        case EVENT_DISASSOC:
                wpa_supplicant_event_disassoc(wpa_s);
                break;
@@ -955,6 +1223,20 @@ void wpa_supplicant_event(void *ctx, wpa_event_type event,
                wpa_supplicant_event_ft_response(wpa_s, data);
                break;
 #endif /* CONFIG_IEEE80211R */
+#ifdef CONFIG_IBSS_RSN
+       case EVENT_IBSS_RSN_START:
+               wpa_supplicant_event_ibss_rsn_start(wpa_s, data);
+               break;
+#endif /* CONFIG_IBSS_RSN */
+       case EVENT_ASSOC_REJECT:
+               sme_event_assoc_reject(wpa_s, data);
+               break;
+       case EVENT_AUTH_TIMED_OUT:
+               sme_event_auth_timed_out(wpa_s, data);
+               break;
+       case EVENT_ASSOC_TIMED_OUT:
+               sme_event_assoc_timed_out(wpa_s, data);
+               break;
        default:
                wpa_printf(MSG_INFO, "Unknown event %d", event);
                break;