Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update...

[mech_eap.git] / libeap / src / eapol_auth / eapol_auth_sm_i.h

diff --git a/libeap/src/eapol_auth/eapol_auth_sm_i.h b/libeap/src/eapol_auth/eapol_auth_sm_i.h
index 1000da4..04386b2 100644 (file)
--- a/libeap/src/eapol_auth/eapol_auth_sm_i.h
+++ b/libeap/src/eapol_auth/eapol_auth_sm_i.h
@@ -2,14 +2,8 @@
  * IEEE 802.1X-2004 Authenticator - EAPOL state machine (internal definitions)
  * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef EAPOL_AUTH_SM_I_H
@@ -163,12 +157,7 @@ struct eapol_state_machine {
                              * Authentication server */
        u8 eap_type_supp; /* EAP type of the last EAP packet from Supplicant */
        struct radius_class_data radius_class;
-
-       /* Keys for encrypting and signing EAPOL-Key frames */
-       u8 *eapol_key_sign;
-       size_t eapol_key_sign_len;
-       u8 *eapol_key_crypt;
-       size_t eapol_key_crypt_len;
+       struct wpabuf *radius_cui; /* Chargeable-User-Identity */
 
        struct eap_sm *eap;
 
@@ -178,6 +167,10 @@ struct eapol_state_machine {
        struct eapol_authenticator *eapol;
 
        void *sta; /* station context pointer to use in callbacks */
+
+       int remediation;
+
+       u64 acct_multi_session_id;
 };
 
 #endif /* EAPOL_AUTH_SM_I_H */