From: Jouni Malinen <j@w1.fi>
Date: Sat, 3 Dec 2011 15:37:48 +0000 (+0200)
Subject: EAP server: Force identity request after INITIALIZE for passthrough
X-Git-Tag: aosp-jb-start~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=204dd3f420bb1ddce02d13d7a366169e0bda914d;p=thirdparty%2Fhostap.git

EAP server: Force identity request after INITIALIZE for passthrough

Previously, sm->start_reauth was set to TRUE in SUCCESS2 state to force
reauthentication to start with EAP identity request. This works fine for
the case of EAP success through the AAA passthrough authentication, but
is not enough to handle passthrough authentication failure. sm->identity
is set in that case and getDecision would return PASSTHROUGH instead of
CONTINUE (to Identity method).

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/eap_server/eap_server.c b/src/eap_server/eap_server.c
index 4483508ce..0f4284f7f 100644
--- a/src/eap_server/eap_server.c
+++ b/src/eap_server/eap_server.c
@@ -169,6 +169,13 @@ SM_STATE(EAP, INITIALIZE)
 	sm->num_rounds = 0;
 	sm->method_pending = METHOD_PENDING_NONE;
 
+	/*
+	 * Start reauthentication with identity request even though we know the
+	 * previously used identity. This is needed to get reauthentication
+	 * started properly.
+	 */
+	sm->start_reauth = TRUE;
+
 	wpa_msg(sm->msg_ctx, MSG_INFO, WPA_EVENT_EAP_STARTED
 		MACSTR, MAC2STR(sm->peer_addr));
 }
@@ -589,13 +596,6 @@ SM_STATE(EAP, SUCCESS2)
 	}
 
 	sm->eap_if.eapSuccess = TRUE;
-
-	/*
-	 * Start reauthentication with identity request even though we know the
-	 * previously used identity. This is needed to get reauthentication
-	 * started properly.
-	 */
-	sm->start_reauth = TRUE;
 }