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

[mech_eap.git] / libeap / src / eap_server / eap_i.h

diff --git a/libeap/src/eap_server/eap_i.h b/libeap/src/eap_server/eap_i.h
index daac746..c90443d 100644 (file)
--- a/libeap/src/eap_server/eap_i.h
+++ b/libeap/src/eap_server/eap_i.h
@@ -2,14 +2,8 @@
  * hostapd / EAP Authenticator state machine internal structures (RFC 4137)
  * Copyright (c) 2004-2007, 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 EAP_I_H
@@ -94,6 +88,19 @@ struct eap_method {
         * private data or this function may derive the key.
         */
        u8 * (*get_emsk)(struct eap_sm *sm, void *priv, size_t *len);
+
+       /**
+        * getSessionId - Get EAP method specific Session-Id
+        * @sm: Pointer to EAP state machine allocated with eap_server_sm_init()
+        * @priv: Pointer to private EAP method data from eap_method::init()
+        * @len: Pointer to a variable to store Session-Id length
+        * Returns: Session-Id or %NULL if not available
+        *
+        * This function can be used to get the Session-Id from the EAP method.
+        * The Session-Id may already be stored in the method-specific private
+        * data or this function may derive the Session-Id.
+        */
+       u8 * (*getSessionId)(struct eap_sm *sm, void *priv, size_t *len);
 };
 
 /**
@@ -109,7 +116,8 @@ struct eap_sm {
                EAP_INITIALIZE_PASSTHROUGH, EAP_IDLE2, EAP_RETRANSMIT2,
                EAP_RECEIVED2, EAP_DISCARD2, EAP_SEND_REQUEST2,
                EAP_AAA_REQUEST, EAP_AAA_RESPONSE, EAP_AAA_IDLE,
-               EAP_TIMEOUT_FAILURE2, EAP_FAILURE2, EAP_SUCCESS2
+               EAP_TIMEOUT_FAILURE2, EAP_FAILURE2, EAP_SUCCESS2,
+               EAP_INITIATE_REAUTH_START, EAP_INITIATE_RECEIVED
        } EAP_state;
 
        /* Constants */
@@ -119,7 +127,7 @@ struct eap_sm {
 
        /* Full authenticator state machine local variables */
 
-       /* Long-term (maintained betwen packets) */
+       /* Long-term (maintained between packets) */
        EapType currentMethod;
        int currentId;
        enum {
@@ -131,6 +139,7 @@ struct eap_sm {
 
        /* Short-term (not maintained between packets) */
        Boolean rxResp;
+       Boolean rxInitiate;
        int respId;
        EapType respMethod;
        int respVendor;
@@ -138,7 +147,7 @@ struct eap_sm {
        Boolean ignore;
        enum {
                DECISION_SUCCESS, DECISION_FAILURE, DECISION_CONTINUE,
-               DECISION_PASSTHROUGH
+               DECISION_PASSTHROUGH, DECISION_INITIATE_REAUTH_START
        } decision;
 
        /* Miscellaneous variables */
@@ -146,7 +155,7 @@ struct eap_sm {
        /* not defined in RFC 4137 */
        Boolean changed;
        void *eapol_ctx, *msg_ctx;
-       struct eapol_callbacks *eapol_cb;
+       const struct eapol_callbacks *eapol_cb;
        void *eap_method_priv;
        u8 *identity;
        size_t identity_len;
@@ -157,7 +166,7 @@ struct eap_sm {
        int user_eap_method_index;
        int init_phase2;
        void *ssl_ctx;
-       void *eap_sim_db_priv;
+       struct eap_sim_db_data *eap_sim_db_priv;
        Boolean backend_auth;
        Boolean update_user;
        int eap_server;
@@ -192,10 +201,26 @@ struct eap_sm {
 
        /* Fragmentation size for EAP method init() handler */
        int fragment_size;
+
+       int pbc_in_m1;
+
+       const u8 *server_id;
+       size_t server_id_len;
+
+       Boolean initiate_reauth_start_sent;
+       Boolean try_initiate_reauth;
+       int erp;
+       unsigned int tls_session_lifetime;
+
+#ifdef CONFIG_TESTING_OPTIONS
+       u32 tls_test_flags;
+#endif /* CONFIG_TESTING_OPTIONS */
 };
 
 int eap_user_get(struct eap_sm *sm, const u8 *identity, size_t identity_len,
                 int phase2);
+void eap_log_msg(struct eap_sm *sm, const char *fmt, ...)
+PRINTF_FORMAT(2, 3);
 void eap_sm_process_nak(struct eap_sm *sm, const u8 *nak_list, size_t len);
 
 #endif /* EAP_I_H */