diff -r 712b4ffd76bb -r 43351a4f2da3 eapol/eapol_framework/eapol_common/am/include/eap_am_crypto_sha1.h --- a/eapol/eapol_framework/eapol_common/am/include/eap_am_crypto_sha1.h Fri Sep 03 09:22:44 2010 +0300 +++ b/eapol/eapol_framework/eapol_common/am/include/eap_am_crypto_sha1.h Thu Sep 16 13:07:04 2010 +0300 @@ -25,6 +25,27 @@ #include "eap_am_types.h" #include "eap_variable_data.h" #include "eap_am_export.h" +// Start: added by script change_export_macros.sh. +#if defined(EAP_NO_EXPORT_EAP_AM_CRYPTO_SHA1_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_NONSHARABLE + #define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H + #define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H + #define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H + #define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H +#elif defined(EAP_EXPORT_EAP_AM_CRYPTO_SHA1_H) + #define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_EXPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_C_FUNC_EXPORT + #define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H EAP_FUNC_EXPORT + #define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H EAP_C_FUNC_EXPORT +#else + #define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_IMPORT + #define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_FUNC_IMPORT + #define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H EAP_C_FUNC_IMPORT + #define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H + #define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SHA1_H +#endif +// End: added by script change_export_macros.sh. #include "eap_am_tools.h" @@ -32,7 +53,7 @@ /// The eap_am_crypto_sha1_c class includes the state of /// one instance of SHA1 algorithm. -class EAP_EXPORT eap_am_crypto_sha1_c +class EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_am_crypto_sha1_c { private: @@ -209,7 +230,7 @@ /// @param W is an array of modulo 16 input 32-bit unsigned integers /// in host order. /// @param W_count is count of integers in W array. - EAP_FUNC_IMPORT eap_status_e eap_sha1_process_data_host_order( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e eap_sha1_process_data_host_order( const u32_t * W, u32_t W_count ); @@ -217,7 +238,7 @@ /// @param W is an array of modulo 16 input 32-bit unsigned integers /// in host order. /// @param W_count is count of integers in W array. - EAP_FUNC_IMPORT eap_status_e eap_sha1_process_data_network_order( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e eap_sha1_process_data_network_order( const u32_t * W, u32_t W_count ); @@ -225,12 +246,12 @@ /** * This function cleans up the SHA1 context. */ - EAP_FUNC_IMPORT eap_status_e hash_cleanup(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e hash_cleanup(); /** * This function copies the message digest to output buffer. */ - EAP_FUNC_IMPORT eap_status_e copy_message_digest( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e copy_message_digest( void * const output, u32_t * const max_output_size); @@ -241,7 +262,7 @@ * The eap_am_crypto_md4_c object calls this function after it is * initialized. */ - EAP_FUNC_IMPORT void set_is_invalid(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H void set_is_invalid(); /** * The set_is_valid() function sets the state of the eap_am_crypto_md4_c @@ -249,12 +270,12 @@ * The eap_am_crypto_md4_c object calls this function after it is * initialized. */ - EAP_FUNC_IMPORT void set_is_valid(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H void set_is_valid(); /** * This function copies the context of SHA1. */ - EAP_FUNC_IMPORT eap_status_e copy_context( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e copy_context( const eap_variable_data_c * const saved_data, const u64_t full_hashed_data_length, const u32_t * const H, @@ -268,39 +289,39 @@ /** * Destructor does nothing special. */ - EAP_FUNC_IMPORT virtual ~eap_am_crypto_sha1_c(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H virtual ~eap_am_crypto_sha1_c(); /** * Constructor initializes the member attributes. */ - EAP_FUNC_IMPORT eap_am_crypto_sha1_c(abs_eap_am_tools_c * const tools); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_am_crypto_sha1_c(abs_eap_am_tools_c * const tools); /** * The get_is_valid() function returns the status of the * eap_am_crypto_md4_c object. * True indicates the object is allocated successfully. */ - EAP_FUNC_IMPORT bool get_is_valid(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H bool get_is_valid(); /** * This function returns the size of message digest of HASH-algorithm. */ - EAP_FUNC_IMPORT u32_t get_digest_length(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H u32_t get_digest_length(); /** * This function returns the size of block of HASH-algorithm. */ - EAP_FUNC_IMPORT u32_t get_block_size(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H u32_t get_block_size(); /** * This function initializes the context of SHA1-algorithm. */ - EAP_FUNC_IMPORT eap_status_e hash_init(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e hash_init(); /** * This function updates the context of SHA1-algorithm with data. */ - EAP_FUNC_IMPORT eap_status_e hash_update( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e hash_update( const void * const data, const u32_t data_length); @@ -308,7 +329,7 @@ * This function writes the message digest to buffer. * @param Length is set if md_length_or_null is non-NULL. */ - EAP_FUNC_IMPORT eap_status_e hash_final( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e hash_final( void * const message_digest, u32_t *md_length_or_null); @@ -318,7 +339,7 @@ * modified SHA-1 using the routine in Appendix 3.3 Constructing * The Function G From SHA-1 in the SECURE HASH STANDARD, FIPS PUB 180-1. */ - EAP_FUNC_IMPORT eap_status_e eap_sha1_dss_G_function( + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_status_e eap_sha1_dss_G_function( const void * const data, const u32_t data_length, void * const output, @@ -328,7 +349,7 @@ /** * This function copies the context of SHA1. */ - EAP_FUNC_IMPORT eap_am_crypto_sha1_c * copy(); + EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SHA1_H eap_am_crypto_sha1_c * copy(); };