FCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_symbian/am/include/eap_am_crypto

equal deleted inserted replaced

-:712b4ffd76bb
+:43351a4f2da3
 // INCLUDES
 #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_SYMBIAN_H)
+	#define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_NONSHARABLE
+	#define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H
+	#define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H
+	#define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H
+#elif defined(EAP_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H)
+	#define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_EXPORT
+	#define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_FUNC_EXPORT
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_C_FUNC_EXPORT
+	#define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H EAP_FUNC_EXPORT
+	#define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H EAP_C_FUNC_EXPORT
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_IMPORT
+	#define EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_FUNC_IMPORT
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H EAP_C_FUNC_IMPORT
+	#define EAP_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H
+	#define EAP_C_FUNC_EXPORT_EAP_AM_CRYPTO_SYMBIAN_H
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_am_tools.h"
 #include "eap_array.h"
 #include "abs_eap_am_crypto.h"
 // FORWARD DECLARATIONS
 // CLASS DECLARATION
 /// Class eap_am_crypto offers services to authenticate data, encrypt data,
 /// decrypt data, generate keys and generate cryptographically strong random data.
-class EAP_EXPORT eap_am_crypto_symbian_c
+class EAP_CLASS_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_am_crypto_symbian_c
 : public abs_eap_am_crypto_c
 {
 private:
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * Destructor does nothing special.
 	 */
-	EAP_FUNC_IMPORT virtual ~eap_am_crypto_symbian_c();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H virtual ~eap_am_crypto_symbian_c();
 	/**
 	 * Constructor initializes the member attributes.
 	 */
-	EAP_FUNC_IMPORT eap_am_crypto_symbian_c(abs_eap_am_tools_c * const tools);
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_am_crypto_symbian_c(abs_eap_am_tools_c * const tools);
-	EAP_FUNC_IMPORT eap_status_e configure();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e configure();
 	/**
 	 * The get_is_valid() function returns the status of the eap_core object.
 	 * True indicates the object is initialized succesfully.
 	 */
-	EAP_FUNC_IMPORT bool get_is_valid() const;
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H bool get_is_valid() const;
-	EAP_FUNC_IMPORT void set_is_valid();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H void set_is_valid();
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * This function activates random generator for test use.
 	 * It does generate predictive pseudorandom data.
 	 */
-	EAP_FUNC_IMPORT void use_test_random(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H void use_test_random(
 		const u8_t * const seed,
 		const u32_t seed_length,
 		const bool does_continuous_seeding_when_true);
 	/**
 	 * The get_rand_bytes() function fills count random bytes to buffer.
 	 */
-	EAP_FUNC_IMPORT eap_status_e get_rand_bytes(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e get_rand_bytes(
 		u8_t * const buffer,
 		const u32_t count);
 	/**
 	 * The add_rand_seed() function seeds count bytes from buffer to the random data pool.
 	 * The seed bytes could be any data that increases entropy of the random data pool.
 	 * For example time stamps of send and received messages, likewise addresses,
 	 * cookies and nonces included in messages.
 	 */
-	EAP_FUNC_IMPORT eap_status_e add_rand_seed(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e add_rand_seed(
 		const u8_t * const buffer,
 		const u32_t count);
 	/**
 	 * The add_rand_seed_hw_ticks() function adds hardware ticks read with
 	 * the abs_eap_am_tools::get_hardware_ticks()  function. This could be used to
 	 * seed the random data pool with time stamps.
 	 */
-	EAP_FUNC_IMPORT eap_status_e add_rand_seed_hw_ticks();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e add_rand_seed_hw_ticks();
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * The generate_diffie_hellman_keys() function generates private and public
 	 * Diffie-Hellman keys.
 	 * It is used only for sanity checks. Only one well-known group is supported.
 	 * @param own_private_dh_key Saves context here.
 	 */
-	EAP_FUNC_IMPORT eap_status_e generate_diffie_hellman_keys(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e generate_diffie_hellman_keys(
 		eap_variable_data_c * const own_private_dh_key,
 		eap_variable_data_c * const own_public_dh_key,
 		const u8_t * const prime,
 		const u32_t prime_length,
 		const u8_t * const group_generator,
 	 * The generate_g_power_to_xy() function generates shared secret
 	 * Diffie-Hellman key from own_private_dh_key and peer_public_dh_key.
 	 * Only one well-known group is supported.
 	 * @param own_private_dh_key Is the context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e generate_g_power_to_xy(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e generate_g_power_to_xy(
 		const eap_variable_data_c * const own_private_dh_key,
 		const eap_variable_data_c * const peer_public_dh_key,
 		eap_variable_data_c * const shared_dh_key,
 		const u8_t * const prime,
 		const u32_t prime_length,
 	/**
 	 * This functions cleans up the diffie-hellman context.
 	 * This is not used in Symbian.
 	 */
-	EAP_FUNC_IMPORT eap_status_e dh_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dh_cleanup(
 		const eap_variable_data_c * const dh_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * This function returns the size of message digest of SHA1-algorithm.
 	 */
-	 EAP_FUNC_IMPORT u32_t get_sha_256_digest_length(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_sha_256_digest_length(
 		eap_variable_data_c * const sha_256_context);
 	/**
 	 * This function returns the block size of SHA1-algorithm.
 	 */
-	 EAP_FUNC_IMPORT u32_t get_sha_256_block_size(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_sha_256_block_size(
 		eap_variable_data_c * const sha_256_context);
 	/**
 	 * The sha_256_init() function initializes SHA1.
 	 * Internal context of SHA1 is stored to sha_256_context.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e sha_256_init(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha_256_init(
 		eap_variable_data_c * const sha_256_context);
 	/**
 	 * The sha_256_update() function updates the context of
 	 * sha_256_context with data_length bytes of data.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e sha_256_update(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha_256_update(
 		eap_variable_data_c * const sha_256_context,
 		const u8_t * const data,
 		const u32_t data_length);
 	/**
 	 * The sha_256_final() function writes the message authentication code
 	 * (MAC) to buffer pointed by message_digest. The length of MAC is stored
 	 * to buffer pointed by md_length_or_null, If md_length_or_null is non NULL.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e sha_256_final(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha_256_final(
 		eap_variable_data_c * const sha_256_context,
 		u8_t * const message_digest,
 		u32_t *md_length_or_null);
 	/**
 	 * The hmac_sha_256_cleanup() cleanups the SHA1 context.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e sha_256_cleanup(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha_256_cleanup(
 		eap_variable_data_c * const sha_256_context);
 	/**
 	 * The sha_256_copy_context() copies the SHA1 context.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e sha_256_copy_context(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha_256_copy_context(
 		eap_variable_data_c * const copied_sha_256_context,
 		const eap_variable_data_c * const original_sha_256_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * This function returns the size of message digest of SHA1-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_sha1_digest_length(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_sha1_digest_length(
 		eap_variable_data_c * const sha1_context);
 	/**
 	 * This function returns the block size of SHA1-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_sha1_block_size(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_sha1_block_size(
 		eap_variable_data_c * const sha1_context);
 	/**
 	 * The sha1_init() function initializes SHA1.
 	 * Internal context of SHA1 is stored to sha1_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e sha1_init(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha1_init(
 		eap_variable_data_c * const sha1_context);
 	/**
 	 * The sha1_update() function updates the context of
 	 * sha1_context with data_length bytes of data.
 	 */
-	EAP_FUNC_IMPORT eap_status_e sha1_update(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha1_update(
 		eap_variable_data_c * const sha1_context,
 		const u8_t * const data,
 		const u32_t data_length);
 	/**
 	 * (MAC) to buffer pointed by message_digest. The length of MAC is stored
 	 * to buffer pointed by md_length_or_null, If md_length_or_null is non NULL.
 	 * It must include the length of the message_digest buffer must be set before
 	 * function call.
 	 */
-	EAP_FUNC_IMPORT eap_status_e sha1_final(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha1_final(
 		eap_variable_data_c * const sha1_context,
 		u8_t * const message_digest,
 		u32_t *md_length_or_null);
 	/**
 	 * The sha1_cleanup() cleanups the SHA1 context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e sha1_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha1_cleanup(
 		eap_variable_data_c * const sha1_context);
 	/**
 	 * The sha1_copy_context() copies the SHA1 context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e sha1_copy_context(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e sha1_copy_context(
 		eap_variable_data_c * const copied_sha1_context,
 		const eap_variable_data_c * const original_sha1_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * The aes_key_length() function returns the length of key AES-algorithm.
 	 * This will be constant 16 bytes (128 bits). Still it is better use function
 	 * to help changes if the length of key is changed in future.
 	 */
-	EAP_FUNC_IMPORT u32_t aes_key_length();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t aes_key_length();
 	/**
 	 * The aes_block_size() function returns the block size of AES-algorithm.
 	 * This will be constant 16 bytes (128 bits). Still it is better use function
 	 * to help changes if the size is changed in future.
 	 */
-	EAP_FUNC_IMPORT u32_t aes_block_size();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t aes_block_size();
 	/**
 	 * The aes_set_encryption_key() function initializes the encryption
 	 * context of AES-algorithm to the aes_context using key_length bytes from buffer key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e aes_set_encryption_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e aes_set_encryption_key(
 		eap_variable_data_c * const aes_context,
 		const u8_t * const key,
 		const u32_t key_length);
 	/**
 	 * This function cleans the aes_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e aes_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e aes_cleanup(
 		eap_variable_data_c * const aes_context);
 	/**
 	 * The aes_set_decryption_key() function initializes the decryption context of
 	 * AES-algorithm to the aes_context using key_length bytes from buffer key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e aes_set_decryption_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e aes_set_decryption_key(
 		eap_variable_data_c * const aes_context,
 		const u8_t * const key,
 		const u32_t key_length);
 	/**
 	 * be aligned to block size of AES-algorithm.
 	 * This version takes pointers to input and output buffers as a parameter.
 	 * Those buffers must be fully separated. Some optimizations are used taking
 	 * advance from separate buffers.
 	 */
-	EAP_FUNC_IMPORT eap_status_e aes_encrypt_block(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e aes_encrypt_block(
 		eap_variable_data_c * const aes_context,
 		const u8_t * const data_in,
 		u8_t * const data_out,
 		const u32_t data_length);
 	 * be aligned to block size of AES-algorithm.
 	 * This version takes pointers to input and output buffers as a parameter.
 	 * Those buffers must be fully separated. Some optimizations are used
 	 * taking advance from separate buffers.
 	 */
-	EAP_FUNC_IMPORT eap_status_e aes_decrypt_block(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e aes_decrypt_block(
 		eap_variable_data_c * const aes_context,
 		const u8_t * const data_in,
 		u8_t * const data_out,
 		const u32_t data_length);
 	/**
 	 * The key_length() function returns the length of key 3DES-EDE-algorithm.
 	 * This will be constant 24 bytes (192 bits). Still it is better use function
 	 * to help changes if the length of key is changed in future.
 	 */
-	EAP_FUNC_IMPORT u32_t key_length_3des_ede();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t key_length_3des_ede();
 	/**
 	 * The block_size() function returns the block size of 3DES-EDE-algorithm.
 	 * This will be constant 24 bytes (192 bits). Still it is better use function
 	 * to help changes if the size is changed in future.
 	 */
-	EAP_FUNC_IMPORT u32_t block_size_3des_ede();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t block_size_3des_ede();
 	/**
 	 * The cbc_set_encryption_key() function initializes the encryption
 	 * context of 3DES-EDE-algorithm to the context using key_length bytes from buffer key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e set_encryption_key_3des_ede(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e set_encryption_key_3des_ede(
 		eap_variable_data_c * const context,
 		const u8_t * const key,
 		const u32_t key_length);
 	/**
 	 * The cbc_set_decryption_key() function initializes the decryption context of
 	 * 3DES-EDE-algorithm to the context using key_length bytes from buffer key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e set_decryption_key_3des_ede(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e set_decryption_key_3des_ede(
 		eap_variable_data_c * const context,
 		const u8_t * const key,
 		const u32_t key_length);
 	/**
 	 * This function cleans up context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e cleanup_3des_ede(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e cleanup_3des_ede(
 		eap_variable_data_c * const context);
 	/**
 	 * The cbc_encrypt_data() function encrypts data of data_length bytes
 	 * using encryption_IV initialization vector. NOTE the length of data must
 	 * be aligned to block size of 3DES-EDE-algorithm.
 	 * This version takes pointers to input and output buffers as a parameter.
 	 * Those buffers must be fully separated. Some optimizations are used taking
 	 * advance from separate buffers.
 	 */
-	EAP_FUNC_IMPORT eap_status_e encrypt_block_3des_ede(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e encrypt_block_3des_ede(
 		eap_variable_data_c * const context,
 		const u8_t * const data_in,
 		u8_t * const data_out,
 		const u32_t data_length);
 	 * be aligned to block size of 3DES-EDE-algorithm.
 	 * This version takes pointers to input and output buffers as a parameter.
 	 * Those buffers must be fully separated. Some optimizations are used
 	 * taking advance from separate buffers.
 	 */
-	EAP_FUNC_IMPORT eap_status_e decrypt_block_3des_ede(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e decrypt_block_3des_ede(
 		eap_variable_data_c * const context,
 		const u8_t * const data_in,
 		u8_t * const data_out,
 		const u32_t data_length);
 	 * Step 3. For j = 0 to m - 1 do
 	 *             c. xj = G(t,XKEY).
 	 *             d. XKEY = (1 + XKEY + xj) mod 2^b.
 	 * @endcode
 	 */
-	EAP_FUNC_IMPORT eap_status_e dss_pseudo_random(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dss_pseudo_random(
 		u8_t *out,
 		u32_t out_length,
 		u8_t *xkey,
 		u32_t xkey_length);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * This function returns the size of message digest of MD5-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_md5_digest_length(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_md5_digest_length(
 		eap_variable_data_c * const md5_context);
 	/**
 	 * This function returns the block size of MD5-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_md5_block_size(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_md5_block_size(
 		eap_variable_data_c * const md5_context);
 	/**
 	 * The sha1_init() function initializes MD5.
 	 * Internal context of MD5 is stored to sha1_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md5_init(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md5_init(
 		eap_variable_data_c * const md5_context);
 	/**
 	 * The md5_update() function updates the context of
 	 * md5_context with data_length bytes of data.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md5_update(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md5_update(
 		eap_variable_data_c * const md5_context,
 		const u8_t * const data,
 		const u32_t data_length);
 	/**
 	 * The md5_final() function writes the message authentication code
 	 * (MAC) to buffer pointed by message_digest. The length of MAC is stored
 	 * to buffer pointed by md_length_or_null, If md_length_or_null is non NULL.
 	 * It must include the length of the message_digest buffer before function call.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md5_final(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md5_final(
 		eap_variable_data_c * const md5_context,
 		u8_t * const message_digest,
 		u32_t *md_length_or_null);
 	/**
 	 * The hmac_md5_cleanup() cleanups the MD5 context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md5_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md5_cleanup(
 		eap_variable_data_c * const md5_context);
 	/**
 	 * The md5_copy_context() copies the MD5 context.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e md5_copy_context(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md5_copy_context(
 		eap_variable_data_c * const copied_md5_context,
 		const eap_variable_data_c * const original_md5_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * This function returns the size of message digest of MD4-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_md4_digest_length(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_md4_digest_length(
 		eap_variable_data_c * const md4_context);
 	/**
 	 * This function returns the block size of MD4-algorithm.
 	 */
-	EAP_FUNC_IMPORT u32_t get_md4_block_size(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H u32_t get_md4_block_size(
 		eap_variable_data_c * const md4_context);
 	/**
 	 * The md4_init() function initializes MD4.
 	 * Internal context of MD4 is stored to sha1_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md4_init(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md4_init(
 		eap_variable_data_c * const md4_context);
 	/**
 	 * The md4_update() function updates the context of
 	 * md4_context with data_length bytes of data.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md4_update(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md4_update(
 		eap_variable_data_c * const md4_context,
 		const u8_t * const data,
 		const u32_t data_length);
 	/**
 	 * The md4_final() function writes the message authentication code
 	 * (MAC) to buffer pointed by message_digest. The length of MAC is stored
 	 * to buffer pointed by md_length_or_null, If md_length_or_null is non NULL.
 	 * It must include the length of the message_digest buffer before function call.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md4_final(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md4_final(
 		eap_variable_data_c * const md4_context,
 		u8_t * const message_digest,
 		u32_t *md_length_or_null);
 	/**
 	 * The hmac_md4_cleanup() cleanups the MD4 context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e md4_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md4_cleanup(
 		eap_variable_data_c * const md4_context);
 	/**
 	 * The md4_copy_context() copies the MD4 context.
 	 */
-	 EAP_FUNC_IMPORT eap_status_e md4_copy_context(
+	 EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e md4_copy_context(
 		eap_variable_data_c * const copied_md4_context,
 		const eap_variable_data_c * const original_md4_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	* Used to set the RC4 key.
 	*/
-	EAP_FUNC_IMPORT eap_status_e rc4_set_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_set_key(
 		eap_variable_data_c * const rc4_context,
 		const eap_variable_data_c * const key);
 	/**
 	* Used to clean up the RC4 context.
 	*/
-	EAP_FUNC_IMPORT eap_status_e rc4_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_cleanup(
 		eap_variable_data_c * const rc4_context);
 	/**
 	 * Encrypts RC4 data.
 	 * Input and output buffers must be non overlapping.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rc4_encrypt(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_encrypt(
 		const eap_variable_data_c * const rc4_context,
 		const void * const data_in,
 		void * const data_out,
 		const u32_t data_length);
 	/**
 	 * Encrypts RC4 data.
 	 * The same buffer is used for input and output.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rc4_encrypt(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_encrypt(
 		const eap_variable_data_c * const rc4_context,
 		void * const data_in_out,
 		const u32_t data_length);
 	/**
 	 * Decrypts RC4 data.
 	 * The same buffer is used for input and output.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rc4_decrypt(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_decrypt(
 		const eap_variable_data_c * const rc4_context,
 		void * const data_in_out,
 		const u32_t data_length);
 	/**
 	 * Decrypts RC4 data.
 	 * Input and output buffers must be non overlapping.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rc4_decrypt(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rc4_decrypt(
 		const eap_variable_data_c * const rc4_context,
 		const void * const data_in,
 		void * const data_out,
 		const u32_t data_length);
 	/**
 	 * The rsa_init() function initializes context of RSA.
 	 * Internal context of RSA is stored to rsa_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_init(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_init(
 		eap_variable_data_c * const rsa_context);
 	/**
 	 * Function encrypts input data to output data using RSA algorithm with public RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_encrypt_with_public_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_encrypt_with_public_key(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const public_rsa_key,
 		const eap_variable_data_c * const input_data,
 		eap_variable_data_c * const output_data);
 	/**
 	 * Function decrypts input data to output data using RSA algorithm with public RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_decrypt_with_public_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_decrypt_with_public_key(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const public_rsa_key,
 		const eap_variable_data_c * const input_data,
 		eap_variable_data_c * const output_data);
 	/**
 	 * Function encrypts input data to output data using RSA algorithm with private RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_encrypt_with_private_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_encrypt_with_private_key(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const private_rsa_key,
 		const eap_variable_data_c * const input_data,
 		eap_variable_data_c * const output_data);
 	/**
 	 * Function decrypts input data to output data using RSA algorithm with private RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_decrypt_with_private_key(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_decrypt_with_private_key(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const private_rsa_key,
 		const eap_variable_data_c * const input_data,
 		eap_variable_data_c * const output_data);
 	/**
 	 * Function signs hash to signed hash using RSA algorithm with private RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_sign(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_sign(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const private_rsa_key,
 		const eap_variable_data_c * const hash,
 		eap_variable_data_c * const signed_hash);
 	/**
 	 * Function verifies hash and signed hash using RSA algorithm with public RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e rsa_verify(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_verify(
 		eap_variable_data_c * const rsa_context,
 		const eap_variable_data_c * const public_rsa_key,
 		const eap_variable_data_c * const hash,
 		const eap_variable_data_c * const signed_hash);
-	EAP_FUNC_IMPORT eap_status_e rsa_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e rsa_cleanup(
 		eap_variable_data_c * const rsa_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 	/**
 	 * The dsa_init() function initializes context of DSA.
 	 * Internal context of DSA is stored to dsa_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e dsa_init(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dsa_init(
 		eap_variable_data_c * const dsa_context);
 	/**
 	 * Function signs hash to signed hash using DSA algorithm with private RSA key.
 	 */
-	EAP_FUNC_IMPORT eap_status_e dsa_sign(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dsa_sign(
 		eap_variable_data_c * const dsa_context,
 		const eap_variable_data_c * const private_dsa_key,
 		const eap_variable_data_c * const hash,
 		eap_variable_data_c * const signed_hash);
 	/**
 	 * Function verifies hash and signed hash using DSA algorithm with public RSA key and DSA parameters.
 	 */
-	EAP_FUNC_IMPORT eap_status_e dsa_verify(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dsa_verify(
 		eap_variable_data_c * const dsa_context,
 		const eap_variable_data_c * const public_dsa_key,
 		const eap_variable_data_c * const dsa_param_p,
 		const eap_variable_data_c * const dsa_param_q,
 		const eap_variable_data_c * const dsa_param_g,
 		const eap_variable_data_c * const signed_hash);
 	/**
 	 * This function cleans up dsa_context.
 	 */
-	EAP_FUNC_IMPORT eap_status_e dsa_cleanup(
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H eap_status_e dsa_cleanup(
 		eap_variable_data_c * const dsa_context);
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 private:
 	/**
 	 * This function initializes crypto memory leak detection.
 	 * In Symbian this is not used.
 	 */
-	EAP_FUNC_IMPORT void open_crypto_memory_leaks();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H void open_crypto_memory_leaks();
 	/**
 	 * This function ends crypto memory leak detection.
 	 * In Symbian this is not used.
 	 */
-	EAP_FUNC_IMPORT void close_crypto_memory_leaks();
+	EAP_FUNC_VISIBILITY_EAP_AM_CRYPTO_SYMBIAN_H void close_crypto_memory_leaks();
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 private:
 	void generate_diffie_hellman_keysL(
 		eap_variable_data_c * const own_private_dh_key,

changeset 49	43351a4f2da3
parent 26	9abfd4f00d37