commit cd4bf967a77b0bc5e84fd40a2cd418e2551f3f7a
author Jean-Baptiste Queru <jbq@google.com> Mon Jan 28 13:52:01 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 13:52:01 2013 -0800
tree 84396f89aaa316bec9dc5247bad7834b55222acb
parent 0fb734060951ad2513680f2d9f9013ff68c2772e
parent a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889

am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889':
  Fix regression in LEAP

src/eap_peer/eap.c

diff --git a/src/eap_peer/eap.c b/src/eap_peer/eap.c
index 2ed74b8..a4c9b25 100644
--- a/src/eap_peer/eap.c
+++ b/src/eap_peer/eap.c
@@ -348,6 +348,7 @@
 {
 	struct wpabuf *eapReqData;
 	struct eap_method_ret ret;
+	int min_len = 1;
 
 	SM_ENTRY(EAP, METHOD);
 	if (sm->m == NULL) {
@@ -356,7 +357,9 @@
 	}
 
 	eapReqData = eapol_get_eapReqData(sm);
-	if (!eap_hdr_len_valid(eapReqData, 1))
+	if (sm->m->vendor == EAP_VENDOR_IETF && sm->m->method == EAP_TYPE_LEAP)
+		min_len = 0; /* LEAP uses EAP-Success without payload */
+	if (!eap_hdr_len_valid(eapReqData, min_len))
 		return;
 
 	/*