--- a/eapol/eapol_framework/eapol_common/type/securid/include/eap_type_securid.h Fri Sep 17 08:30:11 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/securid/include/eap_type_securid.h Mon Oct 04 00:19:54 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: %
+* %version: 10.1.4 %
*/
#ifndef EAP_TYPE_SECURID_H
@@ -29,9 +29,32 @@
#include "eap_am_network_id.h"
#include "eap_type_securid_state.h"
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_TYPE_SECURID_H)
+ #define EAP_CLASS_VISIBILITY_EAP_TYPE_SECURID_H EAP_NONSHARABLE
+ #define EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H
+ #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SECURID_H
+ #define EAP_FUNC_EXPORT_EAP_TYPE_SECURID_H
+ #define EAP_C_FUNC_EXPORT_EAP_TYPE_SECURID_H
+#elif defined(EAP_EXPORT_EAP_TYPE_SECURID_H)
+ #define EAP_CLASS_VISIBILITY_EAP_TYPE_SECURID_H EAP_EXPORT
+ #define EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SECURID_H EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_EXPORT_EAP_TYPE_SECURID_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_EXPORT_EAP_TYPE_SECURID_H EAP_C_FUNC_EXPORT
+#else
+ #define EAP_CLASS_VISIBILITY_EAP_TYPE_SECURID_H EAP_IMPORT
+ #define EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H EAP_FUNC_IMPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_TYPE_SECURID_H EAP_C_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT_EAP_TYPE_SECURID_H
+ #define EAP_C_FUNC_EXPORT_EAP_TYPE_SECURID_H
+#endif
+// End: added by script change_export_macros.sh.
+
/// This class is implementation of SecurID EAP-type.
-class EAP_EXPORT eap_type_securid_c
+class EAP_CLASS_VISIBILITY_EAP_TYPE_SECURID_H eap_type_securid_c
: public abs_eap_am_type_securid_c
, public eap_base_type_c
{
@@ -86,30 +109,31 @@
#endif //#if defined(USE_EAP_CONFIGURATION_TO_SKIP_USER_INTERACTIONS)
- EAP_FUNC_IMPORT eap_status_e finish_successful_authentication();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e finish_successful_authentication();
- EAP_FUNC_IMPORT eap_status_e finish_unsuccessful_authentication(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e finish_unsuccessful_authentication(
const bool authentication_cancelled);
- EAP_FUNC_IMPORT eap_status_e complete_eap_identity_query(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e complete_eap_identity_query(
const eap_variable_data_c * const identity);
- EAP_FUNC_IMPORT eap_status_e client_securid_complete_passcode_query(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e client_securid_complete_passcode_query(
const eap_variable_data_c * const passcode);
- EAP_FUNC_IMPORT eap_status_e client_securid_complete_pincode_query(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e client_securid_complete_pincode_query(
const eap_variable_data_c * const pincode,
const eap_variable_data_c * const passcode);
- EAP_FUNC_IMPORT eap_status_e client_gtc_complete_user_input_query(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e client_gtc_complete_user_input_query(
+ const eap_variable_data_c * const identity_utf8,
const eap_variable_data_c * const input);
- EAP_FUNC_IMPORT eap_status_e remove_username_store();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e remove_username_store();
/**
* This function processes the SecurID packets.
*/
- EAP_FUNC_IMPORT eap_status_e securid_packet_process(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e securid_packet_process(
eap_header_wr_c * const eap, ///< This is pointer to EAP header and data.
const u32_t eap_packet_length ///< This is length of received EAP packet.
);
@@ -117,7 +141,7 @@
/**
* This function tells if the object is a client or a server..
*/
- EAP_FUNC_IMPORT bool get_is_client();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H bool get_is_client();
eap_buf_chain_wr_c * create_send_packet(u32_t length);
@@ -152,12 +176,12 @@
/**
* Destructor cancels all timers and deletes member attributes.
*/
- EAP_FUNC_IMPORT virtual ~eap_type_securid_c();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H virtual ~eap_type_securid_c();
/**
* Constructor initializes all member attributes.
*/
- EAP_FUNC_IMPORT eap_type_securid_c(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_type_securid_c(
abs_eap_am_tools_c * const tools,
abs_eap_base_type_c * const partner,
eap_am_type_securid_c * const am_type_securid,
@@ -170,7 +194,7 @@
* The partner class calls this function when EAP/SecurID packet is received.
* see also eap_base_type_c::packet_process().
*/
- EAP_FUNC_IMPORT eap_status_e packet_process(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e packet_process(
const eap_am_network_id_c * const receive_network_id, ///< This is the network identity of the received EAP packet.
eap_header_wr_c * const eap, ///< This is pointer to EAP header and data.
const u32_t eap_packet_length ///< This is length of received EAP packet.
@@ -178,32 +202,32 @@
// This is commented in eap_base_type_c::get_is_valid().
- EAP_FUNC_IMPORT bool get_is_valid();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H bool get_is_valid();
- EAP_FUNC_IMPORT void set_is_valid();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H void set_is_valid();
/**
* This function resets the reused eap_type_securid_c object.
*/
- EAP_FUNC_IMPORT eap_status_e reset();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e reset();
- EAP_FUNC_IMPORT eap_status_e shutdown();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e shutdown();
- EAP_FUNC_IMPORT eap_status_e configure();
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e configure();
// This is commented in eap_base_type_c::query_eap_identity().
- EAP_FUNC_IMPORT eap_status_e query_eap_identity(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e query_eap_identity(
const bool must_be_synchronous,
eap_variable_data_c * const identity,
const eap_am_network_id_c * const receive_network_id,
const u8_t eap_identifier);
- EAP_FUNC_IMPORT eap_status_e set_initial_eap_identifier(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e set_initial_eap_identifier(
const eap_am_network_id_c * const receive_network_id,
const u8_t initial_identifier);
// This is commented in eap_base_type_c::eap_acknowledge().
- EAP_FUNC_IMPORT eap_status_e eap_acknowledge(
+ EAP_FUNC_VISIBILITY_EAP_TYPE_SECURID_H eap_status_e eap_acknowledge(
const eap_am_network_id_c * const receive_network_id);
}; // class eap_type_securid_c