Updated through tag hostap_2_5 from git://w1.fi/hostap.git

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

diff --git a/libeap/src/eapol_auth/eapol_auth_sm.h b/libeap/src/eapol_auth/eapol_auth_sm.h
index 59a10b4..e1974e4 100644 (file)
--- a/libeap/src/eapol_auth/eapol_auth_sm.h
+++ b/libeap/src/eapol_auth/eapol_auth_sm.h
@@ -1,15 +1,9 @@
 /*
  * IEEE 802.1X-2004 Authenticator - EAPOL state machine
- * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2015, 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_H
@@ -30,6 +24,10 @@ struct eapol_auth_config {
        void *eap_sim_db_priv;
        char *eap_req_id_text; /* a copy of this will be allocated */
        size_t eap_req_id_text_len;
+       int erp_send_reauth_start;
+       char *erp_domain; /* a copy of this will be allocated */
+       int erp; /* Whether ERP is enabled on authentication server */
+       unsigned int tls_session_lifetime;
        u8 *pac_opaque_encr_key;
        u8 *eap_fast_a_id;
        size_t eap_fast_a_id_len;
@@ -42,12 +40,16 @@ struct eapol_auth_config {
        struct wps_context *wps;
        int fragment_size;
        u16 pwd_group;
+       int pbc_in_m1;
+       const u8 *server_id;
+       size_t server_id_len;
 
        /* Opaque context pointer to owner data for callback functions */
        void *ctx;
 };
 
 struct eap_user;
+struct eap_server_erp_key;
 
 typedef enum {
        EAPOL_LOGGER_DEBUG, EAPOL_LOGGER_INFO, EAPOL_LOGGER_WARNING
@@ -63,7 +65,8 @@ struct eapol_auth_cb {
                           size_t datalen);
        void (*aaa_send)(void *ctx, void *sta_ctx, const u8 *data,
                         size_t datalen);
-       void (*finished)(void *ctx, void *sta_ctx, int success, int preauth);
+       void (*finished)(void *ctx, void *sta_ctx, int success, int preauth,
+                        int remediation);
        int (*get_eap_user)(void *ctx, const u8 *identity, size_t identity_len,
                            int phase2, struct eap_user *user);
        int (*sta_entry_alive)(void *ctx, const u8 *addr);
@@ -73,6 +76,9 @@ struct eapol_auth_cb {
        void (*abort_auth)(void *ctx, void *sta_ctx);
        void (*tx_key)(void *ctx, void *sta_ctx);
        void (*eapol_event)(void *ctx, void *sta_ctx, enum eapol_event type);
+       struct eap_server_erp_key * (*erp_get_key)(void *ctx,
+                                                  const char *keyname);
+       int (*erp_add_key)(void *ctx, struct eap_server_erp_key *erp);
 };
 
 
@@ -82,11 +88,15 @@ void eapol_auth_deinit(struct eapol_authenticator *eapol);
 struct eapol_state_machine *
 eapol_auth_alloc(struct eapol_authenticator *eapol, const u8 *addr,
                 int flags, const struct wpabuf *assoc_wps_ie,
-                const struct wpabuf *assoc_p2p_ie, void *sta_ctx);
+                const struct wpabuf *assoc_p2p_ie, void *sta_ctx,
+                const char *identity, const char *radius_cui);
 void eapol_auth_free(struct eapol_state_machine *sm);
 void eapol_auth_step(struct eapol_state_machine *sm);
-void eapol_auth_dump_state(FILE *f, const char *prefix,
-                          struct eapol_state_machine *sm);
+int eapol_auth_dump_state(struct eapol_state_machine *sm, char *buf,
+                         size_t buflen);
 int eapol_auth_eap_pending_cb(struct eapol_state_machine *sm, void *ctx);
+void eapol_auth_reauthenticate(struct eapol_state_machine *sm);
+int eapol_auth_set_conf(struct eapol_state_machine *sm, const char *param,
+                       const char *value);
 
 #endif /* EAPOL_AUTH_SM_H */