From 04243740c9c5cd08dbf9dfd1f53270344e7aa8af Mon Sep 17 00:00:00 2001 From: Vidyullatha Kanchanapally Date: Mon, 10 Apr 2017 15:55:59 +0530 Subject: [PATCH] FILS: Fix GTK rekey by accepting EAPOL-Key msg 1/2 with FILS AKM GTK rekeying was rejected if a prior 4-way handshake is not done. Fix this by allowing GTK rekey to happen in case of a FILS connection since it does not involve a 4-way handshake. Signed-off-by: Jouni Malinen --- src/rsn_supp/wpa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 6d9114294..87a2fed40 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -1585,7 +1585,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, struct wpa_gtk_data gd; const u8 *key_rsc; - if (!sm->msg_3_of_4_ok) { + if (!sm->msg_3_of_4_ok && !wpa_fils_is_completed(sm)) { wpa_msg(sm->ctx->msg_ctx, MSG_INFO, "WPA: Group Key Handshake started prior to completion of 4-way handshake"); goto failed;