From: Vidyullatha Kanchanapally <vkanchan@qti.qualcomm.com>
Date: Mon, 10 Apr 2017 10:25:59 +0000 (+0530)
Subject: FILS: Fix key info in GTK rekey EAPOL-Key msg 2/2
X-Git-Tag: hostap_2_7~1385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b44d1efd282be71073116aba1c77f80c64640a5c;p=thirdparty%2Fhostap.git

FILS: Fix key info in GTK rekey EAPOL-Key msg 2/2

While responding to EAPOL-Key message 1/2 with EAPOL-Key message 2/2
when using FILS AKM suites the ENCRYPTED bit is not set in key info of
2/2 which causes AP to drop 2/2. Fix this by setting the ENCRYPTED bit
since FILS AKM based connection uses AEAD encryption/decryption.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---

diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 87a2fed40..5c77776ed 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -1557,6 +1557,8 @@ static int wpa_supplicant_send_2_of_2(struct wpa_sm *sm,
 	key_info |= ver | WPA_KEY_INFO_SECURE;
 	if (mic_len)
 		key_info |= WPA_KEY_INFO_MIC;
+	else
+		key_info |= WPA_KEY_INFO_ENCR_KEY_DATA;
 	WPA_PUT_BE16(reply->key_info, key_info);
 	if (sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN)
 		WPA_PUT_BE16(reply->key_length, 0);