Revert "Merge cherrypicks of [3084543, 3084544, 3084545, 3084546, 3084547, 3084548, 3084549, 3084550] into oc-dr3-release"

This reverts commit 814cdedb5db4d3ffddc417511edc112e531dd3b7.

Change-Id: I26dac1febd557a8e9fd7d7b1a53a34f65fc1ed0c
(cherry picked from commit 68f5223fc656bd0c715f3705031c296df2c71bac)
diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
index c6234dc..e1a6712 100644
--- a/src/ap/ieee802_11.c
+++ b/src/ap/ieee802_11.c
@@ -2209,7 +2209,6 @@
 {
 	struct ieee80211_ht_capabilities ht_cap;
 	struct ieee80211_vht_capabilities vht_cap;
-	int set = 1;
 
 	/*
 	 * Remove the STA entry to ensure the STA PS state gets cleared and
@@ -2217,18 +2216,9 @@
 	 * FT-over-the-DS, where a station re-associates back to the same AP but
 	 * skips the authentication flow, or if working with a driver that
 	 * does not support full AP client state.
-	 *
-	 * Skip this if the STA has already completed FT reassociation and the
-	 * TK has been configured since the TX/RX PN must not be reset to 0 for
-	 * the same key.
 	 */
-	if (!sta->added_unassoc &&
-	    (!(sta->flags & WLAN_STA_AUTHORIZED) ||
-	     !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) {
+	if (!sta->added_unassoc)
 		hostapd_drv_sta_remove(hapd, sta->addr);
-		wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED);
-		set = 0;
-	}
 
 #ifdef CONFIG_IEEE80211N
 	if (sta->flags & WLAN_STA_HT)
@@ -2251,11 +2241,11 @@
 			    sta->flags & WLAN_STA_VHT ? &vht_cap : NULL,
 			    sta->flags | WLAN_STA_ASSOC, sta->qosinfo,
 			    sta->vht_opmode, sta->p2p_ie ? 1 : 0,
-			    set)) {
+			    sta->added_unassoc)) {
 		hostapd_logger(hapd, sta->addr,
 			       HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE,
 			       "Could not %s STA to kernel driver",
-			       set ? "set" : "add");
+			       sta->added_unassoc ? "set" : "add");
 
 		if (sta->added_unassoc) {
 			hostapd_drv_sta_remove(hapd, sta->addr);
diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index 85e85e0..7b26c04 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -1751,9 +1751,6 @@
 #else /* CONFIG_IEEE80211R_AP */
 		break;
 #endif /* CONFIG_IEEE80211R_AP */
-	case WPA_DRV_STA_REMOVED:
-		sm->tk_already_set = FALSE;
-		return 0;
 	}
 
 #ifdef CONFIG_IEEE80211R_AP
@@ -1912,21 +1909,6 @@
 }
 
 
-static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm)
-{
-	if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) {
-		wpa_printf(MSG_ERROR,
-			   "WPA: Failed to get random data for ANonce");
-		sm->Disconnect = TRUE;
-		return -1;
-	}
-	wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce,
-		    WPA_NONCE_LEN);
-	sm->TimeoutCtr = 0;
-	return 0;
-}
-
-
 SM_STATE(WPA_PTK, INITPMK)
 {
 	u8 msk[2 * PMK_LEN];
@@ -2951,12 +2933,9 @@
 		SM_ENTER(WPA_PTK, AUTHENTICATION);
 	else if (sm->ReAuthenticationRequest)
 		SM_ENTER(WPA_PTK, AUTHENTICATION2);
-	else if (sm->PTKRequest) {
-		if (wpa_auth_sm_ptk_update(sm) < 0)
-			SM_ENTER(WPA_PTK, DISCONNECTED);
-		else
-			SM_ENTER(WPA_PTK, PTKSTART);
-	} else switch (sm->wpa_ptk_state) {
+	else if (sm->PTKRequest)
+		SM_ENTER(WPA_PTK, PTKSTART);
+	else switch (sm->wpa_ptk_state) {
 	case WPA_PTK_INITIALIZE:
 		break;
 	case WPA_PTK_DISCONNECT:
@@ -3755,14 +3734,6 @@
 }
 
 
-int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm)
-{
-	if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt))
-		return 0;
-	return sm->tk_already_set;
-}
-
-
 int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
 			     struct rsn_pmksa_cache_entry *entry)
 {
diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h
index 387d146..0920a16 100644
--- a/src/ap/wpa_auth.h
+++ b/src/ap/wpa_auth.h
@@ -270,7 +270,7 @@
 		 u8 *data, size_t data_len);
 enum wpa_event {
 	WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH,
-	WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED
+	WPA_REAUTH_EAPOL, WPA_ASSOC_FT
 };
 void wpa_remove_ptk(struct wpa_state_machine *sm);
 int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event);
@@ -283,7 +283,6 @@
 int wpa_auth_get_pairwise(struct wpa_state_machine *sm);
 int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm);
 int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm);
-int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm);
 int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm,
 			     struct rsn_pmksa_cache_entry *entry);
 struct rsn_pmksa_cache_entry *
diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c
index 210d300..c267a17 100644
--- a/src/ap/wpa_auth_ft.c
+++ b/src/ap/wpa_auth_ft.c
@@ -797,14 +797,6 @@
 		return;
 	}
 
-	if (sm->tk_already_set) {
-		/* Must avoid TK reconfiguration to prevent clearing of TX/RX
-		 * PN in the driver */
-		wpa_printf(MSG_DEBUG,
-			   "FT: Do not re-install same PTK to the driver");
-		return;
-	}
-
 	/* FIX: add STA entry to kernel/driver here? The set_key will fail
 	 * most likely without this.. At the moment, STA entry is added only
 	 * after association has been completed. This function will be called
@@ -817,7 +809,6 @@
 
 	/* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */
 	sm->pairwise_set = TRUE;
-	sm->tk_already_set = TRUE;
 }
 
 
@@ -1015,7 +1006,6 @@
 
 	sm->pairwise = pairwise;
 	sm->PTK_valid = TRUE;
-	sm->tk_already_set = FALSE;
 	wpa_ft_install_ptk(sm);
 
 	buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h
index 9564f24..90318d8 100644
--- a/src/ap/wpa_auth_i.h
+++ b/src/ap/wpa_auth_i.h
@@ -58,7 +58,6 @@
 	struct wpa_ptk PTK;
 	Boolean PTK_valid;
 	Boolean pairwise_set;
-	Boolean tk_already_set;
 	int keycount;
 	Boolean Pair;
 	struct wpa_key_replay_counter {
diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h
index 5733c75..a84cc9b 100644
--- a/src/common/wpa_common.h
+++ b/src/common/wpa_common.h
@@ -211,20 +211,8 @@
 	size_t kck_len;
 	size_t kek_len;
 	size_t tk_len;
-	int installed; /* 1 if key has already been installed to driver */
 };
 
-struct wpa_gtk {
-	u8 gtk[WPA_GTK_MAX_LEN];
-	size_t gtk_len;
-};
-
-#ifdef CONFIG_IEEE80211W
-struct wpa_igtk {
-	u8 igtk[WPA_IGTK_MAX_LEN];
-	size_t igtk_len;
-};
-#endif /* CONFIG_IEEE80211W */
 
 /* WPA IE version 1
  * 00-50-f2:1 (OUI:OUI type)
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index c2ed952..e4ac24f 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -112,7 +112,6 @@
 		u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */
 	} tpk;
 	int tpk_set;
-	int tk_set; /* TPK-TK configured to the driver */
 	int tpk_success;
 	int tpk_in_progress;
 
@@ -193,20 +192,6 @@
 	u8 rsc[6];
 	enum wpa_alg alg;
 
-	if (peer->tk_set) {
-		/*
-		 * This same TPK-TK has already been configured to the driver
-		 * and this new configuration attempt (likely due to an
-		 * unexpected retransmitted frame) would result in clearing
-		 * the TX/RX sequence number which can break security, so must
-		 * not allow that to happen.
-		 */
-		wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR
-			   " has already been configured to the driver - do not reconfigure",
-			   MAC2STR(peer->addr));
-		return -1;
-	}
-
 	os_memset(rsc, 0, 6);
 
 	switch (peer->cipher) {
@@ -224,15 +209,12 @@
 		return -1;
 	}
 
-	wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR,
-		   MAC2STR(peer->addr));
 	if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1,
 			   rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) {
 		wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the "
 			   "driver");
 		return -1;
 	}
-	peer->tk_set = 1;
 	return 0;
 }
 
@@ -714,7 +696,7 @@
 	peer->cipher = 0;
 	peer->qos_info = 0;
 	peer->wmm_capable = 0;
-	peer->tk_set = peer->tpk_set = peer->tpk_success = 0;
+	peer->tpk_set = peer->tpk_success = 0;
 	peer->chan_switch_enabled = 0;
 	os_memset(&peer->tpk, 0, sizeof(peer->tpk));
 	os_memset(peer->inonce, 0, WPA_NONCE_LEN);
@@ -1177,7 +1159,6 @@
 		wpa_tdls_peer_free(sm, peer);
 		return -1;
 	}
-	peer->tk_set = 0; /* A new nonce results in a new TK */
 	wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake",
 		    peer->inonce, WPA_NONCE_LEN);
 	os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN);
@@ -1771,19 +1752,6 @@
 }
 
 
-static int tdls_nonce_set(const u8 *nonce)
-{
-	int i;
-
-	for (i = 0; i < WPA_NONCE_LEN; i++) {
-		if (nonce[i])
-			return 1;
-	}
-
-	return 0;
-}
-
-
 static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr,
 				   const u8 *buf, size_t len)
 {
@@ -2037,8 +2005,7 @@
 	peer->rsnie_i_len = kde.rsn_ie_len;
 	peer->cipher = cipher;
 
-	if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 ||
-	    !tdls_nonce_set(peer->inonce)) {
+	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
@@ -2054,7 +2021,6 @@
 				"TDLS: Failed to get random data for responder nonce");
 			goto error;
 		}
-		peer->tk_set = 0; /* A new nonce results in a new TK */
 	}
 
 #if 0
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index af72298..1349873 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -582,6 +582,7 @@
 		os_memset(buf, 0, sizeof(buf));
 	}
 	sm->tptk_set = 1;
+	sm->tk_to_set = 1;
 
 	kde = sm->assoc_wpa_ie;
 	kde_len = sm->assoc_wpa_ie_len;
@@ -686,7 +687,7 @@
 	enum wpa_alg alg;
 	const u8 *key_rsc;
 
-	if (sm->ptk.installed) {
+	if (!sm->tk_to_set) {
 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
 			"WPA: Do not re-install same PTK to the driver");
 		return 0;
@@ -730,7 +731,7 @@
 
 	/* TK is not needed anymore in supplicant */
 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
-	sm->ptk.installed = 1;
+	sm->tk_to_set = 0;
 
 	if (sm->wpa_ptk_rekey) {
 		eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL);
@@ -780,23 +781,11 @@
 
 static int wpa_supplicant_install_gtk(struct wpa_sm *sm,
 				      const struct wpa_gtk_data *gd,
-				      const u8 *key_rsc, int wnm_sleep)
+				      const u8 *key_rsc)
 {
 	const u8 *_gtk = gd->gtk;
 	u8 gtk_buf[32];
 
-	/* Detect possible key reinstallation */
-	if ((sm->gtk.gtk_len == (size_t) gd->gtk_len &&
-	     os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) ||
-	    (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len &&
-	     os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk,
-		       sm->gtk_wnm_sleep.gtk_len) == 0)) {
-		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-			"WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)",
-			gd->keyidx, gd->tx, gd->gtk_len);
-		return 0;
-	}
-
 	wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len);
 	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
 		"WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)",
@@ -831,15 +820,6 @@
 	}
 	os_memset(gtk_buf, 0, sizeof(gtk_buf));
 
-	if (wnm_sleep) {
-		sm->gtk_wnm_sleep.gtk_len = gd->gtk_len;
-		os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk,
-			  sm->gtk_wnm_sleep.gtk_len);
-	} else {
-		sm->gtk.gtk_len = gd->gtk_len;
-		os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len);
-	}
-
 	return 0;
 }
 
@@ -932,7 +912,7 @@
 	    (wpa_supplicant_check_group_cipher(sm, sm->group_cipher,
 					       gtk_len, gtk_len,
 					       &gd.key_rsc_len, &gd.alg) ||
-	     wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) {
+	     wpa_supplicant_install_gtk(sm, &gd, key_rsc))) {
 		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
 			"RSN: Failed to install GTK");
 		os_memset(&gd, 0, sizeof(gd));
@@ -946,58 +926,6 @@
 }
 
 
-#ifdef CONFIG_IEEE80211W
-static int wpa_supplicant_install_igtk(struct wpa_sm *sm,
-				       const struct wpa_igtk_kde *igtk,
-				       int wnm_sleep)
-{
-	size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher);
-	u16 keyidx = WPA_GET_LE16(igtk->keyid);
-
-	/* Detect possible key reinstallation */
-	if ((sm->igtk.igtk_len == len &&
-	     os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) ||
-	    (sm->igtk_wnm_sleep.igtk_len == len &&
-	     os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-		       sm->igtk_wnm_sleep.igtk_len) == 0)) {
-		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-			"WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)",
-			keyidx);
-		return  0;
-	}
-
-	wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG,
-		"WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x",
-		keyidx, MAC2STR(igtk->pn));
-	wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len);
-	if (keyidx > 4095) {
-		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-			"WPA: Invalid IGTK KeyID %d", keyidx);
-		return -1;
-	}
-	if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
-			   broadcast_ether_addr,
-			   keyidx, 0, igtk->pn, sizeof(igtk->pn),
-			   igtk->igtk, len) < 0) {
-		wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
-			"WPA: Failed to configure IGTK to the driver");
-		return -1;
-	}
-
-	if (wnm_sleep) {
-		sm->igtk_wnm_sleep.igtk_len = len;
-		os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk,
-			  sm->igtk_wnm_sleep.igtk_len);
-	} else {
-		sm->igtk.igtk_len = len;
-		os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len);
-	}
-
-	return 0;
-}
-#endif /* CONFIG_IEEE80211W */
-
-
 static int ieee80211w_set_keys(struct wpa_sm *sm,
 			       struct wpa_eapol_ie_parse *ie)
 {
@@ -1008,14 +936,30 @@
 	if (ie->igtk) {
 		size_t len;
 		const struct wpa_igtk_kde *igtk;
-
+		u16 keyidx;
 		len = wpa_cipher_key_len(sm->mgmt_group_cipher);
 		if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len)
 			return -1;
-
 		igtk = (const struct wpa_igtk_kde *) ie->igtk;
-		if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0)
+		keyidx = WPA_GET_LE16(igtk->keyid);
+		wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d "
+			"pn %02x%02x%02x%02x%02x%02x",
+			keyidx, MAC2STR(igtk->pn));
+		wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK",
+				igtk->igtk, len);
+		if (keyidx > 4095) {
+			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
+				"WPA: Invalid IGTK KeyID %d", keyidx);
 			return -1;
+		}
+		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
+				   broadcast_ether_addr,
+				   keyidx, 0, igtk->pn, sizeof(igtk->pn),
+				   igtk->igtk, len) < 0) {
+			wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
+				"WPA: Failed to configure IGTK to the driver");
+			return -1;
+		}
 	}
 
 	return 0;
@@ -1661,7 +1605,7 @@
 	if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc))
 		key_rsc = null_rsc;
 
-	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) ||
+	if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) ||
 	    wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0)
 		goto failed;
 	os_memset(&gd, 0, sizeof(gd));
@@ -2509,7 +2453,7 @@
  */
 void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid)
 {
-	int clear_keys = 1;
+	int clear_ptk = 1;
 
 	if (sm == NULL)
 		return;
@@ -2535,7 +2479,7 @@
 		/* Prepare for the next transition */
 		wpa_ft_prepare_auth_request(sm, NULL);
 
-		clear_keys = 0;
+		clear_ptk = 0;
 	}
 #endif /* CONFIG_IEEE80211R */
 #ifdef CONFIG_FILS
@@ -2545,11 +2489,11 @@
 		 * AUTHENTICATED state to get the EAPOL port Authorized.
 		 */
 		wpa_supplicant_key_neg_complete(sm, sm->bssid, 1);
-		clear_keys = 0;
+		clear_ptk = 0;
 	}
 #endif /* CONFIG_FILS */
 
-	if (clear_keys) {
+	if (clear_ptk) {
 		/*
 		 * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if
 		 * this is not part of a Fast BSS Transition.
@@ -2559,12 +2503,6 @@
 		os_memset(&sm->ptk, 0, sizeof(sm->ptk));
 		sm->tptk_set = 0;
 		os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-		os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-		os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
-#ifdef CONFIG_IEEE80211W
-		os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-		os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
-#endif /* CONFIG_IEEE80211W */
 	}
 
 #ifdef CONFIG_TDLS
@@ -2599,9 +2537,6 @@
 #ifdef CONFIG_FILS
 	sm->fils_completed = 0;
 #endif /* CONFIG_FILS */
-#ifdef CONFIG_IEEE80211R
-	sm->ft_reassoc_completed = 0;
-#endif /* CONFIG_IEEE80211R */
 
 	/* Keys are not needed in the WPA state machine anymore */
 	wpa_sm_drop_sa(sm);
@@ -3119,12 +3054,6 @@
 	os_memset(sm->pmk, 0, sizeof(sm->pmk));
 	os_memset(&sm->ptk, 0, sizeof(sm->ptk));
 	os_memset(&sm->tptk, 0, sizeof(sm->tptk));
-	os_memset(&sm->gtk, 0, sizeof(sm->gtk));
-	os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep));
-#ifdef CONFIG_IEEE80211W
-	os_memset(&sm->igtk, 0, sizeof(sm->igtk));
-	os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep));
-#endif /* CONFIG_IEEE80211W */
 #ifdef CONFIG_IEEE80211R
 	os_memset(sm->xxkey, 0, sizeof(sm->xxkey));
 	os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0));
@@ -3188,7 +3117,7 @@
 
 		wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)",
 				gd.gtk, gd.gtk_len);
-		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) {
+		if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) {
 			os_memset(&gd, 0, sizeof(gd));
 			wpa_printf(MSG_DEBUG, "Failed to install the GTK in "
 				   "WNM mode");
@@ -3197,11 +3126,29 @@
 		os_memset(&gd, 0, sizeof(gd));
 #ifdef CONFIG_IEEE80211W
 	} else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) {
-		const struct wpa_igtk_kde *igtk;
+		struct wpa_igtk_kde igd;
+		u16 keyidx;
 
-		igtk = (const struct wpa_igtk_kde *) (buf + 2);
-		if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0)
+		os_memset(&igd, 0, sizeof(igd));
+		keylen = wpa_cipher_key_len(sm->mgmt_group_cipher);
+		os_memcpy(igd.keyid, buf + 2, 2);
+		os_memcpy(igd.pn, buf + 4, 6);
+
+		keyidx = WPA_GET_LE16(igd.keyid);
+		os_memcpy(igd.igtk, buf + 10, keylen);
+
+		wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)",
+				igd.igtk, keylen);
+		if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher),
+				   broadcast_ether_addr,
+				   keyidx, 0, igd.pn, sizeof(igd.pn),
+				   igd.igtk, keylen) < 0) {
+			wpa_printf(MSG_DEBUG, "Failed to install the IGTK in "
+				   "WNM mode");
+			os_memset(&igd, 0, sizeof(igd));
 			return -1;
+		}
+		os_memset(&igd, 0, sizeof(igd));
 #endif /* CONFIG_IEEE80211W */
 	} else {
 		wpa_printf(MSG_DEBUG, "Unknown element id");
@@ -3825,7 +3772,6 @@
 	 * takes care of association frame encryption/decryption. */
 	/* TK is not needed anymore in supplicant */
 	os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN);
-	sm->ptk.installed = 1;
 
 	/* FILS HLP Container */
 	fils_process_hlp_container(sm, ie_start, end - ie_start);
diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c
index d45bb45..205793e 100644
--- a/src/rsn_supp/wpa_ft.c
+++ b/src/rsn_supp/wpa_ft.c
@@ -153,7 +153,6 @@
 	u16 capab;
 
 	sm->ft_completed = 0;
-	sm->ft_reassoc_completed = 0;
 
 	buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) +
 		2 + sm->r0kh_id_len + ric_ies_len + 100;
@@ -682,11 +681,6 @@
 		return -1;
 	}
 
-	if (sm->ft_reassoc_completed) {
-		wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission");
-		return 0;
-	}
-
 	if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) {
 		wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs");
 		return -1;
@@ -787,8 +781,6 @@
 		return -1;
 	}
 
-	sm->ft_reassoc_completed = 1;
-
 	if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0)
 		return -1;
 
diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h
index b061638..ab54a18 100644
--- a/src/rsn_supp/wpa_i.h
+++ b/src/rsn_supp/wpa_i.h
@@ -24,18 +24,13 @@
 	struct wpa_ptk ptk, tptk;
 	int ptk_set, tptk_set;
 	unsigned int msg_3_of_4_ok:1;
+	unsigned int tk_to_set:1;
 	u8 snonce[WPA_NONCE_LEN];
 	u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */
 	int renew_snonce;
 	u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN];
 	int rx_replay_counter_set;
 	u8 request_counter[WPA_REPLAY_COUNTER_LEN];
-	struct wpa_gtk gtk;
-	struct wpa_gtk gtk_wnm_sleep;
-#ifdef CONFIG_IEEE80211W
-	struct wpa_igtk igtk;
-	struct wpa_igtk igtk_wnm_sleep;
-#endif /* CONFIG_IEEE80211W */
 
 	struct eapol_sm *eapol; /* EAPOL state machine from upper level code */
 
@@ -128,7 +123,6 @@
 	size_t r0kh_id_len;
 	u8 r1kh_id[FT_R1KH_ID_LEN];
 	int ft_completed;
-	int ft_reassoc_completed;
 	int over_the_ds_in_progress;
 	u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */
 	int set_ptk_after_assoc;
diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
index bd0b517..0b1a2db 100644
--- a/wpa_supplicant/wnm_sta.c
+++ b/wpa_supplicant/wnm_sta.c
@@ -260,7 +260,7 @@
 
 	if (!wpa_s->wnmsleep_used) {
 		wpa_printf(MSG_DEBUG,
-			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested");
+			   "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association");
 		return;
 	}
 
@@ -299,8 +299,6 @@
 		return;
 	}
 
-	wpa_s->wnmsleep_used = 0;
-
 	if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT ||
 	    wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) {
 		wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response "