commit ef83464bec7f6c9787d47f4b3a9bc581d4db2804
author Jouni Malinen <j@w1.fi> Thu Oct 12 23:02:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 23:02:53 2017 +0000
tree 7b80a1edc4dc78e41f1c1bd89b6c722576469d42
parent ee32a682c552779493f82b92bd3d0debfa73f2ce
parent 513ca09929f45ea1809092ad4480857eec250639

Fix PTK rekeying to generate a new ANonce am: b07117c1cb am: 776c4a8bf2
am: 513ca09929

Change-Id: Id5b79e018f33469cab53f43491439434a6b5bdbc

src/ap/wpa_auth.c

diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index f23a57a..01f39c6 100644
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -1879,6 +1879,21 @@
 }
 
 
+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];
@@ -2400,9 +2415,12 @@
 		SM_ENTER(WPA_PTK, AUTHENTICATION);
 	else if (sm->ReAuthenticationRequest)
 		SM_ENTER(WPA_PTK, AUTHENTICATION2);
-	else if (sm->PTKRequest)
-		SM_ENTER(WPA_PTK, PTKSTART);
-	else switch (sm->wpa_ptk_state) {
+	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) {
 	case WPA_PTK_INITIALIZE:
 		break;
 	case WPA_PTK_DISCONNECT: