--- a/eapol/eapol_framework/eapol_common/include/eapol_wlan_authentication.h Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eapol_wlan_authentication.h Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
*/
/*
-* %version: 18 %
+* %version: 6.1.2 %
*/
#if !defined(_EAPOL_WLAN_AUTHENTICATION_H_)
@@ -32,8 +32,6 @@
#include "eap_array.h"
#include "eapol_key_state.h"
#include "eapol_test_stack_if.h"
-#include "eap_database_reference_if.h"
-#include "abs_eap_configuration_if.h"
#if defined(USE_EAP_SIMPLE_CONFIG)
#include "abs_eap_configuration_if.h"
@@ -53,7 +51,6 @@
#if defined(USE_TEST_EAPOL_WLAN_AUTHENTICATION)
, public eapol_test_stack_if_c
#endif //#if defined(USE_TEST_EAPOL_WLAN_AUTHENTICATION)
-, public eap_database_reference_if_c
#if defined(USE_EAP_SIMPLE_CONFIG)
, public abs_eap_configuration_if_c
#endif // #if defined(USE_EAP_SIMPLE_CONFIG)
@@ -63,7 +60,8 @@
EAP_FUNC_IMPORT static eapol_wlan_authentication_c * new_eapol_wlan_authentication(
abs_eap_am_tools_c * const tools,
abs_eapol_wlan_authentication_c * const partner,
- const bool is_client_when_true);
+ const bool is_client_when_true,
+ const abs_eapol_wlan_database_reference_if_c * const wlan_database_reference);
EAP_FUNC_IMPORT eapol_wlan_authentication_c(
abs_eap_am_tools_c * const tools,
@@ -99,8 +97,11 @@
const eap_variable_data_c * const SSID,
const eapol_key_authentication_type_e selected_eapol_key_authentication_type,
const eap_variable_data_c * const wpa_preshared_key,
- const bool WPA_override_enabled,
+ const bool WPA_override_enabled
+#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
+ ,
const eap_am_network_id_c * const receive_network_id ///< source includes remote address, destination includes local address.
+#endif //#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
);
EAP_FUNC_IMPORT eap_status_e complete_association(
@@ -162,9 +163,6 @@
const eap_am_network_id_c * const receive_network_id ///< source includes remote address, destination includes local address.
);
- EAP_FUNC_IMPORT eap_status_e set_eap_database_reference_values(
- const eap_variable_data_c * const reference);
-
/////////////////////////////////////////
/* These are called from ethernet_core */
@@ -293,37 +291,22 @@
const simple_config_payloads_c * const other_configuration);
#endif // #if defined(USE_EAP_SIMPLE_CONFIG)
- EAP_FUNC_IMPORT eap_status_e complete_get_802_11_authentication_mode(
- const eap_status_e completion_status,
- const eap_am_network_id_c * const receive_network_id,
- const eapol_key_802_11_authentication_mode_e mode);
-
- EAP_FUNC_IMPORT eap_status_e complete_disassociation(
- const bool complete_to_lower_layer,
- const eap_am_network_id_c * const receive_network_id);
-
private:
- eap_status_e eapol_indication(
+ EAP_FUNC_IMPORT eap_status_e eapol_indication(
const eap_am_network_id_c * const receive_network_id, ///< source includes remote address, destination includes local address.
const eapol_wlan_authentication_state_e notification);
- eap_status_e create_upper_stack();
+ EAP_FUNC_IMPORT eap_status_e create_upper_stack();
eap_status_e disassociation_mutex_must_be_reserved(
- const bool complete_to_lower_layer,
- const eap_am_network_id_c * const receive_network_id ///< source includes remote address, destination includes local address.
- );
-
- eap_status_e internal_disassociation(
- const bool complete_to_lower_layer,
const eap_am_network_id_c * const receive_network_id ///< source includes remote address, destination includes local address.
);
eap_status_e cancel_all_authentication_sessions();
- eap_status_e complete_check_pmksa_cache(
- EAP_TEMPLATE_CONST eap_array_c<eap_am_network_id_c> * const bssid_sta_receive_network_ids);
+private:
+
eap_status_e cancel_timer_this_ap_failed();
@@ -333,7 +316,7 @@
eap_status_e cancel_timer_authentication_cancelled();
-private:
+
/// Pointer to the lower layer in the stack
abs_eapol_wlan_authentication_c * m_partner;
@@ -349,7 +332,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- //eap_array_c<eap_type_selection_c> m_selected_eap_types;
+ eap_array_c<eap_type_selection_c> m_selected_eap_types;
eap_variable_data_c m_wpa_preshared_key_hash;