TDLS: Update peer STA as soon as full peer info is available
[mech_eap.git] / src / rsn_supp / tdls.c
index bf4e270..c1d0c62 100644 (file)
@@ -2,14 +2,8 @@
  * wpa_supplicant - TDLS
  * Copyright (c) 2010-2011, Atheros Communications
  *
- * 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 "utils/includes.h"
@@ -23,7 +17,7 @@
 #include "crypto/aes_wrap.h"
 #include "rsn_supp/wpa.h"
 #include "rsn_supp/wpa_ie.h"
-#include "rsn_supp/wpa_i.h"     /* for set key */
+#include "rsn_supp/wpa_i.h"
 #include "drivers/driver.h"
 #include "l2_packet/l2_packet.h"
 
 #define TDLS_TESTING_SHORT_LIFETIME BIT(3)
 #define TDLS_TESTING_WRONG_LIFETIME_RESP BIT(4)
 #define TDLS_TESTING_WRONG_LIFETIME_CONF BIT(5)
+#define TDLS_TESTING_LONG_LIFETIME BIT(6)
+#define TDLS_TESTING_CONCURRENT_INIT BIT(7)
+#define TDLS_TESTING_NO_TPK_EXPIRATION BIT(8)
+#define TDLS_TESTING_DECLINE_RESP BIT(9)
+#define TDLS_TESTING_IGNORE_AP_PROHIBIT BIT(10)
+#define TDLS_TESTING_WRONG_MIC BIT(11)
 unsigned int tdls_testing = 0;
 #endif /* CONFIG_TDLS_TESTING */
 
 #define TPK_LIFETIME 43200 /* 12 hours */
-#define SMK_RETRY_COUNT        3
-#define SMK_TIMEOUT         5000 /* in milliseconds */
+#define TPK_M1_RETRY_COUNT 3
+#define TPK_M1_TIMEOUT 5000 /* in milliseconds */
+#define TPK_M2_RETRY_COUNT 10
+#define TPK_M2_TIMEOUT 500 /* in milliseconds */
 
 #define TDLS_MIC_LEN           16
 
@@ -50,8 +52,8 @@ struct wpa_tdls_ftie {
        u8 ie_len;
        u8 mic_ctrl[2];
        u8 mic[TDLS_MIC_LEN];
-       u8 Anonce[WPA_NONCE_LEN]; /* Peer Nonce */
-       u8 Snonce[WPA_NONCE_LEN]; /* Initiator Nonce */
+       u8 Anonce[WPA_NONCE_LEN]; /* Responder Nonce in TDLS */
+       u8 Snonce[WPA_NONCE_LEN]; /* Initiator Nonce in TDLS */
        /* followed by optional elements */
 } STRUCT_PACKED;
 
@@ -78,26 +80,30 @@ struct wpa_tdls_frame {
 } STRUCT_PACKED;
 
 static u8 * wpa_add_tdls_timeoutie(u8 *pos, u8 *ie, size_t ie_len, u32 tsecs);
-static void wpa_tdls_smkretry_timeout(void *eloop_ctx, void *timeout_ctx);
+static void wpa_tdls_tpk_retry_timeout(void *eloop_ctx, void *timeout_ctx);
 static void wpa_tdls_peer_free(struct wpa_sm *sm, struct wpa_tdls_peer *peer);
+static void wpa_tdls_disable_peer_link(struct wpa_sm *sm,
+                                      struct wpa_tdls_peer *peer);
+static int wpa_tdls_send_teardown(struct wpa_sm *sm, const u8 *addr,
+                                 u16 reason_code);
 
 
 #define TDLS_MAX_IE_LEN 80
+#define IEEE80211_MAX_SUPP_RATES 32
+
 struct wpa_tdls_peer {
        struct wpa_tdls_peer *next;
-       int initiator; /* whether this end was initator for SMK handshake */
+       unsigned int reconfig_key:1;
+       int initiator; /* whether this end was initiator for TDLS setup */
        u8 addr[ETH_ALEN]; /* other end MAC address */
        u8 inonce[WPA_NONCE_LEN]; /* Initiator Nonce */
-       u8 pnonce[WPA_NONCE_LEN]; /* Peer Nonce */
+       u8 rnonce[WPA_NONCE_LEN]; /* Responder Nonce */
        u8 rsnie_i[TDLS_MAX_IE_LEN]; /* Initiator RSN IE */
        size_t rsnie_i_len;
        u8 rsnie_p[TDLS_MAX_IE_LEN]; /* Peer RSN IE */
        size_t rsnie_p_len;
        u32 lifetime;
        int cipher; /* Selected cipher (WPA_CIPHER_*) */
-
-#define TDLS_LNKID_LEN   20 /* T+L+V(18-octet) */
-       u8 lnkid[TDLS_LNKID_LEN];
        u8 dtoken;
 
        struct tpk {
@@ -106,18 +112,42 @@ struct wpa_tdls_peer {
        } tpk;
        int tpk_set;
        int tpk_success;
+       int tpk_in_progress;
 
-       struct smk_timer {
+       struct tpk_timer {
                u8 dest[ETH_ALEN];
-               int count;      /* Retry Count: dot11RSNAConfigSMKUpdateCount
-                                */
-               int timer;      /* Timeout: 2000 milliseconds */
+               int count;      /* Retry Count */
+               int timer;      /* Timeout in milliseconds */
                u8 action_code; /* TDLS frame type */
                u8 dialog_token;
                u16 status_code;
-               int buf_len;    /* length of SMK message for retransmission */
-               u8 *buf;        /* buffer for SMK message */
+               u32 peer_capab;
+               int buf_len;    /* length of TPK message for retransmission */
+               u8 *buf;        /* buffer for TPK message */
        } sm_tmr;
+
+       u16 capability;
+
+       u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
+       size_t supp_rates_len;
+
+       struct ieee80211_ht_capabilities *ht_capabilities;
+       struct ieee80211_vht_capabilities *vht_capabilities;
+
+       u8 qos_info;
+
+       u16 aid;
+
+       u8 *ext_capab;
+       size_t ext_capab_len;
+
+       u8 *supp_channels;
+       size_t supp_channels_len;
+
+       u8 *supp_oper_classes;
+       size_t supp_oper_classes_len;
+
+       u8 wmm_capable;
 };
 
 
@@ -143,7 +173,7 @@ static int wpa_tdls_del_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
 {
        if (wpa_sm_set_key(sm, WPA_ALG_NONE, peer->addr,
                           0, 0, NULL, 0, NULL, 0) < 0) {
-               wpa_printf(MSG_WARNING, "TDLS: Failed to delete PTK-TK from "
+               wpa_printf(MSG_WARNING, "TDLS: Failed to delete TPK-TK from "
                           "the driver");
                return -1;
        }
@@ -166,18 +196,18 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
                key_len = 16;
                break;
        case WPA_CIPHER_NONE:
-               wpa_printf(MSG_DEBUG, "WPA: Pairwise Cipher Suite: "
+               wpa_printf(MSG_DEBUG, "TDLS: Pairwise Cipher Suite: "
                           "NONE - do not use pairwise keys");
                return -1;
        default:
-               wpa_printf(MSG_WARNING, "WPA: Unsupported pairwise cipher %d",
+               wpa_printf(MSG_WARNING, "TDLS: Unsupported pairwise cipher %d",
                           sm->pairwise_cipher);
                return -1;
        }
 
        if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
                           rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
-               wpa_printf(MSG_WARNING, "RSN: Failed to set TPK to the "
+               wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
                           "driver");
                return -1;
        }
@@ -187,33 +217,36 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
 
 static int wpa_tdls_send_tpk_msg(struct wpa_sm *sm, const u8 *dst,
                                 u8 action_code, u8 dialog_token,
-                                u16 status_code, const u8 *buf, size_t len)
+                                u16 status_code, u32 peer_capab,
+                                const u8 *buf, size_t len)
 {
        return wpa_sm_send_tdls_mgmt(sm, dst, action_code, dialog_token,
-                                    status_code, buf, len);
+                                    status_code, peer_capab, buf, len);
 }
 
 
-static int wpa_tdls_smk_send(struct wpa_sm *sm, const u8 *dest, u8 action_code,
-                            u8 dialog_token, u16 status_code,
+static int wpa_tdls_tpk_send(struct wpa_sm *sm, const u8 *dest, u8 action_code,
+                            u8 dialog_token, u16 status_code, u32 peer_capab,
                             const u8 *msg, size_t msg_len)
 {
        struct wpa_tdls_peer *peer;
 
-       wpa_printf(MSG_DEBUG, "TDLS: SMK Send dest=" MACSTR " action_code=%u "
-                  "dialog_token=%u status_code=%u msg_len=%u",
+       wpa_printf(MSG_DEBUG, "TDLS: TPK send dest=" MACSTR " action_code=%u "
+                  "dialog_token=%u status_code=%u peer_capab=%u msg_len=%u",
                   MAC2STR(dest), action_code, dialog_token, status_code,
-                  (unsigned int) msg_len);
+                  peer_capab, (unsigned int) msg_len);
 
        if (wpa_tdls_send_tpk_msg(sm, dest, action_code, dialog_token,
-                                 status_code, msg, msg_len)) {
+                                 status_code, peer_capab, msg, msg_len)) {
                wpa_printf(MSG_INFO, "TDLS: Failed to send message "
                           "(action_code=%u)", action_code);
                return -1;
        }
 
        if (action_code == WLAN_TDLS_SETUP_CONFIRM ||
-           action_code == WLAN_TDLS_TEARDOWN)
+           action_code == WLAN_TDLS_TEARDOWN ||
+           action_code == WLAN_TDLS_DISCOVERY_REQUEST ||
+           action_code == WLAN_TDLS_DISCOVERY_RESPONSE)
                return 0; /* No retries */
 
        for (peer = sm->tdls; peer; peer = peer->next) {
@@ -227,16 +260,22 @@ static int wpa_tdls_smk_send(struct wpa_sm *sm, const u8 *dest, u8 action_code,
                return 0;
        }
 
-       eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm, peer);
+       eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm, peer);
 
-       peer->sm_tmr.count = SMK_RETRY_COUNT;
-       peer->sm_tmr.timer = SMK_TIMEOUT; /* value in milliseconds */
+       if (action_code == WLAN_TDLS_SETUP_RESPONSE) {
+               peer->sm_tmr.count = TPK_M2_RETRY_COUNT;
+               peer->sm_tmr.timer = TPK_M2_TIMEOUT;
+       } else {
+               peer->sm_tmr.count = TPK_M1_RETRY_COUNT;
+               peer->sm_tmr.timer = TPK_M1_TIMEOUT;
+       }
 
        /* Copy message to resend on timeout */
        os_memcpy(peer->sm_tmr.dest, dest, ETH_ALEN);
        peer->sm_tmr.action_code = action_code;
        peer->sm_tmr.dialog_token = dialog_token;
        peer->sm_tmr.status_code = status_code;
+       peer->sm_tmr.peer_capab = peer_capab;
        peer->sm_tmr.buf_len = msg_len;
        os_free(peer->sm_tmr.buf);
        peer->sm_tmr.buf = os_malloc(msg_len);
@@ -246,33 +285,27 @@ static int wpa_tdls_smk_send(struct wpa_sm *sm, const u8 *dest, u8 action_code,
 
        wpa_printf(MSG_DEBUG, "TDLS: Retry timeout registered "
                   "(action_code=%u)", action_code);
-       eloop_register_timeout(peer->sm_tmr.timer / 1000, 0,
-                              wpa_tdls_smkretry_timeout, sm, peer);
+       eloop_register_timeout(peer->sm_tmr.timer / 1000,
+                              (peer->sm_tmr.timer % 1000) * 1000,
+                              wpa_tdls_tpk_retry_timeout, sm, peer);
        return 0;
 }
 
 
-static void tdls_clear_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
+static int wpa_tdls_do_teardown(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
+                               u16 reason_code)
 {
-       u8 mac[ETH_ALEN];
-       struct wpa_tdls_peer *tmp;
-
-       os_memcpy(mac, peer->addr, ETH_ALEN);
-       tmp = peer->next;
-       peer->initiator = 0;
-       eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm, peer);
-       os_free(peer->sm_tmr.buf);
+       int ret;
 
-       /* reset all */
-       os_memset(peer, 0, sizeof(*peer));
+       ret = wpa_tdls_send_teardown(sm, peer->addr, reason_code);
+       /* disable the link after teardown was sent */
+       wpa_tdls_disable_peer_link(sm, peer);
 
-       /* restore things */
-       os_memcpy(peer->addr, mac, ETH_ALEN);
-       peer->next = tmp;
+       return ret;
 }
 
 
-static void wpa_tdls_smkretry_timeout(void *eloop_ctx, void *timeout_ctx)
+static void wpa_tdls_tpk_retry_timeout(void *eloop_ctx, void *timeout_ctx)
 {
 
        struct wpa_sm *sm = eloop_ctx;
@@ -280,7 +313,6 @@ static void wpa_tdls_smkretry_timeout(void *eloop_ctx, void *timeout_ctx)
 
        if (peer->sm_tmr.count) {
                peer->sm_tmr.count--;
-               peer->sm_tmr.timer = SMK_TIMEOUT; /* value in milliseconds */
 
                wpa_printf(MSG_INFO, "TDLS: Retrying sending of message "
                           "(action_code=%u)",
@@ -290,7 +322,7 @@ static void wpa_tdls_smkretry_timeout(void *eloop_ctx, void *timeout_ctx)
                        wpa_printf(MSG_INFO, "TDLS: No retry buffer available "
                                   "for action_code=%u",
                                   peer->sm_tmr.action_code);
-                       eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm,
+                       eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm,
                                             peer);
                        return;
                }
@@ -300,39 +332,37 @@ static void wpa_tdls_smkretry_timeout(void *eloop_ctx, void *timeout_ctx)
                                          peer->sm_tmr.action_code,
                                          peer->sm_tmr.dialog_token,
                                          peer->sm_tmr.status_code,
+                                         peer->sm_tmr.peer_capab,
                                          peer->sm_tmr.buf,
                                          peer->sm_tmr.buf_len)) {
                        wpa_printf(MSG_INFO, "TDLS: Failed to retry "
                                   "transmission");
                }
 
-               eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm, peer);
-               eloop_register_timeout(peer->sm_tmr.timer / 1000, 0,
-                                      wpa_tdls_smkretry_timeout, sm, peer);
+               eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm, peer);
+               eloop_register_timeout(peer->sm_tmr.timer / 1000,
+                                      (peer->sm_tmr.timer % 1000) * 1000,
+                                      wpa_tdls_tpk_retry_timeout, sm, peer);
        } else {
-               wpa_printf(MSG_INFO, "Sending Tear_Down Request");
-               wpa_sm_tdls_oper(sm, TDLS_TEARDOWN, peer->addr);
+               eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm, peer);
 
-               wpa_printf(MSG_INFO, "Clearing SM: Peerkey(" MACSTR ")",
-                          MAC2STR(peer->addr));
-               eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm, peer);
-
-               /* clear the Peerkey statemachine */
-               wpa_tdls_peer_free(sm, peer);
+               wpa_printf(MSG_DEBUG, "TDLS: Sending Teardown Request");
+               wpa_tdls_do_teardown(sm, peer,
+                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
        }
 }
 
 
-static void wpa_tdls_smkretry_timeout_cancel(struct wpa_sm *sm,
-                                            struct wpa_tdls_peer *peer,
-                                            u8 action_code)
+static void wpa_tdls_tpk_retry_timeout_cancel(struct wpa_sm *sm,
+                                             struct wpa_tdls_peer *peer,
+                                             u8 action_code)
 {
        if (action_code == peer->sm_tmr.action_code) {
                wpa_printf(MSG_DEBUG, "TDLS: Retry timeout cancelled for "
                           "action_code=%u", action_code);
 
                /* Cancel Timeout registered */
-               eloop_cancel_timeout(wpa_tdls_smkretry_timeout, sm, peer);
+               eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm, peer);
 
                /* free all resources meant for retry */
                os_free(peer->sm_tmr.buf);
@@ -362,11 +392,11 @@ static void wpa_tdls_generate_tpk(struct wpa_tdls_peer *peer,
         */
        len[0] = WPA_NONCE_LEN;
        len[1] = WPA_NONCE_LEN;
-       if (os_memcmp(peer->inonce, peer->pnonce, WPA_NONCE_LEN) < 0) {
+       if (os_memcmp(peer->inonce, peer->rnonce, WPA_NONCE_LEN) < 0) {
                nonce[0] = peer->inonce;
-               nonce[1] = peer->pnonce;
+               nonce[1] = peer->rnonce;
        } else {
-               nonce[0] = peer->pnonce;
+               nonce[0] = peer->rnonce;
                nonce[1] = peer->inonce;
        }
        wpa_hexdump(MSG_DEBUG, "TDLS: min(Nonce)", nonce[0], WPA_NONCE_LEN);
@@ -469,7 +499,7 @@ static int wpa_tdls_ftie_mic(const u8 *kck, u8 trans_seq, const u8 *lnkid,
  * @kck: TPK-KCK
  * @trans_seq: Transaction Sequence Number (4 - Teardown)
  * @rcode: Reason code for Teardown
- * @dtoken: Dialogue Token used for that particular link
+ * @dtoken: Dialog Token used for that particular link
  * @lnkid: Pointer to the beginning of Link Identifier IE
  * @ftie: Pointer to the beginning of FT IE
  * @mic: Pointer for writing MIC
@@ -595,31 +625,106 @@ static void wpa_tdls_tpk_timeout(void *eloop_ctx, void *timeout_ctx)
        } else {
                wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime expired for " MACSTR
                           " - tear down", MAC2STR(peer->addr));
-               wpa_sm_tdls_oper(sm, TDLS_TEARDOWN, peer->addr);
+               wpa_tdls_do_teardown(sm, peer,
+                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
        }
 }
 
 
-static void wpa_tdls_peer_free(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
+static void wpa_tdls_peer_remove_from_list(struct wpa_sm *sm,
+                                          struct wpa_tdls_peer *peer)
+{
+       struct wpa_tdls_peer *cur, *prev;
+
+       cur = sm->tdls;
+       prev = NULL;
+       while (cur && cur != peer) {
+               prev = cur;
+               cur = cur->next;
+       }
+
+       if (cur != peer) {
+               wpa_printf(MSG_ERROR, "TDLS: Could not find peer " MACSTR
+                          " to remove it from the list",
+                          MAC2STR(peer->addr));
+               return;
+       }
+
+       if (prev)
+               prev->next = peer->next;
+       else
+               sm->tdls = peer->next;
+}
+
+
+static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
 {
+       wpa_printf(MSG_DEBUG, "TDLS: Clear state for peer " MACSTR,
+                  MAC2STR(peer->addr));
        eloop_cancel_timeout(wpa_tdls_tpk_timeout, sm, peer);
+       eloop_cancel_timeout(wpa_tdls_tpk_retry_timeout, sm, peer);
+       peer->reconfig_key = 0;
+       peer->initiator = 0;
+       peer->tpk_in_progress = 0;
+       os_free(peer->sm_tmr.buf);
+       peer->sm_tmr.buf = NULL;
+       os_free(peer->ht_capabilities);
+       peer->ht_capabilities = NULL;
+       os_free(peer->vht_capabilities);
+       peer->vht_capabilities = NULL;
+       os_free(peer->ext_capab);
+       peer->ext_capab = NULL;
+       os_free(peer->supp_channels);
+       peer->supp_channels = NULL;
+       os_free(peer->supp_oper_classes);
+       peer->supp_oper_classes = NULL;
+       peer->rsnie_i_len = peer->rsnie_p_len = 0;
+       peer->cipher = 0;
+       peer->qos_info = 0;
+       peer->wmm_capable = 0;
+       peer->tpk_set = peer->tpk_success = 0;
+       os_memset(&peer->tpk, 0, sizeof(peer->tpk));
+       os_memset(peer->inonce, 0, WPA_NONCE_LEN);
+       os_memset(peer->rnonce, 0, WPA_NONCE_LEN);
+}
+
+
+static void wpa_tdls_peer_free(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
+{
+       wpa_tdls_peer_clear(sm, peer);
+       wpa_tdls_peer_remove_from_list(sm, peer);
+       os_free(peer);
+}
+
 
-       /* need to clear Peerkey SM */
-       tdls_clear_peer(sm, peer);
-       //os_free(peer);
+static void wpa_tdls_linkid(struct wpa_sm *sm, struct wpa_tdls_peer *peer,
+                           struct wpa_tdls_lnkid *lnkid)
+{
+       lnkid->ie_type = WLAN_EID_LINK_ID;
+       lnkid->ie_len = 3 * ETH_ALEN;
+       os_memcpy(lnkid->bssid, sm->bssid, ETH_ALEN);
+       if (peer->initiator) {
+               os_memcpy(lnkid->init_sta, sm->own_addr, ETH_ALEN);
+               os_memcpy(lnkid->resp_sta, peer->addr, ETH_ALEN);
+       } else {
+               os_memcpy(lnkid->init_sta, peer->addr, ETH_ALEN);
+               os_memcpy(lnkid->resp_sta, sm->own_addr, ETH_ALEN);
+       }
 }
 
 
-int wpa_tdls_recv_teardown_notify(struct wpa_sm *sm, const u8 *addr,
+static int wpa_tdls_send_teardown(struct wpa_sm *sm, const u8 *addr,
                                  u16 reason_code)
 {
-       struct wpa_tdls_peer *peer = NULL;
+       struct wpa_tdls_peer *peer;
        struct wpa_tdls_ftie *ftie;
-       struct wpa_tdls_lnkid *lnkid;
-       u8 dialogue_token = 0;
-       u8 *rbuf;
+       struct wpa_tdls_lnkid lnkid;
+       u8 dialog_token;
+       u8 *rbuf, *pos;
        int ielen;
-       u8 *pos;
+
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return -1;
 
        /* Find the node and free from the list */
        for (peer = sm->tdls; peer; peer = peer->next) {
@@ -633,11 +738,9 @@ int wpa_tdls_recv_teardown_notify(struct wpa_sm *sm, const u8 *addr,
                return 0;
        }
 
-       dialogue_token = peer->dtoken;
-
-       lnkid = (struct wpa_tdls_lnkid *) &peer->lnkid;
+       dialog_token = peer->dtoken;
 
-       wpa_printf(MSG_DEBUG, "RSN: TDLS Teardown for " MACSTR,
+       wpa_printf(MSG_DEBUG, "TDLS: TDLS Teardown for " MACSTR,
                   MAC2STR(addr));
 
        ielen = 0;
@@ -661,7 +764,7 @@ int wpa_tdls_recv_teardown_notify(struct wpa_sm *sm, const u8 *addr,
        ftie = (struct wpa_tdls_ftie *) pos;
        ftie->ie_type = WLAN_EID_FAST_BSS_TRANSITION;
        /* Using the recent nonce which should be for CONFIRM frame */
-       os_memcpy(ftie->Anonce, peer->pnonce, WPA_NONCE_LEN);
+       os_memcpy(ftie->Anonce, peer->rnonce, WPA_NONCE_LEN);
        os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
        ftie->ie_len = sizeof(struct wpa_tdls_ftie) - 2;
        pos = (u8 *) (ftie + 1);
@@ -672,14 +775,16 @@ int wpa_tdls_recv_teardown_notify(struct wpa_sm *sm, const u8 *addr,
                ftie->ie_len += 170;
                *pos++ = 255; /* FTIE subelem */
                *pos++ = 168; /* FTIE subelem length */
+               pos += 168;
        }
 #endif /* CONFIG_TDLS_TESTING */
-       wpa_hexdump(MSG_DEBUG, "WPA: FTIE for TDLS Teardown handshake",
-                   (u8 *) ftie, sizeof(*ftie));
+       wpa_hexdump(MSG_DEBUG, "TDLS: FTIE for TDLS Teardown handshake",
+                   (u8 *) ftie, pos - (u8 *) ftie);
 
        /* compute MIC before sending */
+       wpa_tdls_linkid(sm, peer, &lnkid);
        wpa_tdls_key_mic_teardown(peer->tpk.kck, 4, reason_code,
-                                 dialogue_token, (u8 *) lnkid, (u8 *) ftie,
+                                 dialog_token, (u8 *) &lnkid, (u8 *) ftie,
                                  ftie->mic);
 
 skip_ies:
@@ -687,15 +792,100 @@ skip_ies:
         * the other end, then try again another time */
 
        /* request driver to send Teardown using this FTIE */
-       wpa_tdls_smk_send(sm, addr, WLAN_TDLS_TEARDOWN, 0,
-                         WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED, rbuf,
-                         pos - rbuf);
+       wpa_tdls_tpk_send(sm, addr, WLAN_TDLS_TEARDOWN, 0,
+                         reason_code, 0, rbuf, pos - rbuf);
        os_free(rbuf);
 
-       /* clear the Peerkey statemachine */
+       return 0;
+}
+
+
+int wpa_tdls_teardown_link(struct wpa_sm *sm, const u8 *addr, u16 reason_code)
+{
+       struct wpa_tdls_peer *peer;
+
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return -1;
+
+       for (peer = sm->tdls; peer; peer = peer->next) {
+               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
+                       break;
+       }
+
+       if (peer == NULL) {
+               wpa_printf(MSG_DEBUG, "TDLS: Could not find peer " MACSTR
+                  " for link Teardown", MAC2STR(addr));
+               return -1;
+       }
+
+       if (!peer->tpk_success) {
+               wpa_printf(MSG_DEBUG, "TDLS: Peer " MACSTR
+                  " not connected - cannot Teardown link", MAC2STR(addr));
+               return -1;
+       }
+
+       return wpa_tdls_do_teardown(sm, peer, reason_code);
+}
+
+
+static void wpa_tdls_disable_peer_link(struct wpa_sm *sm,
+                                      struct wpa_tdls_peer *peer)
+{
+       wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, peer->addr);
        wpa_tdls_peer_free(sm, peer);
+}
 
-       return 0;
+
+void wpa_tdls_disable_unreachable_link(struct wpa_sm *sm, const u8 *addr)
+{
+       struct wpa_tdls_peer *peer;
+
+       for (peer = sm->tdls; peer; peer = peer->next) {
+               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
+                       break;
+       }
+
+       if (!peer || !peer->tpk_success) {
+               wpa_printf(MSG_DEBUG, "TDLS: Peer " MACSTR
+                          " not connected - cannot teardown unreachable link",
+                          MAC2STR(addr));
+               return;
+       }
+
+       if (wpa_tdls_is_external_setup(sm)) {
+               /*
+                * Disable the link, send a teardown packet through the
+                * AP, and then reset link data.
+                */
+               wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, addr);
+               wpa_tdls_send_teardown(sm, addr,
+                                      WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE);
+               wpa_tdls_peer_free(sm, peer);
+       } else {
+               wpa_tdls_disable_peer_link(sm, peer);
+       }
+}
+
+
+const char * wpa_tdls_get_link_status(struct wpa_sm *sm, const u8 *addr)
+{
+       struct wpa_tdls_peer *peer;
+
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return "disabled";
+
+       for (peer = sm->tdls; peer; peer = peer->next) {
+               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
+                       break;
+       }
+
+       if (peer == NULL)
+               return "peer does not exist";
+
+       if (!peer->tpk_success)
+               return "peer not connected";
+
+       return "connected";
 }
 
 
@@ -747,7 +937,7 @@ static int wpa_tdls_recv_teardown(struct wpa_sm *sm, const u8 *src_addr,
        if (!wpa_tdls_get_privacy(sm) || !peer->tpk_set || !peer->tpk_success)
                goto skip_ftie;
 
-       if (kde.ftie == NULL) {
+       if (kde.ftie == NULL || kde.ftie_len < sizeof(*ftie)) {
                wpa_printf(MSG_INFO, "TDLS: No FTIE in TDLS Teardown");
                return -1;
        }
@@ -760,14 +950,7 @@ static int wpa_tdls_recv_teardown(struct wpa_sm *sm, const u8 *src_addr,
                                                    (u8 *) lnkid, ftie) < 0) {
                wpa_printf(MSG_DEBUG, "TDLS: MIC failure for TDLS "
                           "Teardown Request from " MACSTR, MAC2STR(src_addr));
-#if 0
                return -1;
-#else
-               /* TODO: figure out whether this workaround could be disabled
-                */
-               wpa_printf(MSG_DEBUG, "TDLS: Workaround - ignore Teardown MIC "
-                          "failure");
-#endif
        }
 
 skip_ftie:
@@ -775,72 +958,182 @@ skip_ftie:
         * Request the driver to disable the direct link and clear associated
         * keys.
         */
-       wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, src_addr);
-
-       /* clear the Peerkey statemachine */
-       wpa_tdls_peer_free(sm, peer);
-
+       wpa_tdls_disable_peer_link(sm, peer);
        return 0;
 }
 
 
 /**
- * wpa_tdls_send_smk_error - To send suitable TDLS status response with
+ * wpa_tdls_send_error - To send suitable TDLS status response with
  *     appropriate status code mentioning reason for error/failure.
  * @dst        - MAC addr of Peer station
  * @tdls_action - TDLS frame type for which error code is sent
  * @status     - status code mentioning reason
  */
 
-static int wpa_tdls_send_smk_error(struct wpa_sm *sm, const u8 *dst,
-                                  u8 tdls_action, u8 dialog_token, u16 status)
+static int wpa_tdls_send_error(struct wpa_sm *sm, const u8 *dst,
+                              u8 tdls_action, u8 dialog_token, u16 status)
 {
-       return wpa_tdls_smk_send(sm, dst, tdls_action, dialog_token, status,
-                                NULL, 0);
+       wpa_printf(MSG_DEBUG, "TDLS: Sending error to " MACSTR
+                  " (action=%u status=%u)",
+                  MAC2STR(dst), tdls_action, status);
+       return wpa_tdls_tpk_send(sm, dst, tdls_action, dialog_token, status,
+                                0, NULL, 0);
 }
 
 
-static int wpa_tdls_send_tpk_m2(struct wpa_sm *sm,
-                               const unsigned char *src_addr, u8 dtoken,
-                               struct wpa_tdls_lnkid *lnkid,
-                               const struct wpa_tdls_peer *peer)
+static struct wpa_tdls_peer *
+wpa_tdls_add_peer(struct wpa_sm *sm, const u8 *addr, int *existing)
+{
+       struct wpa_tdls_peer *peer;
+
+       if (existing)
+               *existing = 0;
+       for (peer = sm->tdls; peer; peer = peer->next) {
+               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0) {
+                       if (existing)
+                               *existing = 1;
+                       return peer; /* re-use existing entry */
+               }
+       }
+
+       wpa_printf(MSG_INFO, "TDLS: Creating peer entry for " MACSTR,
+                  MAC2STR(addr));
+
+       peer = os_zalloc(sizeof(*peer));
+       if (peer == NULL)
+               return NULL;
+
+       os_memcpy(peer->addr, addr, ETH_ALEN);
+       peer->next = sm->tdls;
+       sm->tdls = peer;
+
+       return peer;
+}
+
+
+static int wpa_tdls_send_tpk_m1(struct wpa_sm *sm,
+                               struct wpa_tdls_peer *peer)
 {
-       u8 *rbuf, *pos;
        size_t buf_len;
-       u32 lifetime;
        struct wpa_tdls_timeoutie timeoutie;
+       u16 rsn_capab;
        struct wpa_tdls_ftie *ftie;
+       u8 *rbuf, *pos, *count_pos;
+       u16 count;
+       struct rsn_ie_hdr *hdr;
+       int status;
+
+       if (!wpa_tdls_get_privacy(sm)) {
+               wpa_printf(MSG_DEBUG, "TDLS: No security used on the link");
+               peer->rsnie_i_len = 0;
+               goto skip_rsnie;
+       }
+
+       /*
+        * TPK Handshake Message 1:
+        * FTIE: ANonce=0, SNonce=initiator nonce MIC=0, DataKDs=(RSNIE_I,
+        * Timeout Interval IE))
+        */
+
+       /* Filling RSN IE */
+       hdr = (struct rsn_ie_hdr *) peer->rsnie_i;
+       hdr->elem_id = WLAN_EID_RSN;
+       WPA_PUT_LE16(hdr->version, RSN_VERSION);
+
+       pos = (u8 *) (hdr + 1);
+       RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED);
+       pos += RSN_SELECTOR_LEN;
+       count_pos = pos;
+       pos += 2;
+
+       count = 0;
+
+       /*
+        * AES-CCMP is the default Encryption preferred for TDLS, so
+        * RSN IE is filled only with CCMP CIPHER
+        * Note: TKIP is not used to encrypt TDLS link.
+        *
+        * Regardless of the cipher used on the AP connection, select CCMP
+        * here.
+        */
+       RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_CCMP);
+       pos += RSN_SELECTOR_LEN;
+       count++;
+
+       WPA_PUT_LE16(count_pos, count);
+
+       WPA_PUT_LE16(pos, 1);
+       pos += 2;
+       RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_TPK_HANDSHAKE);
+       pos += RSN_SELECTOR_LEN;
+
+       rsn_capab = WPA_CAPABILITY_PEERKEY_ENABLED;
+       rsn_capab |= RSN_NUM_REPLAY_COUNTERS_16 << 2;
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_ALT_RSN_IE) {
+               wpa_printf(MSG_DEBUG, "TDLS: Use alternative RSN IE for "
+                          "testing");
+               rsn_capab = WPA_CAPABILITY_PEERKEY_ENABLED;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+       WPA_PUT_LE16(pos, rsn_capab);
+       pos += 2;
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_ALT_RSN_IE) {
+               /* Number of PMKIDs */
+               *pos++ = 0x00;
+               *pos++ = 0x00;
+       }
+#endif /* CONFIG_TDLS_TESTING */
 
+       hdr->len = (pos - peer->rsnie_i) - 2;
+       peer->rsnie_i_len = pos - peer->rsnie_i;
+       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE for TPK handshake",
+                   peer->rsnie_i, peer->rsnie_i_len);
+
+skip_rsnie:
        buf_len = 0;
-       if (wpa_tdls_get_privacy(sm)) {
-               /* Peer RSN IE, FTIE(Initiator Nonce, Peer nonce), Lifetime */
+       if (wpa_tdls_get_privacy(sm))
                buf_len += peer->rsnie_i_len + sizeof(struct wpa_tdls_ftie) +
                        sizeof(struct wpa_tdls_timeoutie);
 #ifdef CONFIG_TDLS_TESTING
-               if (tdls_testing & TDLS_TESTING_LONG_FRAME)
-                       buf_len += 170;
+       if (wpa_tdls_get_privacy(sm) &&
+           (tdls_testing & TDLS_TESTING_LONG_FRAME))
+               buf_len += 170;
+       if (tdls_testing & TDLS_TESTING_DIFF_BSSID)
+               buf_len += sizeof(struct wpa_tdls_lnkid);
 #endif /* CONFIG_TDLS_TESTING */
-       }
-
        rbuf = os_zalloc(buf_len + 1);
-       if (rbuf == NULL)
+       if (rbuf == NULL) {
+               wpa_tdls_peer_free(sm, peer);
                return -1;
+       }
        pos = rbuf;
 
        if (!wpa_tdls_get_privacy(sm))
                goto skip_ies;
 
-       /* Peer RSN IE */
-       pos = wpa_add_ie(pos, peer->rsnie_p, peer->rsnie_p_len);
+       /* Initiator RSN IE */
+       pos = wpa_add_ie(pos, peer->rsnie_i, peer->rsnie_i_len);
 
        ftie = (struct wpa_tdls_ftie *) pos;
        ftie->ie_type = WLAN_EID_FAST_BSS_TRANSITION;
-       /* TODO: ftie->mic_control to set 2-RESPONSE */
-       os_memcpy(ftie->Anonce, peer->pnonce, WPA_NONCE_LEN);
-       os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
        ftie->ie_len = sizeof(struct wpa_tdls_ftie) - 2;
-       wpa_hexdump(MSG_WARNING, "WPA: FTIE for SMK M2 handshake",
-                   (u8 *) ftie, sizeof(*ftie));
+
+       if (os_get_random(peer->inonce, WPA_NONCE_LEN)) {
+               wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
+                       "TDLS: Failed to get random data for initiator Nonce");
+               os_free(rbuf);
+               wpa_tdls_peer_free(sm, peer);
+               return -1;
+       }
+       wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
+                   peer->inonce, WPA_NONCE_LEN);
+       os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
+
+       wpa_hexdump(MSG_DEBUG, "TDLS: FTIE for TPK Handshake M1",
+                   (u8 *) ftie, sizeof(struct wpa_tdls_ftie));
 
        pos = (u8 *) (ftie + 1);
 
@@ -856,15 +1149,115 @@ static int wpa_tdls_send_tpk_m2(struct wpa_sm *sm,
 #endif /* CONFIG_TDLS_TESTING */
 
        /* Lifetime */
-       lifetime = peer->lifetime;
+       peer->lifetime = TPK_LIFETIME;
 #ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_WRONG_LIFETIME_RESP) {
-               wpa_printf(MSG_DEBUG, "TDLS: Testing - use wrong TPK "
-                          "lifetime in response");
-               lifetime++;
-       }
-#endif /* CONFIG_TDLS_TESTING */
-       pos = wpa_add_tdls_timeoutie(pos, (u8 *) &timeoutie,
+       if (tdls_testing & TDLS_TESTING_SHORT_LIFETIME) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use short TPK "
+                          "lifetime");
+               peer->lifetime = 301;
+       }
+       if (tdls_testing & TDLS_TESTING_LONG_LIFETIME) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use long TPK "
+                          "lifetime");
+               peer->lifetime = 0xffffffff;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+       pos = wpa_add_tdls_timeoutie(pos, (u8 *) &timeoutie,
+                                    sizeof(timeoutie), peer->lifetime);
+       wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime %u seconds", peer->lifetime);
+
+skip_ies:
+
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_DIFF_BSSID) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use incorrect BSSID in "
+                          "Link Identifier");
+               struct wpa_tdls_lnkid *l = (struct wpa_tdls_lnkid *) pos;
+               wpa_tdls_linkid(sm, peer, l);
+               l->bssid[5] ^= 0x01;
+               pos += sizeof(*l);
+       }
+#endif /* CONFIG_TDLS_TESTING */
+
+       wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Setup Request / TPK "
+                  "Handshake Message 1 (peer " MACSTR ")",
+                  MAC2STR(peer->addr));
+
+       status = wpa_tdls_tpk_send(sm, peer->addr, WLAN_TDLS_SETUP_REQUEST,
+                                  1, 0, 0, rbuf, pos - rbuf);
+       os_free(rbuf);
+
+       return status;
+}
+
+
+static int wpa_tdls_send_tpk_m2(struct wpa_sm *sm,
+                               const unsigned char *src_addr, u8 dtoken,
+                               struct wpa_tdls_lnkid *lnkid,
+                               const struct wpa_tdls_peer *peer)
+{
+       u8 *rbuf, *pos;
+       size_t buf_len;
+       u32 lifetime;
+       struct wpa_tdls_timeoutie timeoutie;
+       struct wpa_tdls_ftie *ftie;
+       int status;
+
+       buf_len = 0;
+       if (wpa_tdls_get_privacy(sm)) {
+               /* Peer RSN IE, FTIE(Initiator Nonce, Responder Nonce),
+                * Lifetime */
+               buf_len += peer->rsnie_i_len + sizeof(struct wpa_tdls_ftie) +
+                       sizeof(struct wpa_tdls_timeoutie);
+#ifdef CONFIG_TDLS_TESTING
+               if (tdls_testing & TDLS_TESTING_LONG_FRAME)
+                       buf_len += 170;
+#endif /* CONFIG_TDLS_TESTING */
+       }
+
+       rbuf = os_zalloc(buf_len + 1);
+       if (rbuf == NULL)
+               return -1;
+       pos = rbuf;
+
+       if (!wpa_tdls_get_privacy(sm))
+               goto skip_ies;
+
+       /* Peer RSN IE */
+       pos = wpa_add_ie(pos, peer->rsnie_p, peer->rsnie_p_len);
+
+       ftie = (struct wpa_tdls_ftie *) pos;
+       ftie->ie_type = WLAN_EID_FAST_BSS_TRANSITION;
+       /* TODO: ftie->mic_control to set 2-RESPONSE */
+       os_memcpy(ftie->Anonce, peer->rnonce, WPA_NONCE_LEN);
+       os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
+       ftie->ie_len = sizeof(struct wpa_tdls_ftie) - 2;
+       wpa_hexdump(MSG_DEBUG, "TDLS: FTIE for TPK M2",
+                   (u8 *) ftie, sizeof(*ftie));
+
+       pos = (u8 *) (ftie + 1);
+
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_LONG_FRAME) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - add extra subelem to "
+                          "FTIE");
+               ftie->ie_len += 170;
+               *pos++ = 255; /* FTIE subelem */
+               *pos++ = 168; /* FTIE subelem length */
+               pos += 168;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+
+       /* Lifetime */
+       lifetime = peer->lifetime;
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_WRONG_LIFETIME_RESP) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use wrong TPK "
+                          "lifetime in response");
+               lifetime++;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+       pos = wpa_add_tdls_timeoutie(pos, (u8 *) &timeoutie,
                                     sizeof(timeoutie), lifetime);
        wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime %u seconds from initiator",
                   lifetime);
@@ -872,13 +1265,19 @@ static int wpa_tdls_send_tpk_m2(struct wpa_sm *sm,
        /* compute MIC before sending */
        wpa_tdls_ftie_mic(peer->tpk.kck, 2, (u8 *) lnkid, peer->rsnie_p,
                          (u8 *) &timeoutie, (u8 *) ftie, ftie->mic);
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_WRONG_MIC) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use wrong MIC");
+               ftie->mic[0] ^= 0x01;
+       }
+#endif /* CONFIG_TDLS_TESTING */
 
 skip_ies:
-       wpa_tdls_smk_send(sm, src_addr, WLAN_TDLS_SETUP_RESPONSE, dtoken, 0,
-                         rbuf, pos - rbuf);
+       status = wpa_tdls_tpk_send(sm, src_addr, WLAN_TDLS_SETUP_RESPONSE,
+                                  dtoken, 0, 0, rbuf, pos - rbuf);
        os_free(rbuf);
 
-       return 0;
+       return status;
 }
 
 
@@ -892,10 +1291,13 @@ static int wpa_tdls_send_tpk_m3(struct wpa_sm *sm,
        struct wpa_tdls_ftie *ftie;
        struct wpa_tdls_timeoutie timeoutie;
        u32 lifetime;
+       int status;
+       u32 peer_capab = 0;
 
        buf_len = 0;
        if (wpa_tdls_get_privacy(sm)) {
-               /* Peer RSN IE, FTIE(Initiator Nonce, Peer nonce), Lifetime */
+               /* Peer RSN IE, FTIE(Initiator Nonce, Responder Nonce),
+                * Lifetime */
                buf_len += peer->rsnie_i_len + sizeof(struct wpa_tdls_ftie) +
                        sizeof(struct wpa_tdls_timeoutie);
 #ifdef CONFIG_TDLS_TESTING
@@ -918,7 +1320,7 @@ static int wpa_tdls_send_tpk_m3(struct wpa_sm *sm,
        ftie = (struct wpa_tdls_ftie *) pos;
        ftie->ie_type = WLAN_EID_FAST_BSS_TRANSITION;
        /*TODO: ftie->mic_control to set 3-CONFIRM */
-       os_memcpy(ftie->Anonce, peer->pnonce, WPA_NONCE_LEN);
+       os_memcpy(ftie->Anonce, peer->rnonce, WPA_NONCE_LEN);
        os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
        ftie->ie_len = sizeof(struct wpa_tdls_ftie) - 2;
 
@@ -952,12 +1354,279 @@ static int wpa_tdls_send_tpk_m3(struct wpa_sm *sm,
        /* compute MIC before sending */
        wpa_tdls_ftie_mic(peer->tpk.kck, 3, (u8 *) lnkid, peer->rsnie_p,
                          (u8 *) &timeoutie, (u8 *) ftie, ftie->mic);
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_WRONG_MIC) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - use wrong MIC");
+               ftie->mic[0] ^= 0x01;
+       }
+#endif /* CONFIG_TDLS_TESTING */
 
 skip_ies:
-       wpa_tdls_smk_send(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM, dtoken, 0,
-                         rbuf, pos - rbuf);
+
+       if (peer->vht_capabilities)
+               peer_capab |= TDLS_PEER_VHT;
+       if (peer->ht_capabilities)
+               peer_capab |= TDLS_PEER_HT;
+       if (peer->wmm_capable)
+               peer_capab |= TDLS_PEER_WMM;
+
+       status = wpa_tdls_tpk_send(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM,
+                                  dtoken, 0, peer_capab, rbuf, pos - rbuf);
        os_free(rbuf);
 
+       return status;
+}
+
+
+static int wpa_tdls_send_discovery_response(struct wpa_sm *sm,
+                                           struct wpa_tdls_peer *peer,
+                                           u8 dialog_token)
+{
+       wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Discovery Response "
+                  "(peer " MACSTR ")", MAC2STR(peer->addr));
+
+       return wpa_tdls_tpk_send(sm, peer->addr, WLAN_TDLS_DISCOVERY_RESPONSE,
+                                dialog_token, 0, 0, NULL, 0);
+}
+
+
+static int
+wpa_tdls_process_discovery_request(struct wpa_sm *sm, const u8 *addr,
+                                  const u8 *buf, size_t len)
+{
+       struct wpa_eapol_ie_parse kde;
+       const struct wpa_tdls_lnkid *lnkid;
+       struct wpa_tdls_peer *peer;
+       size_t min_req_len = sizeof(struct wpa_tdls_frame) +
+               1 /* dialog token */ + sizeof(struct wpa_tdls_lnkid);
+       u8 dialog_token;
+
+       wpa_printf(MSG_DEBUG, "TDLS: Discovery Request from " MACSTR,
+                  MAC2STR(addr));
+
+       if (len < min_req_len) {
+               wpa_printf(MSG_DEBUG, "TDLS Discovery Request is too short: "
+                          "%d", (int) len);
+               return -1;
+       }
+
+       dialog_token = buf[sizeof(struct wpa_tdls_frame)];
+
+       /*
+        * Some APs will tack on a weird IE to the end of a TDLS
+        * discovery request packet. This needn't fail the response,
+        * since the required IE are verified separately.
+        */
+       if (wpa_supplicant_parse_ies(buf + sizeof(struct wpa_tdls_frame) + 1,
+                                    len - (sizeof(struct wpa_tdls_frame) + 1),
+                                    &kde) < 0) {
+               wpa_printf(MSG_DEBUG,
+                          "TDLS: Failed to parse IEs in Discovery Request - ignore as an interop workaround");
+       }
+
+       if (!kde.lnkid) {
+               wpa_printf(MSG_DEBUG, "TDLS: Link ID not found in Discovery "
+                          "Request");
+               return -1;
+       }
+
+       lnkid = (const struct wpa_tdls_lnkid *) kde.lnkid;
+
+       if (os_memcmp(sm->bssid, lnkid->bssid, ETH_ALEN) != 0) {
+               wpa_printf(MSG_DEBUG, "TDLS: Discovery Request from different "
+                          " BSS " MACSTR, MAC2STR(lnkid->bssid));
+               return -1;
+       }
+
+       peer = wpa_tdls_add_peer(sm, addr, NULL);
+       if (peer == NULL)
+               return -1;
+
+       return wpa_tdls_send_discovery_response(sm, peer, dialog_token);
+}
+
+
+int wpa_tdls_send_discovery_request(struct wpa_sm *sm, const u8 *addr)
+{
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return -1;
+
+       wpa_printf(MSG_DEBUG, "TDLS: Sending Discovery Request to peer "
+                  MACSTR, MAC2STR(addr));
+       return wpa_tdls_tpk_send(sm, addr, WLAN_TDLS_DISCOVERY_REQUEST,
+                                1, 0, 0, NULL, 0);
+}
+
+
+static int copy_supp_rates(const struct wpa_eapol_ie_parse *kde,
+                          struct wpa_tdls_peer *peer)
+{
+       if (!kde->supp_rates) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported rates received");
+               return -1;
+       }
+       peer->supp_rates_len = merge_byte_arrays(
+               peer->supp_rates, sizeof(peer->supp_rates),
+               kde->supp_rates + 2, kde->supp_rates_len - 2,
+               kde->ext_supp_rates ? kde->ext_supp_rates + 2 : NULL,
+               kde->ext_supp_rates_len - 2);
+       return 0;
+}
+
+
+static int copy_peer_ht_capab(const struct wpa_eapol_ie_parse *kde,
+                             struct wpa_tdls_peer *peer)
+{
+       if (!kde->ht_capabilities ||
+           kde->ht_capabilities_len <
+           sizeof(struct ieee80211_ht_capabilities) ) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported ht capabilities "
+                          "received");
+               return 0;
+       }
+
+       if (!peer->ht_capabilities) {
+               peer->ht_capabilities =
+                        os_zalloc(sizeof(struct ieee80211_ht_capabilities));
+               if (peer->ht_capabilities == NULL)
+                        return -1;
+       }
+
+       os_memcpy(peer->ht_capabilities, kde->ht_capabilities,
+                  sizeof(struct ieee80211_ht_capabilities));
+       wpa_hexdump(MSG_DEBUG, "TDLS: Peer HT capabilities",
+                   (u8 *) peer->ht_capabilities,
+                   sizeof(struct ieee80211_ht_capabilities));
+
+       return 0;
+}
+
+
+static int copy_peer_vht_capab(const struct wpa_eapol_ie_parse *kde,
+                             struct wpa_tdls_peer *peer)
+{
+       if (!kde->vht_capabilities ||
+           kde->vht_capabilities_len <
+           sizeof(struct ieee80211_vht_capabilities) ) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported vht capabilities "
+                          "received");
+               return 0;
+       }
+
+       if (!peer->vht_capabilities) {
+               peer->vht_capabilities =
+                        os_zalloc(sizeof(struct ieee80211_vht_capabilities));
+               if (peer->vht_capabilities == NULL)
+                        return -1;
+       }
+
+       os_memcpy(peer->vht_capabilities, kde->vht_capabilities,
+                  sizeof(struct ieee80211_vht_capabilities));
+       wpa_hexdump(MSG_DEBUG, "TDLS: Peer VHT capabilities",
+                   (u8 *) peer->vht_capabilities,
+                   sizeof(struct ieee80211_vht_capabilities));
+
+       return 0;
+}
+
+
+static int copy_peer_ext_capab(const struct wpa_eapol_ie_parse *kde,
+                              struct wpa_tdls_peer *peer)
+{
+       if (!kde->ext_capab) {
+               wpa_printf(MSG_DEBUG, "TDLS: No extended capabilities "
+                          "received");
+               return 0;
+       }
+
+       if (!peer->ext_capab || peer->ext_capab_len < kde->ext_capab_len - 2) {
+               /* Need to allocate buffer to fit the new information */
+               os_free(peer->ext_capab);
+               peer->ext_capab = os_zalloc(kde->ext_capab_len - 2);
+               if (peer->ext_capab == NULL)
+                       return -1;
+       }
+
+       peer->ext_capab_len = kde->ext_capab_len - 2;
+       os_memcpy(peer->ext_capab, kde->ext_capab + 2, peer->ext_capab_len);
+
+       return 0;
+}
+
+
+static int copy_peer_wmm_capab(const struct wpa_eapol_ie_parse *kde,
+                              struct wpa_tdls_peer *peer)
+{
+       struct wmm_information_element *wmm;
+
+       if (!kde->wmm) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported WMM capabilities received");
+               return 0;
+       }
+
+       if (kde->wmm_len < sizeof(struct wmm_information_element)) {
+               wpa_printf(MSG_DEBUG, "TDLS: Invalid supported WMM capabilities received");
+               return -1;
+       }
+
+       wmm = (struct wmm_information_element *) kde->wmm;
+       peer->qos_info = wmm->qos_info;
+
+       peer->wmm_capable = 1;
+
+       wpa_printf(MSG_DEBUG, "TDLS: Peer WMM QOS Info 0x%x", peer->qos_info);
+       return 0;
+}
+
+
+static int copy_peer_supp_channels(const struct wpa_eapol_ie_parse *kde,
+                                  struct wpa_tdls_peer *peer)
+{
+       if (!kde->supp_channels) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported channels received");
+               return 0;
+       }
+
+       if (!peer->supp_channels ||
+           peer->supp_channels_len < kde->supp_channels_len) {
+               os_free(peer->supp_channels);
+               peer->supp_channels = os_zalloc(kde->supp_channels_len);
+               if (peer->supp_channels == NULL)
+                       return -1;
+       }
+
+       peer->supp_channels_len = kde->supp_channels_len;
+
+       os_memcpy(peer->supp_channels, kde->supp_channels,
+                 peer->supp_channels_len);
+       wpa_hexdump(MSG_DEBUG, "TDLS: Peer Supported Channels",
+                   (u8 *) peer->supp_channels, peer->supp_channels_len);
+       return 0;
+}
+
+
+static int copy_peer_supp_oper_classes(const struct wpa_eapol_ie_parse *kde,
+                                      struct wpa_tdls_peer *peer)
+{
+       if (!kde->supp_oper_classes) {
+               wpa_printf(MSG_DEBUG, "TDLS: No supported operating classes received");
+               return 0;
+       }
+
+       if (!peer->supp_oper_classes ||
+           peer->supp_oper_classes_len < kde->supp_oper_classes_len) {
+               os_free(peer->supp_oper_classes);
+               peer->supp_oper_classes = os_zalloc(kde->supp_oper_classes_len);
+               if (peer->supp_oper_classes == NULL)
+                       return -1;
+       }
+
+       peer->supp_oper_classes_len = kde->supp_oper_classes_len;
+       os_memcpy(peer->supp_oper_classes, kde->supp_oper_classes,
+                 peer->supp_oper_classes_len);
+       wpa_hexdump(MSG_DEBUG, "TDLS: Peer Supported Operating Classes",
+                   (u8 *) peer->supp_oper_classes,
+                   peer->supp_oper_classes_len);
        return 0;
 }
 
@@ -982,61 +1651,167 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
 #endif
        u8 dtoken;
        u16 ielen;
+       u16 status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+       int tdls_prohibited = sm->tdls_prohibited;
+       int existing_peer = 0;
+
+       if (len < 3 + 3)
+               return -1;
 
        cpos = buf;
        cpos += 1 /* pkt_type */ + 1 /* Category */ + 1 /* Action */;
 
        /* driver had already verified the frame format */
-       dtoken = *cpos++; /* dialogue token */
+       dtoken = *cpos++; /* dialog token */
 
-       wpa_printf(MSG_INFO, "TDLS: Dialogue Token in TPK M1 %d",
-                  dtoken);
+       wpa_printf(MSG_INFO, "TDLS: Dialog Token in TPK M1 %d", dtoken);
 
-       cpos += 2; /* capability information */
+       peer = wpa_tdls_add_peer(sm, src_addr, &existing_peer);
+       if (peer == NULL)
+               goto error;
+
+       /* If found, use existing entry instead of adding a new one;
+        * how to handle the case where both ends initiate at the
+        * same time? */
+       if (existing_peer) {
+               if (peer->tpk_success) {
+                       wpa_printf(MSG_DEBUG, "TDLS: TDLS Setup Request while "
+                                  "direct link is enabled - tear down the "
+                                  "old link first");
+                       wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, peer->addr);
+                       wpa_tdls_peer_clear(sm, peer);
+               } else if (peer->initiator) {
+                       /*
+                        * An entry is already present, so check if we already
+                        * sent a TDLS Setup Request. If so, compare MAC
+                        * addresses and let the STA with the lower MAC address
+                        * continue as the initiator. The other negotiation is
+                        * terminated.
+                        */
+                       if (os_memcmp(sm->own_addr, src_addr, ETH_ALEN) < 0) {
+                               wpa_printf(MSG_DEBUG, "TDLS: Discard request "
+                                          "from peer with higher address "
+                                          MACSTR, MAC2STR(src_addr));
+                               return -1;
+                       } else {
+                               wpa_printf(MSG_DEBUG, "TDLS: Accept request "
+                                          "from peer with lower address "
+                                          MACSTR " (terminate previously "
+                                          "initiated negotiation",
+                                          MAC2STR(src_addr));
+                               wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK,
+                                                peer->addr);
+                               wpa_tdls_peer_clear(sm, peer);
+                       }
+               }
+       }
+
+       /* capability information */
+       peer->capability = WPA_GET_LE16(cpos);
+       cpos += 2;
 
        ielen = len - (cpos - buf); /* start of IE in buf */
        if (wpa_supplicant_parse_ies(cpos, ielen, &kde) < 0) {
-               wpa_printf(MSG_INFO, "TDLS: Failed to parse KDEs in TPK M1");
-               return -1;
+               wpa_printf(MSG_INFO, "TDLS: Failed to parse IEs in TPK M1");
+               goto error;
        }
 
        if (kde.lnkid == NULL || kde.lnkid_len < 3 * ETH_ALEN) {
-               wpa_printf(MSG_INFO, "TDLS: No Link Identifier IE in TPK M1");
-               return -1;
+               wpa_printf(MSG_INFO, "TDLS: No valid Link Identifier IE in "
+                          "TPK M1");
+               goto error;
        }
+       wpa_hexdump(MSG_DEBUG, "TDLS: Link ID Received from TPK M1",
+                   kde.lnkid, kde.lnkid_len);
        lnkid = (struct wpa_tdls_lnkid *) kde.lnkid;
        if (os_memcmp(sm->bssid, lnkid->bssid, ETH_ALEN) != 0) {
                wpa_printf(MSG_INFO, "TDLS: TPK M1 from diff BSS");
-               wpa_tdls_send_smk_error(sm, src_addr, WLAN_TDLS_SETUP_RESPONSE,
-                                       dtoken, WLAN_STATUS_NOT_IN_SAME_BSS);
-               return -1;
+               status = WLAN_STATUS_NOT_IN_SAME_BSS;
+               goto error;
        }
 
        wpa_printf(MSG_DEBUG, "TDLS: TPK M1 - TPK initiator " MACSTR,
                   MAC2STR(src_addr));
 
-       if (!wpa_tdls_get_privacy(sm))
-               goto skip_rsn;
+       if (copy_supp_rates(&kde, peer) < 0)
+               goto error;
 
-       if (kde.ftie == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No FTIE in TPK M1");
-               return -1;
+       if (copy_peer_ht_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_vht_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_ext_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_supp_channels(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_supp_oper_classes(&kde, peer) < 0)
+               goto error;
+
+       peer->qos_info = kde.qosinfo;
+
+       /* Overwrite with the qos_info obtained in WMM IE */
+       if (copy_peer_wmm_capab(&kde, peer) < 0)
+               goto error;
+
+       peer->aid = kde.aid;
+
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_CONCURRENT_INIT) {
+               peer = wpa_tdls_add_peer(sm, src_addr, NULL);
+               if (peer == NULL)
+                       goto error;
+               wpa_printf(MSG_DEBUG, "TDLS: Testing concurrent initiation of "
+                          "TDLS setup - send own request");
+               peer->initiator = 1;
+               wpa_tdls_send_tpk_m1(sm, peer);
        }
-       ftie = (struct wpa_tdls_ftie *) kde.ftie;
-       if (kde.rsn_ie == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No RSN IE in TPK M1");
-               return -1;
+
+       if ((tdls_testing & TDLS_TESTING_IGNORE_AP_PROHIBIT) &&
+           tdls_prohibited) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - ignore AP prohibition "
+                          "on TDLS");
+               tdls_prohibited = 0;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+
+       if (tdls_prohibited) {
+               wpa_printf(MSG_INFO, "TDLS: TDLS prohibited in this BSS");
+               status = WLAN_STATUS_REQUEST_DECLINED;
+               goto error;
+       }
+
+       if (!wpa_tdls_get_privacy(sm)) {
+               if (kde.rsn_ie) {
+                       wpa_printf(MSG_INFO, "TDLS: RSN IE in TPK M1 while "
+                                  "security is disabled");
+                       status = WLAN_STATUS_SECURITY_DISABLED;
+                       goto error;
+               }
+               goto skip_rsn;
+       }
+
+       if (kde.ftie == NULL || kde.ftie_len < sizeof(*ftie) ||
+           kde.rsn_ie == NULL) {
+               wpa_printf(MSG_INFO, "TDLS: No FTIE or RSN IE in TPK M1");
+               status = WLAN_STATUS_INVALID_PARAMETERS;
+               goto error;
        }
 
        if (kde.rsn_ie_len > TDLS_MAX_IE_LEN) {
                wpa_printf(MSG_INFO, "TDLS: Too long Initiator RSN IE in "
                           "TPK M1");
-               return -1;
+               status = WLAN_STATUS_INVALID_RSNIE;
+               goto error;
        }
 
        if (wpa_parse_wpa_ie_rsn(kde.rsn_ie, kde.rsn_ie_len, &ie) < 0) {
                wpa_printf(MSG_INFO, "TDLS: Failed to parse RSN IE in TPK M1");
-               return -1;
+               status = WLAN_STATUS_INVALID_RSNIE;
+               goto error;
        }
 
        cipher = ie.pairwise_cipher;
@@ -1045,64 +1820,50 @@ static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
                cipher = WPA_CIPHER_CCMP;
        } else {
                wpa_printf(MSG_INFO, "TDLS: No acceptable cipher in TPK M1");
-               wpa_tdls_send_smk_error(sm, src_addr, WLAN_TDLS_SETUP_RESPONSE,
-                                       dtoken,
-                                       WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID);
-               return -1;
+               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+               goto error;
        }
 
-skip_rsn:
-       /* Find existing entry and if found, use that instead of adding
-        * a new one; how to handle the case where both ends initiate at the
-        * same time? */
-       for (peer = sm->tdls; peer; peer = peer->next) {
-               if (os_memcmp(peer->addr, src_addr, ETH_ALEN) == 0)
-                       break;
+       if ((ie.capabilities &
+            (WPA_CAPABILITY_NO_PAIRWISE | WPA_CAPABILITY_PEERKEY_ENABLED)) !=
+           WPA_CAPABILITY_PEERKEY_ENABLED) {
+               wpa_printf(MSG_INFO, "TDLS: Invalid RSN Capabilities in "
+                          "TPK M1");
+               status = WLAN_STATUS_INVALID_RSN_IE_CAPAB;
+               goto error;
        }
 
-       if (peer == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No matching entry found for "
-                          "peer, creating one for " MACSTR,
-                          MAC2STR(src_addr));
-               peer = os_malloc(sizeof(*peer));
-               if (peer == NULL)
-                       return -1;
-               os_memset(peer, 0, sizeof(*peer));
-               os_memcpy(peer->addr, src_addr, ETH_ALEN);
-               peer->next = sm->tdls;
-               sm->tdls = peer;
-       } else {
-               /*
-                * An entry is already present, so check if a TPK_M1 Request
-                * had been sent.
-                * If so compare MAC address and let
-                *  - greater MAC continue to be initiator
-                *  - other MAC be Peer and process the Req.
-                */
-               if (peer->initiator) {
-                       if (os_memcmp(sm->own_addr, src_addr, ETH_ALEN) > 0) {
-                               wpa_printf(MSG_DEBUG, "TDLS: Dropping Request "
-                                          "from peer with smaller address "
-                                          MACSTR, MAC2STR(src_addr));
-                               return -1;
-                       } else {
-                               /*
-                                * If smaller node then accept the packet,
-                                * clear values and get ready to process this
-                                * Req.
-                                */
-                               wpa_printf(MSG_DEBUG, "TDLS: Accepting "
-                                          "Request from peer " MACSTR,
-                                          MAC2STR(src_addr));
-                               /* clear sm info and preserve the list */
-                               wpa_tdls_peer_free(sm, peer);
-                       }
+       /* Lifetime */
+       if (kde.key_lifetime == NULL) {
+               wpa_printf(MSG_INFO, "TDLS: No Key Lifetime IE in TPK M1");
+               status = WLAN_STATUS_UNACCEPTABLE_LIFETIME;
+               goto error;
+       }
+       timeoutie = (struct wpa_tdls_timeoutie *) kde.key_lifetime;
+       lifetime = WPA_GET_LE32(timeoutie->value);
+       wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime %u seconds", lifetime);
+       if (lifetime < 300) {
+               wpa_printf(MSG_INFO, "TDLS: Too short TPK lifetime");
+               status = WLAN_STATUS_UNACCEPTABLE_LIFETIME;
+               goto error;
+       }
+
+skip_rsn:
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_CONCURRENT_INIT) {
+               if (os_memcmp(sm->own_addr, peer->addr, ETH_ALEN) < 0) {
+                       /*
+                        * The request frame from us is going to win, so do not
+                        * replace information based on this request frame from
+                        * the peer.
+                        */
+                       goto skip_rsn_check;
                }
        }
+#endif /* CONFIG_TDLS_TESTING */
 
        peer->initiator = 0; /* Need to check */
        peer->dtoken = dtoken;
-       os_memcpy(peer->lnkid, (u8 *) lnkid, sizeof(struct wpa_tdls_lnkid));
 
        if (!wpa_tdls_get_privacy(sm)) {
                peer->rsnie_i_len = 0;
@@ -1111,16 +1872,27 @@ skip_rsn:
                goto skip_rsn_check;
        }
 
-       os_memcpy(peer->inonce, ftie->Snonce, WPA_NONCE_LEN);
+       ftie = (struct wpa_tdls_ftie *) kde.ftie;
        os_memcpy(peer->rsnie_i, kde.rsn_ie, kde.rsn_ie_len);
        peer->rsnie_i_len = kde.rsn_ie_len;
        peer->cipher = cipher;
 
-       if (os_get_random(peer->pnonce, WPA_NONCE_LEN)) {
-               wpa_msg(sm->ctx->ctx, MSG_WARNING,
-                       "TDLS: Failed to get random data for PNonce");
-               wpa_tdls_peer_free(sm, peer);
-               return -1;
+       if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) {
+               /*
+                * There is no point in updating the RNonce for every obtained
+                * TPK M1 frame (e.g., retransmission due to timeout) with the
+                * same INonce (SNonce in FTIE). However, if the TPK M1 is
+                * retransmitted with a different INonce, update the RNonce
+                * since this is for a new TDLS session.
+                */
+               wpa_printf(MSG_DEBUG,
+                          "TDLS: New TPK M1 INonce - generate new RNonce");
+               os_memcpy(peer->inonce, ftie->Snonce, WPA_NONCE_LEN);
+               if (os_get_random(peer->rnonce, WPA_NONCE_LEN)) {
+                       wpa_msg(sm->ctx->ctx, MSG_WARNING,
+                               "TDLS: Failed to get random data for responder nonce");
+                       goto error;
+               }
        }
 
 #if 0
@@ -1165,41 +1937,79 @@ skip_rsn:
        os_memcpy(peer->rsnie_p, peer->rsnie_i, peer->rsnie_i_len);
        peer->rsnie_p_len = peer->rsnie_i_len;
 
-       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE for PTK handshake",
+       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE for TPK handshake",
                    peer->rsnie_p, peer->rsnie_p_len);
 
-       /* Lifetime */
-       if (kde.key_lifetime == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No Key Lifetime IE in TPK M1");
-               return -1;
-       }
-       timeoutie = (struct wpa_tdls_timeoutie *) kde.key_lifetime;
-       lifetime = WPA_GET_LE32(timeoutie->value);
-       wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime %u seconds", lifetime);
-       if (lifetime < 300)
-               lifetime = 300; /* minimum seconds */
        peer->lifetime = lifetime;
 
-       /* generate SMK using Nonce */
        wpa_tdls_generate_tpk(peer, sm->own_addr, sm->bssid);
 
 skip_rsn_check:
+       /* add the peer to the driver as a "setup in progress" peer */
+       if (wpa_sm_tdls_peer_addset(sm, peer->addr, 1, peer->aid,
+                                   peer->capability,
+                                   peer->supp_rates, peer->supp_rates_len,
+                                   peer->ht_capabilities,
+                                   peer->vht_capabilities,
+                                   peer->qos_info, peer->ext_capab,
+                                   peer->ext_capab_len,
+                                   peer->supp_channels,
+                                   peer->supp_channels_len,
+                                   peer->supp_oper_classes,
+                                   peer->supp_oper_classes_len))
+               goto error;
+
+       peer->tpk_in_progress = 1;
+
        wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Setup Response / TPK M2");
-       wpa_tdls_send_tpk_m2(sm, src_addr, dtoken, lnkid, peer);
+       if (wpa_tdls_send_tpk_m2(sm, src_addr, dtoken, lnkid, peer) < 0) {
+               wpa_sm_tdls_oper(sm, TDLS_DISABLE_LINK, peer->addr);
+               goto error;
+       }
 
        return 0;
+
+error:
+       wpa_tdls_send_error(sm, src_addr, WLAN_TDLS_SETUP_RESPONSE, dtoken,
+                           status);
+       if (peer)
+               wpa_tdls_peer_free(sm, peer);
+       return -1;
 }
 
 
-static void wpa_tdls_enable_link(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
+static int wpa_tdls_enable_link(struct wpa_sm *sm, struct wpa_tdls_peer *peer)
 {
        peer->tpk_success = 1;
+       peer->tpk_in_progress = 0;
        eloop_cancel_timeout(wpa_tdls_tpk_timeout, sm, peer);
        if (wpa_tdls_get_privacy(sm)) {
-               eloop_register_timeout(peer->lifetime, 0, wpa_tdls_tpk_timeout,
+               u32 lifetime = peer->lifetime;
+               /*
+                * Start the initiator process a bit earlier to avoid race
+                * condition with the responder sending teardown request.
+                */
+               if (lifetime > 3 && peer->initiator)
+                       lifetime -= 3;
+               eloop_register_timeout(lifetime, 0, wpa_tdls_tpk_timeout,
                                       sm, peer);
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_NO_TPK_EXPIRATION) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - disable TPK "
+                          "expiration");
+               eloop_cancel_timeout(wpa_tdls_tpk_timeout, sm, peer);
+       }
+#endif /* CONFIG_TDLS_TESTING */
        }
-       wpa_sm_tdls_oper(sm, TDLS_ENABLE_LINK, peer->addr);
+
+       if (peer->reconfig_key && wpa_tdls_set_key(sm, peer) < 0) {
+               wpa_printf(MSG_INFO, "TDLS: Could not configure key to the "
+                          "driver");
+               return -1;
+       }
+       peer->reconfig_key = 0;
+
+       return wpa_sm_tdls_oper(sm, TDLS_ENABLE_LINK, peer->addr);
 }
 
 
@@ -1218,6 +2028,7 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
        int ielen;
        u16 status;
        const u8 *pos;
+       int ret = 0;
 
        wpa_printf(MSG_DEBUG, "TDLS: Received TDLS Setup Response / TPK M2 "
                   "(Peer " MACSTR ")", MAC2STR(src_addr));
@@ -1230,40 +2041,69 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
                           "TPK M2: " MACSTR, MAC2STR(src_addr));
                return -1;
        }
-       wpa_tdls_smkretry_timeout_cancel(sm, peer, WLAN_TDLS_SETUP_REQUEST);
+       if (!peer->initiator) {
+               /*
+                * This may happen if both devices try to initiate TDLS at the
+                * same time and we accept the TPK M1 from the peer in
+                * wpa_tdls_process_tpk_m1() and clear our previous state.
+                */
+               wpa_printf(MSG_INFO, "TDLS: We were not the initiator, so "
+                          "ignore TPK M2 from " MACSTR, MAC2STR(src_addr));
+               return -1;
+       }
+       wpa_tdls_tpk_retry_timeout_cancel(sm, peer, WLAN_TDLS_SETUP_REQUEST);
 
-       if (len < 3 + 2 + 1)
+       if (len < 3 + 2 + 1) {
+               wpa_tdls_disable_peer_link(sm, peer);
                return -1;
+       }
+
        pos = buf;
        pos += 1 /* pkt_type */ + 1 /* Category */ + 1 /* Action */;
        status = WPA_GET_LE16(pos);
        pos += 2 /* status code */;
 
-       if (status != 0) {
+       if (status != WLAN_STATUS_SUCCESS) {
                wpa_printf(MSG_INFO, "TDLS: Status code in TPK M2: %u",
                           status);
+               wpa_tdls_disable_peer_link(sm, peer);
                return -1;
        }
 
+       status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+
        /* TODO: need to verify dialog token matches here or in kernel */
-       dtoken = *pos++; /* dialogue token */
+       dtoken = *pos++; /* dialog token */
 
-       wpa_printf(MSG_DEBUG, "TDLS: Dialogue Token in TPK M2 %d", dtoken);
+       wpa_printf(MSG_DEBUG, "TDLS: Dialog Token in TPK M2 %d", dtoken);
 
-       if (len < 3 + 2 + 1 + 2)
+       if (len < 3 + 2 + 1 + 2) {
+               wpa_tdls_disable_peer_link(sm, peer);
                return -1;
-       pos += 2; /* capability information */
+       }
+
+       /* capability information */
+       peer->capability = WPA_GET_LE16(pos);
+       pos += 2;
 
        ielen = len - (pos - buf); /* start of IE in buf */
        if (wpa_supplicant_parse_ies(pos, ielen, &kde) < 0) {
                wpa_printf(MSG_INFO, "TDLS: Failed to parse IEs in TPK M2");
-               return -1;
+               goto error;
        }
 
+#ifdef CONFIG_TDLS_TESTING
+       if (tdls_testing & TDLS_TESTING_DECLINE_RESP) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - decline response");
+               status = WLAN_STATUS_REQUEST_DECLINED;
+               goto error;
+       }
+#endif /* CONFIG_TDLS_TESTING */
+
        if (kde.lnkid == NULL || kde.lnkid_len < 3 * ETH_ALEN) {
                wpa_printf(MSG_INFO, "TDLS: No valid Link Identifier IE in "
                           "TPK M2");
-               return -1;
+               goto error;
        }
        wpa_hexdump(MSG_DEBUG, "TDLS: Link ID Received from TPK M2",
                    kde.lnkid, kde.lnkid_len);
@@ -1271,24 +2111,64 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
 
        if (os_memcmp(sm->bssid, lnkid->bssid, ETH_ALEN) != 0) {
                wpa_printf(MSG_INFO, "TDLS: TPK M2 from different BSS");
-               wpa_tdls_send_smk_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM,
-                                       dtoken, WLAN_STATUS_NOT_IN_SAME_BSS);
-               return -1;
+               status = WLAN_STATUS_NOT_IN_SAME_BSS;
+               goto error;
        }
 
+       if (copy_supp_rates(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_ht_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_vht_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_ext_capab(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_supp_channels(&kde, peer) < 0)
+               goto error;
+
+       if (copy_peer_supp_oper_classes(&kde, peer) < 0)
+               goto error;
+
+       peer->qos_info = kde.qosinfo;
+
+       /* Overwrite with the qos_info obtained in WMM IE */
+       if (copy_peer_wmm_capab(&kde, peer) < 0)
+               goto error;
+
+       peer->aid = kde.aid;
+
        if (!wpa_tdls_get_privacy(sm)) {
                peer->rsnie_p_len = 0;
                peer->cipher = WPA_CIPHER_NONE;
                goto skip_rsn;
        }
 
-       if (kde.rsn_ie == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No RSN IE in TPK M2");
-               return -1;
+       if (kde.ftie == NULL || kde.ftie_len < sizeof(*ftie) ||
+           kde.rsn_ie == NULL) {
+               wpa_printf(MSG_INFO, "TDLS: No FTIE or RSN IE in TPK M2");
+               status = WLAN_STATUS_INVALID_PARAMETERS;
+               goto error;
        }
-       wpa_hexdump(MSG_DEBUG, "TDLS: RSNIE Received from TPK M2",
+       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE Received from TPK M2",
                    kde.rsn_ie, kde.rsn_ie_len);
 
+       if (kde.rsn_ie_len > TDLS_MAX_IE_LEN) {
+               wpa_printf(MSG_INFO,
+                          "TDLS: Too long Responder RSN IE in TPK M2");
+               status = WLAN_STATUS_INVALID_RSNIE;
+               goto error;
+       }
+
+       /*
+        * FIX: bitwise comparison of RSN IE is not the correct way of
+        * validation this. It can be different, but certain fields must
+        * match. Since we list only a single pairwise cipher in TPK M1, the
+        * memcmp is likely to work in most cases, though.
+        */
        if (kde.rsn_ie_len != peer->rsnie_i_len ||
            os_memcmp(peer->rsnie_i, kde.rsn_ie, peer->rsnie_i_len) != 0) {
                wpa_printf(MSG_INFO, "TDLS: RSN IE in TPK M2 does "
@@ -1297,48 +2177,39 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
                            peer->rsnie_i, peer->rsnie_i_len);
                wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE Received from TPK M2",
                            kde.rsn_ie, kde.rsn_ie_len);
-               wpa_tdls_send_smk_error(
-                       sm, src_addr,
-                       WLAN_TDLS_SETUP_CONFIRM, dtoken,
-                       WLAN_STATUS_UNSUPPORTED_RSN_IE_VERSION);
-
-               return -1;
+               status = WLAN_STATUS_INVALID_RSNIE;
+               goto error;
        }
 
        if (wpa_parse_wpa_ie_rsn(kde.rsn_ie, kde.rsn_ie_len, &ie) < 0) {
                wpa_printf(MSG_INFO, "TDLS: Failed to parse RSN IE in TPK M2");
-               return -1;
+               status = WLAN_STATUS_INVALID_RSNIE;
+               goto error;
        }
 
        cipher = ie.pairwise_cipher;
-       if (cipher & WPA_CIPHER_CCMP) {
+       if (cipher == WPA_CIPHER_CCMP) {
                wpa_printf(MSG_DEBUG, "TDLS: Using CCMP for direct link");
                cipher = WPA_CIPHER_CCMP;
        } else {
                wpa_printf(MSG_INFO, "TDLS: No acceptable cipher in TPK M2");
-               wpa_tdls_send_smk_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM,
-                                       dtoken,
-                                       WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID);
-               return -1;
+               status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
+               goto error;
        }
 
-       if (kde.ftie == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No FTIE in TPK M2");
-               return -1;
-       }
        wpa_hexdump(MSG_DEBUG, "TDLS: FTIE Received from TPK M2",
                    kde.ftie, sizeof(*ftie));
        ftie = (struct wpa_tdls_ftie *) kde.ftie;
 
        if (!os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) == 0) {
-               wpa_printf(MSG_INFO, "TDLS: Key Nonce in TPK M2 does "
-                          "not match with INonce used in TPK M1");
+               wpa_printf(MSG_INFO, "TDLS: FTIE SNonce in TPK M2 does "
+                          "not match with FTIE SNonce used in TPK M1");
+               /* Silently discard the frame */
                return -1;
        }
 
-       /* P-Nonce and RSN_IE */
-       os_memcpy(peer->lnkid, (u8 *) lnkid, sizeof(struct wpa_tdls_lnkid));
-       os_memcpy(peer->pnonce, ftie->Anonce, WPA_NONCE_LEN);
+       /* Responder Nonce and RSN IE */
+       os_memcpy(peer->rnonce, ftie->Anonce, WPA_NONCE_LEN);
        os_memcpy(peer->rsnie_p, kde.rsn_ie, kde.rsn_ie_len);
        peer->rsnie_p_len = kde.rsn_ie_len;
        peer->cipher = cipher;
@@ -1346,7 +2217,8 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
        /* Lifetime */
        if (kde.key_lifetime == NULL) {
                wpa_printf(MSG_INFO, "TDLS: No Key Lifetime IE in TPK M2");
-               return -1;
+               status = WLAN_STATUS_UNACCEPTABLE_LIFETIME;
+               goto error;
        }
        timeoutie = (struct wpa_tdls_timeoutie *) kde.key_lifetime;
        lifetime = WPA_GET_LE32(timeoutie->value);
@@ -1355,35 +2227,74 @@ static int wpa_tdls_process_tpk_m2(struct wpa_sm *sm, const u8 *src_addr,
        if (lifetime != peer->lifetime) {
                wpa_printf(MSG_INFO, "TDLS: Unexpected TPK lifetime %u in "
                           "TPK M2 (expected %u)", lifetime, peer->lifetime);
-               wpa_tdls_send_smk_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM,
-                                       dtoken,
-                                       WLAN_STATUS_UNACCEPTABLE_LIFETIME);
-               return -1;
+               status = WLAN_STATUS_UNACCEPTABLE_LIFETIME;
+               goto error;
        }
 
-       /* generate SMK using Nonce */
        wpa_tdls_generate_tpk(peer, sm->own_addr, sm->bssid);
 
        /* Process MIC check to see if TPK M2 is right */
        if (wpa_supplicant_verify_tdls_mic(2, peer, (u8 *) lnkid,
                                           (u8 *) timeoutie, ftie) < 0) {
+               /* Discard the frame */
                wpa_tdls_del_key(sm, peer);
-               wpa_tdls_peer_free(sm, peer);
+               wpa_tdls_disable_peer_link(sm, peer);
                return -1;
        }
 
-       wpa_tdls_set_key(sm, peer);
-
+       if (wpa_tdls_set_key(sm, peer) < 0) {
+               /*
+                * Some drivers may not be able to config the key prior to full
+                * STA entry having been configured.
+                */
+               wpa_printf(MSG_DEBUG, "TDLS: Try to configure TPK again after "
+                          "STA entry is complete");
+               peer->reconfig_key = 1;
+       }
+
 skip_rsn:
        peer->dtoken = dtoken;
 
+       /* add supported rates, capabilities, and qos_info to the TDLS peer */
+       if (wpa_sm_tdls_peer_addset(sm, peer->addr, 0, peer->aid,
+                                   peer->capability,
+                                   peer->supp_rates, peer->supp_rates_len,
+                                   peer->ht_capabilities,
+                                   peer->vht_capabilities,
+                                   peer->qos_info, peer->ext_capab,
+                                   peer->ext_capab_len,
+                                   peer->supp_channels,
+                                   peer->supp_channels_len,
+                                   peer->supp_oper_classes,
+                                   peer->supp_oper_classes_len) < 0)
+               goto error;
+
        wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Setup Confirm / "
                   "TPK Handshake Message 3");
-       wpa_tdls_send_tpk_m3(sm, src_addr, dtoken, lnkid, peer);
+       if (wpa_tdls_send_tpk_m3(sm, src_addr, dtoken, lnkid, peer) < 0)
+               goto error;
 
-       wpa_tdls_enable_link(sm, peer);
+       if (!peer->tpk_success) {
+               /*
+                * Enable Link only when tpk_success is 0, signifying that this
+                * processing of TPK M2 frame is not because of a retransmission
+                * during TDLS setup handshake.
+                */
+               ret = wpa_tdls_enable_link(sm, peer);
+               if (ret < 0) {
+                       wpa_printf(MSG_DEBUG, "TDLS: Could not enable link");
+                       wpa_tdls_do_teardown(
+                               sm, peer,
+                               WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
+               }
+       }
+       return ret;
 
-       return 0;
+error:
+       wpa_tdls_send_error(sm, src_addr, WLAN_TDLS_SETUP_CONFIRM, dtoken,
+                           status);
+       wpa_tdls_disable_peer_link(sm, peer);
+       return -1;
 }
 
 
@@ -1399,9 +2310,10 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
        u16 status;
        const u8 *pos;
        u32 lifetime;
+       int ret = 0;
 
-       wpa_printf(MSG_DEBUG, "RSN: Received TPK M3 (Peer " MACSTR ")",
-                  MAC2STR(src_addr));
+       wpa_printf(MSG_DEBUG, "TDLS: Received TDLS Setup Confirm / TPK M3 "
+                  "(Peer " MACSTR ")", MAC2STR(src_addr));
        for (peer = sm->tdls; peer; peer = peer->next) {
                if (os_memcmp(peer->addr, src_addr, ETH_ALEN) == 0)
                        break;
@@ -1411,8 +2323,10 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
                           "TPK M3: " MACSTR, MAC2STR(src_addr));
                return -1;
        }
-       wpa_tdls_smkretry_timeout_cancel(sm, peer, WLAN_TDLS_SETUP_RESPONSE);
+       wpa_tdls_tpk_retry_timeout_cancel(sm, peer, WLAN_TDLS_SETUP_RESPONSE);
 
+       if (len < 3 + 3)
+               goto error;
        pos = buf;
        pos += 1 /* pkt_type */ + 1 /* Category */ + 1 /* Action */;
 
@@ -1421,19 +2335,26 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
        if (status != 0) {
                wpa_printf(MSG_INFO, "TDLS: Status code in TPK M3: %u",
                           status);
-               return -1;
+               goto error;
        }
-       pos += 2 /* status code */ + 1 /* dialogue token */;
+       pos += 2 /* status code */ + 1 /* dialog token */;
 
        ielen = len - (pos - buf); /* start of IE in buf */
+
+       /*
+        * Don't reject the message if failing to parse IEs. The IEs we need are
+        * explicitly checked below. Some APs piggy-back broken IEs to the end
+        * of a TDLS Confirm packet, which will fail the link if we don't ignore
+        * this error.
+        */
        if (wpa_supplicant_parse_ies((const u8 *) pos, ielen, &kde) < 0) {
-               wpa_printf(MSG_INFO, "TDLS: Failed to parse KDEs in TPK M3");
-               return -1;
+               wpa_printf(MSG_DEBUG,
+                          "TDLS: Failed to parse KDEs in TPK M3 - ignore as an interop workaround");
        }
 
        if (kde.lnkid == NULL || kde.lnkid_len < 3 * ETH_ALEN) {
                wpa_printf(MSG_INFO, "TDLS: No Link Identifier IE in TPK M3");
-               return -1;
+               goto error;
        }
        wpa_hexdump(MSG_DEBUG, "TDLS: Link ID Received from TPK M3",
                    (u8 *) kde.lnkid, kde.lnkid_len);
@@ -1441,42 +2362,48 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
 
        if (os_memcmp(sm->bssid, lnkid->bssid, ETH_ALEN) != 0) {
                wpa_printf(MSG_INFO, "TDLS: TPK M3 from diff BSS");
-               return -1;
+               goto error;
        }
 
        if (!wpa_tdls_get_privacy(sm))
                goto skip_rsn;
 
-       if (kde.ftie == NULL) {
+       if (kde.ftie == NULL || kde.ftie_len < sizeof(*ftie)) {
                wpa_printf(MSG_INFO, "TDLS: No FTIE in TPK M3");
-               return -1;
+               goto error;
        }
        wpa_hexdump(MSG_DEBUG, "TDLS: FTIE Received from TPK M3",
-                   (u8 *) ftie, sizeof(*ftie));
+                   kde.ftie, sizeof(*ftie));
        ftie = (struct wpa_tdls_ftie *) kde.ftie;
 
        if (kde.rsn_ie == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No RSN IE KDE in TPK M3");
-               return -1;
+               wpa_printf(MSG_INFO, "TDLS: No RSN IE in TPK M3");
+               goto error;
        }
-       wpa_hexdump(MSG_DEBUG, "TDLS: RSNIE Received from TPK M3",
+       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE Received from TPK M3",
                    kde.rsn_ie, kde.rsn_ie_len);
+       if (kde.rsn_ie_len != peer->rsnie_p_len ||
+           os_memcmp(kde.rsn_ie, peer->rsnie_p, peer->rsnie_p_len) != 0) {
+               wpa_printf(MSG_INFO, "TDLS: RSN IE in TPK M3 does not match "
+                          "with the one sent in TPK M2");
+               goto error;
+       }
 
-       if (!os_memcmp(peer->pnonce, ftie->Anonce, WPA_NONCE_LEN) == 0) {
-               wpa_printf(MSG_INFO, "TDLS: PNonce in TPK M3 does "
-                          "not match with PNonce used in TPK M2");
-               return -1;
+       if (!os_memcmp(peer->rnonce, ftie->Anonce, WPA_NONCE_LEN) == 0) {
+               wpa_printf(MSG_INFO, "TDLS: FTIE ANonce in TPK M3 does "
+                          "not match with FTIE ANonce used in TPK M2");
+               goto error;
        }
 
        if (!os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) == 0) {
-               wpa_printf(MSG_INFO, "TDLS: INonce in TPK M3 did not "
-                          "match with the one received in TPK M1");
-               return -1;
+               wpa_printf(MSG_INFO, "TDLS: FTIE SNonce in TPK M3 does not "
+                          "match with FTIE SNonce used in TPK M1");
+               goto error;
        }
 
        if (kde.key_lifetime == NULL) {
                wpa_printf(MSG_INFO, "TDLS: No Key Lifetime IE in TPK M3");
-               return -1;
+               goto error;
        }
        timeoutie = (struct wpa_tdls_timeoutie *) kde.key_lifetime;
        wpa_hexdump(MSG_DEBUG, "TDLS: Timeout IE Received from TPK M3",
@@ -1487,23 +2414,58 @@ static int wpa_tdls_process_tpk_m3(struct wpa_sm *sm, const u8 *src_addr,
        if (lifetime != peer->lifetime) {
                wpa_printf(MSG_INFO, "TDLS: Unexpected TPK lifetime %u in "
                           "TPK M3 (expected %u)", lifetime, peer->lifetime);
-               return -1;
+               goto error;
        }
 
        if (wpa_supplicant_verify_tdls_mic(3, peer, (u8 *) lnkid,
                                           (u8 *) timeoutie, ftie) < 0) {
                wpa_tdls_del_key(sm, peer);
-               wpa_tdls_peer_free(sm, peer);
-               return -1;
+               goto error;
        }
 
-       if (wpa_tdls_set_key(sm, peer) < 0)
-               return -1;
+       if (wpa_tdls_set_key(sm, peer) < 0) {
+               /*
+                * Some drivers may not be able to config the key prior to full
+                * STA entry having been configured.
+                */
+               wpa_printf(MSG_DEBUG, "TDLS: Try to configure TPK again after "
+                          "STA entry is complete");
+               peer->reconfig_key = 1;
+       }
 
 skip_rsn:
-       wpa_tdls_enable_link(sm, peer);
-
-       return 0;
+       /* add supported rates, capabilities, and qos_info to the TDLS peer */
+       if (wpa_sm_tdls_peer_addset(sm, peer->addr, 0, peer->aid,
+                                   peer->capability,
+                                   peer->supp_rates, peer->supp_rates_len,
+                                   peer->ht_capabilities,
+                                   peer->vht_capabilities,
+                                   peer->qos_info, peer->ext_capab,
+                                   peer->ext_capab_len,
+                                   peer->supp_channels,
+                                   peer->supp_channels_len,
+                                   peer->supp_oper_classes,
+                                   peer->supp_oper_classes_len) < 0)
+               goto error;
+
+       if (!peer->tpk_success) {
+               /*
+                * Enable Link only when tpk_success is 0, signifying that this
+                * processing of TPK M3 frame is not because of a retransmission
+                * during TDLS setup handshake.
+                */
+               ret = wpa_tdls_enable_link(sm, peer);
+               if (ret < 0) {
+                       wpa_printf(MSG_DEBUG, "TDLS: Could not enable link");
+                       wpa_tdls_do_teardown(
+                               sm, peer,
+                               WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
+               }
+       }
+       return ret;
+error:
+       wpa_tdls_disable_peer_link(sm, peer);
+       return -1;
 }
 
 
@@ -1515,7 +2477,7 @@ static u8 * wpa_add_tdls_timeoutie(u8 *pos, u8 *ie, size_t ie_len, u32 tsecs)
        lifetime->ie_type = WLAN_EID_TIMEOUT_INTERVAL;
        lifetime->ie_len = sizeof(struct wpa_tdls_timeoutie) - 2;
        lifetime->interval_type = WLAN_TIMEOUT_KEY_LIFETIME;
-       WPA_PUT_LE32(lifetime->value, tsecs); /* dot11RSNAConfigSMKLifetime */
+       WPA_PUT_LE32(lifetime->value, tsecs);
        os_memcpy(pos, ie, ie_len);
        return pos + ie_len;
 }
@@ -1532,198 +2494,76 @@ static u8 * wpa_add_tdls_timeoutie(u8 *pos, u8 *ie, size_t ie_len, u32 tsecs)
  */
 int wpa_tdls_start(struct wpa_sm *sm, const u8 *addr)
 {
-       u16 buf_len;
-       struct wpa_tdls_ftie *ftie;
-       u8 *rbuf, *pos, *count_pos;
-       u16 count;
-       struct rsn_ie_hdr *hdr;
        struct wpa_tdls_peer *peer;
-       struct wpa_tdls_timeoutie timeoutie;
-       u16 rsn_capab;
-
-       /* Find existing entry and if found, use that instead of adding
-        * a new one */
-       for (peer = sm->tdls; peer; peer = peer->next) {
-               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
-                       break;
-       }
-
-       if (peer == NULL) {
-               wpa_printf(MSG_INFO, "TDLS: No matching entry found for "
-                          "peer, creating one for " MACSTR, MAC2STR(addr));
-               peer = os_malloc(sizeof(*peer));
-               if (peer == NULL)
-                       return -1;
-               os_memset(peer, 0, sizeof(*peer));
-               os_memcpy(peer->addr, addr, ETH_ALEN);
-               peer->next = sm->tdls;
-               sm->tdls = peer;
-       }
-
-       peer->initiator = 1;
-
-       if (!wpa_tdls_get_privacy(sm)) {
-               wpa_printf(MSG_DEBUG, "TDLS: No security used on the link");
-               peer->rsnie_i_len = 0;
-               goto skip_rsnie;
-       }
+       int tdls_prohibited = sm->tdls_prohibited;
 
-       /*
-        * TPK Handshake Message 1:
-        * FTIE: ANonce=0, SNonce=nonce MIC=0, DataKDs=(RSNIE_I,
-        * Timeout Interval IE))
-        */
-
-       /* Filling RSN IE */
-       hdr = (struct rsn_ie_hdr *) peer->rsnie_i;
-       hdr->elem_id = WLAN_EID_RSN;
-       WPA_PUT_LE16(hdr->version, RSN_VERSION);
-
-       pos = (u8 *) (hdr + 1);
-       RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_NO_GROUP_ADDRESSED);
-       pos += RSN_SELECTOR_LEN;
-       count_pos = pos;
-       pos += 2;
-
-       count = 0;
-
-       /*
-        * AES-CCMP is the default Encryption preferred for TDLS, so
-        * RSN IE is filled only with CCMP CIPHER
-        * Note: TKIP is not used to encrypt TDLS link.
-        *
-        * Regardless of the cipher used on the AP connection, select CCMP
-        * here.
-        */
-       RSN_SELECTOR_PUT(pos, RSN_CIPHER_SUITE_CCMP);
-       pos += RSN_SELECTOR_LEN;
-       count++;
-
-       WPA_PUT_LE16(count_pos, count);
-
-       WPA_PUT_LE16(pos, 1);
-       pos += 2;
-       RSN_SELECTOR_PUT(pos, RSN_AUTH_KEY_MGMT_TPK_HANDSHAKE);
-       pos += RSN_SELECTOR_LEN;
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return -1;
 
-       rsn_capab = WPA_CAPABILITY_PEERKEY_ENABLED;
-       rsn_capab |= RSN_NUM_REPLAY_COUNTERS_16 << 2;
-#ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_ALT_RSN_IE) {
-               wpa_printf(MSG_DEBUG, "TDLS: Use alternative RSN IE for "
-                          "testing");
-               rsn_capab = WPA_CAPABILITY_PEERKEY_ENABLED;
-       }
-#endif /* CONFIG_TDLS_TESTING */
-       WPA_PUT_LE16(pos, rsn_capab);
-       pos += 2;
 #ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_ALT_RSN_IE) {
-               /* Number of PMKIDs */
-               *pos++ = 0x00;
-               *pos++ = 0x00;
+       if ((tdls_testing & TDLS_TESTING_IGNORE_AP_PROHIBIT) &&
+           tdls_prohibited) {
+               wpa_printf(MSG_DEBUG, "TDLS: Testing - ignore AP prohibition "
+                          "on TDLS");
+               tdls_prohibited = 0;
        }
 #endif /* CONFIG_TDLS_TESTING */
 
-       hdr->len = (pos - peer->rsnie_i) - 2;
-       peer->rsnie_i_len = pos - peer->rsnie_i;
-       wpa_hexdump(MSG_DEBUG, "TDLS: RSN IE for TPK handshake",
-                   peer->rsnie_i, peer->rsnie_i_len);
+       if (tdls_prohibited) {
+               wpa_printf(MSG_DEBUG, "TDLS: TDLS is prohibited in this BSS - "
+                          "reject request to start setup");
+               return -1;
+       }
 
-skip_rsnie:
-       buf_len = 0;
-       if (wpa_tdls_get_privacy(sm))
-               buf_len += peer->rsnie_i_len + sizeof(struct wpa_tdls_ftie) +
-                       sizeof(struct wpa_tdls_timeoutie);
-#ifdef CONFIG_TDLS_TESTING
-       if (wpa_tdls_get_privacy(sm) &&
-           (tdls_testing & TDLS_TESTING_LONG_FRAME))
-               buf_len += 170;
-       if (tdls_testing & TDLS_TESTING_DIFF_BSSID)
-               buf_len += sizeof(struct wpa_tdls_lnkid);
-#endif /* CONFIG_TDLS_TESTING */
-       rbuf = os_zalloc(buf_len + 1);
-       if (rbuf == NULL) {
-               wpa_tdls_peer_free(sm, peer);
+       peer = wpa_tdls_add_peer(sm, addr, NULL);
+       if (peer == NULL)
                return -1;
+
+       if (peer->tpk_in_progress) {
+               wpa_printf(MSG_DEBUG, "TDLS: Setup is already in progress with the peer");
+               return 0;
        }
-       pos = rbuf;
 
-       if (!wpa_tdls_get_privacy(sm))
-               goto skip_ies;
+       peer->initiator = 1;
 
-       /* Initiator RSN IE */
-       pos = wpa_add_ie(pos, peer->rsnie_i, peer->rsnie_i_len);
+       /* add the peer to the driver as a "setup in progress" peer */
+       wpa_sm_tdls_peer_addset(sm, peer->addr, 1, 0, 0, NULL, 0, NULL, NULL, 0,
+                               NULL, 0, NULL, 0, NULL, 0);
 
-       ftie = (struct wpa_tdls_ftie *) pos;
-       ftie->ie_type = WLAN_EID_FAST_BSS_TRANSITION;
-       ftie->ie_len = sizeof(struct wpa_tdls_ftie) - 2;
+       peer->tpk_in_progress = 1;
 
-       if (os_get_random(peer->inonce, WPA_NONCE_LEN)) {
-               wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-                       "WPA: Failed to get random data for INonce");
-               os_free(rbuf);
-               wpa_tdls_peer_free(sm, peer);
+       if (wpa_tdls_send_tpk_m1(sm, peer) < 0) {
+               wpa_tdls_disable_peer_link(sm, peer);
                return -1;
        }
-       os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
-       wpa_hexdump(MSG_DEBUG, "TDLS: INonce for TPK handshake",
-                   ftie->Snonce, WPA_NONCE_LEN);
-
-       wpa_hexdump(MSG_DEBUG, "TDLS: FTIE for TPK Handshake M1",
-                   (u8 *) ftie, sizeof(struct wpa_tdls_ftie));
 
-       pos = (u8 *) (ftie + 1);
+       return 0;
+}
 
-#ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_LONG_FRAME) {
-               wpa_printf(MSG_DEBUG, "TDLS: Testing - add extra subelem to "
-                          "FTIE");
-               ftie->ie_len += 170;
-               *pos++ = 255; /* FTIE subelem */
-               *pos++ = 168; /* FTIE subelem length */
-               pos += 168;
-       }
-#endif /* CONFIG_TDLS_TESTING */
 
-       /* Lifetime */
-       peer->lifetime = TPK_LIFETIME;
-#ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_SHORT_LIFETIME) {
-               wpa_printf(MSG_DEBUG, "TDLS: Testing - use short TPK "
-                          "lifetime");
-               peer->lifetime = 301;
-       }
-#endif /* CONFIG_TDLS_TESTING */
-       pos = wpa_add_tdls_timeoutie(pos, (u8 *) &timeoutie,
-                                    sizeof(timeoutie), peer->lifetime);
-       wpa_printf(MSG_DEBUG, "TDLS: TPK lifetime %u seconds", peer->lifetime);
+void wpa_tdls_remove(struct wpa_sm *sm, const u8 *addr)
+{
+       struct wpa_tdls_peer *peer;
 
-skip_ies:
+       if (sm->tdls_disabled || !sm->tdls_supported)
+               return;
 
-#ifdef CONFIG_TDLS_TESTING
-       if (tdls_testing & TDLS_TESTING_DIFF_BSSID) {
-               wpa_printf(MSG_DEBUG, "TDLS: Testing - use incorrect BSSID in "
-                          "Link Identifier");
-               struct wpa_tdls_lnkid *l = (struct wpa_tdls_lnkid *) pos;
-               l->ie_type = WLAN_EID_LINK_ID;
-               l->ie_len = 3 * ETH_ALEN;
-               os_memcpy(l->bssid, sm->bssid, ETH_ALEN);
-               l->bssid[5] ^= 0x01;
-               os_memcpy(l->init_sta, sm->own_addr, ETH_ALEN);
-               os_memcpy(l->resp_sta, addr, ETH_ALEN);
-               pos += sizeof(*l);
+       for (peer = sm->tdls; peer; peer = peer->next) {
+               if (os_memcmp(peer->addr, addr, ETH_ALEN) == 0)
+                       break;
        }
-#endif /* CONFIG_TDLS_TESTING */
 
-       wpa_printf(MSG_DEBUG, "TDLS: Sending TDLS Setup Request / TPK "
-                  "Handshake Message 1 (peer " MACSTR ")", MAC2STR(addr));
-
-       wpa_tdls_smk_send(sm, addr, WLAN_TDLS_SETUP_REQUEST, 0, 0,
-                         rbuf, pos - rbuf);
-       os_free(rbuf);
+       if (peer == NULL || !peer->tpk_success)
+               return;
 
-       return 0;
+       if (sm->tdls_external_setup) {
+               /*
+                * Disable previous link to allow renegotiation to be completed
+                * on AP path.
+                */
+               wpa_tdls_do_teardown(sm, peer,
+                                    WLAN_REASON_TDLS_TEARDOWN_UNSPECIFIED);
+       }
 }
 
 
@@ -1741,6 +2581,12 @@ static void wpa_supplicant_rx_tdls(void *ctx, const u8 *src_addr,
        wpa_hexdump(MSG_DEBUG, "TDLS: Received Data frame encapsulation",
                    buf, len);
 
+       if (sm->tdls_disabled || !sm->tdls_supported) {
+               wpa_printf(MSG_DEBUG, "TDLS: Discard message - TDLS disabled "
+                          "or unsupported by driver");
+               return;
+       }
+
        if (os_memcmp(src_addr, sm->own_addr, ETH_ALEN) == 0) {
                wpa_printf(MSG_DEBUG, "TDLS: Discard copy of own message");
                return;
@@ -1774,6 +2620,9 @@ static void wpa_supplicant_rx_tdls(void *ctx, const u8 *src_addr,
        case WLAN_TDLS_TEARDOWN:
                wpa_tdls_recv_teardown(sm, src_addr, buf, len);
                break;
+       case WLAN_TDLS_DISCOVERY_REQUEST:
+               wpa_tdls_process_discovery_request(sm, src_addr, buf, len);
+               break;
        default:
                /* Kernel code will process remaining frames */
                wpa_printf(MSG_DEBUG, "TDLS: Ignore TDLS frame action code %u",
@@ -1797,7 +2646,9 @@ int wpa_tdls_init(struct wpa_sm *sm)
        if (sm == NULL)
                return -1;
 
-       sm->l2_tdls = l2_packet_init(sm->ifname, sm->own_addr,
+       sm->l2_tdls = l2_packet_init(sm->bridge_ifname ? sm->bridge_ifname :
+                                    sm->ifname,
+                                    sm->own_addr,
                                     ETH_P_80211_ENCAP, wpa_supplicant_rx_tdls,
                                     sm, 0);
        if (sm->l2_tdls == NULL) {
@@ -1806,16 +2657,53 @@ int wpa_tdls_init(struct wpa_sm *sm)
                return -1;
        }
 
+       /*
+        * Drivers that support TDLS but don't implement the get_capa callback
+        * are assumed to perform everything internally
+        */
+       if (wpa_sm_tdls_get_capa(sm, &sm->tdls_supported,
+                                &sm->tdls_external_setup) < 0) {
+               sm->tdls_supported = 1;
+               sm->tdls_external_setup = 0;
+       }
+
+       wpa_printf(MSG_DEBUG, "TDLS: TDLS operation%s supported by "
+                  "driver", sm->tdls_supported ? "" : " not");
+       wpa_printf(MSG_DEBUG, "TDLS: Driver uses %s link setup",
+                  sm->tdls_external_setup ? "external" : "internal");
+
        return 0;
 }
 
 
+void wpa_tdls_teardown_peers(struct wpa_sm *sm)
+{
+       struct wpa_tdls_peer *peer, *tmp;
+
+       peer = sm->tdls;
+
+       wpa_printf(MSG_DEBUG, "TDLS: Tear down peers");
+
+       while (peer) {
+               tmp = peer->next;
+               wpa_printf(MSG_DEBUG, "TDLS: Tear down peer " MACSTR,
+                          MAC2STR(peer->addr));
+               if (sm->tdls_external_setup)
+                       wpa_tdls_do_teardown(sm, peer,
+                                            WLAN_REASON_DEAUTH_LEAVING);
+               else
+                       wpa_sm_tdls_oper(sm, TDLS_TEARDOWN, peer->addr);
+
+               peer = tmp;
+       }
+}
+
+
 static void wpa_tdls_remove_peers(struct wpa_sm *sm)
 {
        struct wpa_tdls_peer *peer, *tmp;
 
        peer = sm->tdls;
-       sm->tdls = NULL;
 
        while (peer) {
                int res;
@@ -1824,7 +2712,6 @@ static void wpa_tdls_remove_peers(struct wpa_sm *sm)
                wpa_printf(MSG_DEBUG, "TDLS: Remove peer " MACSTR " (res=%d)",
                           MAC2STR(peer->addr), res);
                wpa_tdls_peer_free(sm, peer);
-               os_free(peer);
                peer = tmp;
        }
 }
@@ -1861,3 +2748,52 @@ void wpa_tdls_disassoc(struct wpa_sm *sm)
        wpa_printf(MSG_DEBUG, "TDLS: Remove peers on disassociation");
        wpa_tdls_remove_peers(sm);
 }
+
+
+static int wpa_tdls_prohibited(const u8 *ies, size_t len)
+{
+       struct wpa_eapol_ie_parse elems;
+
+       if (ies == NULL)
+               return 0;
+
+       if (wpa_supplicant_parse_ies(ies, len, &elems) < 0)
+               return 0;
+
+       if (elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5)
+               return 0;
+
+        /* bit 38 - TDLS Prohibited */
+       return !!(elems.ext_capab[2 + 4] & 0x40);
+}
+
+
+void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
+{
+       sm->tdls_prohibited = wpa_tdls_prohibited(ies, len);
+       wpa_printf(MSG_DEBUG, "TDLS: TDLS is %s in the target BSS",
+                  sm->tdls_prohibited ? "prohibited" : "allowed");
+}
+
+
+void wpa_tdls_assoc_resp_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
+{
+       if (!sm->tdls_prohibited && wpa_tdls_prohibited(ies, len)) {
+               wpa_printf(MSG_DEBUG, "TDLS: TDLS prohibited based on "
+                          "(Re)Association Response IEs");
+               sm->tdls_prohibited = 1;
+       }
+}
+
+
+void wpa_tdls_enable(struct wpa_sm *sm, int enabled)
+{
+       wpa_printf(MSG_DEBUG, "TDLS: %s", enabled ? "enabled" : "disabled");
+       sm->tdls_disabled = !enabled;
+}
+
+
+int wpa_tdls_is_external_setup(struct wpa_sm *sm)
+{
+       return sm->tdls_external_setup;
+}