Move default_wep_key variable into EAPOL authenticator data

[wpasupplicant] / hostapd / eapol_sm.h

diff --git a/hostapd/eapol_sm.h b/hostapd/eapol_sm.h
index df0ddd0..b806443 100644 (file)
--- a/hostapd/eapol_sm.h
+++ b/hostapd/eapol_sm.h
@@ -16,6 +16,7 @@
 #define EAPOL_SM_H
 
 #include "defs.h"
+#include "radius/radius.h"
 
 /* IEEE Std 802.1X-2004, Ch. 8.2 */
 
@@ -27,16 +28,6 @@ typedef unsigned int Counter;
 
 struct eap_sm;
 
-struct radius_attr_data {
-       u8 *data;
-       size_t len;
-};
-
-struct radius_class_data {
-       struct radius_attr_data *attr;
-       size_t count;
-};
-
 
 struct eapol_auth_config {
        int eap_reauth_period;
@@ -48,9 +39,15 @@ struct eapol_auth_config {
        char *eap_req_id_text; /* a copy of this will be allocated */
        size_t eap_req_id_text_len;
        u8 *pac_opaque_encr_key;
-       char *eap_fast_a_id;
+       u8 *eap_fast_a_id;
+       size_t eap_fast_a_id_len;
+       char *eap_fast_a_id_info;
+       int eap_fast_prov;
+       int pac_key_lifetime;
+       int pac_key_refresh_time;
        int eap_sim_aka_result_ind;
        int tnc;
+       struct wps_context *wps;
 
        /*
         * Pointer to hostapd data. This is a temporary workaround for
@@ -88,6 +85,9 @@ struct eapol_auth_cb {
 struct eapol_authenticator {
        struct eapol_auth_config conf;
        struct eapol_auth_cb cb;
+
+       u8 *default_wep_key;
+       u8 default_wep_key_idx;
 };