Revert "[wpa_supplicant] Cumulative patch from commit 0c5ededed"
This reverts commit 1a1e642fd6c1200e7e1979ea70103c484062f3a9.
Reason for revert: Droidcop: Potential culprit for Bug 154881734 - verifying through Forrest before revert submission
Change-Id: I85f75adeb43554b0ebbf295fea51e1b68b169ed2
diff --git a/src/eap_server/eap.h b/src/eap_server/eap.h
index 61032cc..540b4e7 100644
--- a/src/eap_server/eap.h
+++ b/src/eap_server/eap.h
@@ -45,43 +45,43 @@
struct eap_eapol_interface {
/* Lower layer to full authenticator variables */
- bool eapResp; /* shared with EAPOL Backend Authentication */
+ Boolean eapResp; /* shared with EAPOL Backend Authentication */
struct wpabuf *eapRespData;
- bool portEnabled;
+ Boolean portEnabled;
int retransWhile;
- bool eapRestart; /* shared with EAPOL Authenticator PAE */
+ Boolean eapRestart; /* shared with EAPOL Authenticator PAE */
int eapSRTT;
int eapRTTVAR;
/* Full authenticator to lower layer variables */
- bool eapReq; /* shared with EAPOL Backend Authentication */
- bool eapNoReq; /* shared with EAPOL Backend Authentication */
- bool eapSuccess;
- bool eapFail;
- bool eapTimeout;
+ Boolean eapReq; /* shared with EAPOL Backend Authentication */
+ Boolean eapNoReq; /* shared with EAPOL Backend Authentication */
+ Boolean eapSuccess;
+ Boolean eapFail;
+ Boolean eapTimeout;
struct wpabuf *eapReqData;
u8 *eapKeyData;
size_t eapKeyDataLen;
u8 *eapSessionId;
size_t eapSessionIdLen;
- bool eapKeyAvailable; /* called keyAvailable in IEEE 802.1X-2004 */
+ Boolean eapKeyAvailable; /* called keyAvailable in IEEE 802.1X-2004 */
/* AAA interface to full authenticator variables */
- bool aaaEapReq;
- bool aaaEapNoReq;
- bool aaaSuccess;
- bool aaaFail;
+ Boolean aaaEapReq;
+ Boolean aaaEapNoReq;
+ Boolean aaaSuccess;
+ Boolean aaaFail;
struct wpabuf *aaaEapReqData;
u8 *aaaEapKeyData;
size_t aaaEapKeyDataLen;
- bool aaaEapKeyAvailable;
+ Boolean aaaEapKeyAvailable;
int aaaMethodTimeout;
/* Full authenticator to AAA interface variables */
- bool aaaEapResp;
+ Boolean aaaEapResp;
struct wpabuf *aaaEapRespData;
/* aaaIdentity -> eap_get_identity() */
- bool aaaTimeout;
+ Boolean aaaTimeout;
};
struct eap_server_erp_key {
@@ -124,7 +124,7 @@
* callback context.
*/
void *eap_sim_db_priv;
- bool backend_auth;
+ Boolean backend_auth;
int eap_server;
/**