--- a/eapol/eapol_framework/eapol_symbian/am/include/eap_am_type_gsmsim_symbian.h Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eap_am_type_gsmsim_symbian.h Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 19.1.4 %
+* %version: 19.1.5 %
*/
#if !defined(_EAP_AM_TYPE_GSMSIM_SYMBIAN_H_)
@@ -27,6 +27,27 @@
#include <d32dbms.h>
#include "eap_tools.h"
#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H)
+ #define EAP_CLASS_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_NONSHARABLE
+ #define EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+ #define EAP_C_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+ #define EAP_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+ #define EAP_C_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+#elif defined(EAP_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H)
+ #define EAP_CLASS_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_EXPORT
+ #define EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_C_FUNC_EXPORT
+ #define EAP_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_FUNC_EXPORT
+ #define EAP_C_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_C_FUNC_EXPORT
+#else
+ #define EAP_CLASS_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_IMPORT
+ #define EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_FUNC_IMPORT
+ #define EAP_C_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H EAP_C_FUNC_IMPORT
+ #define EAP_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+ #define EAP_C_FUNC_EXPORT_EAP_AM_TYPE_GSMSIM_SYMBIAN_H
+#endif
+// End: added by script change_export_macros.sh.
#include "abs_eap_base_type.h"
#include "eap_am_type_gsmsim.h"
#include "abs_eap_am_sim_algorithm.h"
@@ -50,7 +71,7 @@
* Class that implements the operating system dependent portion of EAP SIM protocol.
* For Symbian OS.
*/
-class EAP_EXPORT eap_am_type_gsmsim_symbian_c
+class EAP_CLASS_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_am_type_gsmsim_symbian_c
: public CBase, public eap_am_type_gsmsim_c
{
public:
@@ -65,36 +86,36 @@
const bool aIsClient,
const eap_am_network_id_c * const receive_network_id);
//
- EAP_FUNC_IMPORT virtual ~eap_am_type_gsmsim_symbian_c();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H virtual ~eap_am_type_gsmsim_symbian_c();
//
- EAP_FUNC_IMPORT eap_status_e configure();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e configure();
//
- EAP_FUNC_IMPORT eap_status_e reset();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e reset();
//
- EAP_FUNC_IMPORT eap_status_e shutdown();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e shutdown();
#if defined(__WINS__)
//
- EAP_FUNC_IMPORT eap_status_e query_SIM_imsi(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_SIM_imsi(
u8_t * const imsi, const u32_t max_length, u32_t * const imsi_length);
#endif //#if defined(__WINS__)
//
- EAP_FUNC_IMPORT eap_status_e store_pseudonym_id(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e store_pseudonym_id(
const eap_am_network_id_c * const network_id,
const eap_variable_data_c * const pseudonym);
//
- EAP_FUNC_IMPORT eap_status_e store_reauthentication_id(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e store_reauthentication_id(
const eap_am_network_id_c * const network_id,
const eap_variable_data_c * const reauthentication_identity);
//
- EAP_FUNC_IMPORT eap_status_e query_SIM_IMSI_or_pseudonym_or_reauthentication_id(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_SIM_IMSI_or_pseudonym_or_reauthentication_id(
const bool must_be_synchronous,
eap_variable_data_c * const IMSI,
eap_variable_data_c * const pseudonym_identity,
@@ -107,21 +128,21 @@
);
//
- EAP_FUNC_IMPORT eap_status_e cancel_SIM_IMSI_or_pseudonym_or_reauthentication_id_query();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e cancel_SIM_IMSI_or_pseudonym_or_reauthentication_id_query();
//
- EAP_FUNC_IMPORT eap_status_e query_SIM_kc_and_sres(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_SIM_kc_and_sres(
const u8_t * const rand,
u8_t * const kc,
u8_t * const sres);
//
- EAP_FUNC_IMPORT eap_status_e handle_gsmsim_notification(eap_gsmsim_notification_codes_e gsmsim_notification_code);
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e handle_gsmsim_notification(eap_gsmsim_notification_codes_e gsmsim_notification_code);
#if defined(USE_EAP_TYPE_SERVER_GSMSIM)
//
- EAP_FUNC_IMPORT eap_status_e query_SIM_triplets(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_SIM_triplets(
const bool must_be_synchronous,
const eap_variable_data_c * const username,
eap_variable_data_c * const imsi,
@@ -132,11 +153,11 @@
#if defined(USE_EAP_TYPE_SERVER_GSMSIM)
//
- EAP_FUNC_IMPORT eap_status_e cancel_SIM_triplets_query();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e cancel_SIM_triplets_query();
#endif //#if defined(USE_EAP_TYPE_SERVER_GSMSIM)
//
- EAP_FUNC_IMPORT eap_status_e query_SIM_kc_sres(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_SIM_kc_sres(
const bool must_be_synchronous,
//const eap_variable_data_c * const imsi,
const eap_variable_data_c * const n_rands,
@@ -144,54 +165,54 @@
eap_variable_data_c * const n_sres);
//
- EAP_FUNC_IMPORT eap_status_e cancel_SIM_kc_sres_query();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e cancel_SIM_kc_sres_query();
//
- EAP_FUNC_IMPORT eap_status_e generate_encryption_IV(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e generate_encryption_IV(
eap_variable_data_c * const encryption_IV,
const u32_t IV_length);
//
- EAP_FUNC_IMPORT eap_status_e generate_pseudonym_id(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e generate_pseudonym_id(
const eap_am_network_id_c * const network_id,
const eap_variable_data_c * const imsi,
eap_variable_data_c * const pseudonym,
const u32_t maximum_pseudonym_length);
//
- EAP_FUNC_IMPORT eap_status_e generate_reauthentication_id(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e generate_reauthentication_id(
const eap_am_network_id_c * const network_id,
const eap_variable_data_c * const imsi,
eap_variable_data_c * const reauthentication_identity,
const u32_t maximum_reauthentication_identity_length);
//
- EAP_FUNC_IMPORT eap_status_e store_reauth_parameters(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e store_reauth_parameters(
const eap_variable_data_c * const XKEY,
const eap_variable_data_c * const K_aut,
const eap_variable_data_c * const K_encr,
const u32_t reauth_counter);
//
- EAP_FUNC_IMPORT eap_status_e authentication_finished(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e authentication_finished(
const bool true_when_successfull,
const eap_gsmsim_authentication_type_e authentication_type,
const eap_type_gsmsim_identity_type identity_type);
//
- EAP_FUNC_IMPORT eap_status_e query_reauth_parameters(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_reauth_parameters(
eap_variable_data_c * const XKEY,
eap_variable_data_c * const K_aut,
eap_variable_data_c * const K_encr,
u32_t * const reauth_counter);
//
- EAP_FUNC_IMPORT eap_status_e increase_reauth_counter();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e increase_reauth_counter();
#if defined(USE_EAP_TYPE_SERVER_GSMSIM)
//
- EAP_FUNC_IMPORT eap_status_e query_imsi_from_username(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e query_imsi_from_username(
const bool must_be_synchronous,
const u8_t next_eap_identifier,
const eap_am_network_id_c * const network_id,
@@ -203,24 +224,24 @@
//
- EAP_FUNC_IMPORT eap_status_e cancel_imsi_from_username_query();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e cancel_imsi_from_username_query();
//
- EAP_FUNC_IMPORT eap_status_e check_is_rand_unused(const eap_variable_data_c * const n_rands);
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e check_is_rand_unused(const eap_variable_data_c * const n_rands);
- EAP_FUNC_IMPORT eap_status_e set_rand_is_used(const eap_variable_data_c * const n_rands);
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e set_rand_is_used(const eap_variable_data_c * const n_rands);
- EAP_FUNC_IMPORT void set_is_valid();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H void set_is_valid();
- EAP_FUNC_IMPORT bool get_is_valid();
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H bool get_is_valid();
//
- EAP_FUNC_IMPORT eap_status_e type_configure_read(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e type_configure_read(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);
//
- EAP_FUNC_IMPORT eap_status_e type_configure_write(
+ EAP_FUNC_VISIBILITY_EAP_AM_TYPE_GSMSIM_SYMBIAN_H eap_status_e type_configure_write(
const eap_configuration_field_c * const field,
eap_variable_data_c * const data);