--- a/accesssec_plat/eap_qt_configuration_api/inc/eapqtconfiginterface.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/accesssec_plat/eap_qt_configuration_api/inc/eapqtconfiginterface.h	Thu Sep 16 13:07:04 2010 +0300
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version: 8 %
+ * %version: 9 %
  */
 
 #ifndef EAPQTCONFIGINTERFACE_H
@@ -67,7 +67,7 @@
 
     // NOTE: the default constuctor can only be used for creating validators
     // with validatorEap() and validatorPacStore(), and accessing EAP-FAST PAC store,
-    // any other call throws an exeption;
+    // any other call throws an exception;
     // also, throws an exception if the construction fails
     EapQtConfigInterface();
 

--- a/accesssec_plat/eap_qt_configuration_api/inc/eapqtpacstoreconfig.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/accesssec_plat/eap_qt_configuration_api/inc/eapqtpacstoreconfig.h	Thu Sep 16 13:07:04 2010 +0300
@@ -17,7 +17,7 @@
  */
 
 /*
- * %version: 6 %
+ * %version: 7 %
  */
 
 #ifndef EAPQTPACSTORECONFIG_H
@@ -46,7 +46,7 @@
 
     // Data types
 
-    enum PacStoreState
+    enum PacStoreStatus
     {
         // PAC store does not exist and needs to be created
         // (status also reverts to PacStoreStateStoreNotExists if the PAC store is
@@ -78,10 +78,10 @@
         PacStoreSavePassword,
         /*! write-only: bool
          *      true: deletes PAC store, i.e. clears everything related to the
-         *        existing PAC store inlcuding saved password
+         *        existing PAC store including saved password
          *      false/QVariant::Invalid: no actions */
         PacStoreReset,
-        /*! read-only: int (PacStoreState) */
+        /*! read-only: int (PacStoreStatus) */
         PacStoreState,
         /*! no write nor read operation, for validator usage only
          *  - uses the validator to check if the given password

--- a/accesssec_plat/eap_type_api/group/bld.inf	Fri Sep 03 09:22:44 2010 +0300
+++ b/accesssec_plat/eap_type_api/group/bld.inf	Thu Sep 16 13:07:04 2010 +0300
@@ -17,7 +17,7 @@
 */
 
 /*
-* %version: tr1cfwln#17 %
+* %version: tr1cfwln#18 %
 */
 
 #include <platform_paths.hrh>
@@ -32,11 +32,10 @@
 ../inc/EapTypeDefinitions.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTypeDefinitions.h)
 ../inc/EapType.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapType.h)
 ../inc/EapType.inl     MW_LAYER_PLATFORM_EXPORT_PATH(EapType.inl)
-../inc/EapTypePlugin.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTypePlugin.h)
-../inc/EapTypePlugin.inl     MW_LAYER_PLATFORM_EXPORT_PATH(EapTypePlugin.inl)
 ../inc/EapSettings.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapSettings.h)
 ../inc/EapTypeInfo.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapTypeInfo.h)
 ../inc/EapGeneralSettings.inl     MW_LAYER_PLATFORM_EXPORT_PATH(EapGeneralSettings.inl)
 ../inc/EapGeneralSettings.h     MW_LAYER_PLATFORM_EXPORT_PATH(EapGeneralSettings.h)
+../inc/AbsPacStoreInitializer.h     MW_LAYER_PLATFORM_EXPORT_PATH(AbsPacStoreInitializer.h)
 
 // end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accesssec_plat/eap_type_api/inc/AbsPacStoreInitializer.h	Thu Sep 16 13:07:04 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  EAP and WLAN authentication protocols.
+*
+*/
+
+/*
+* %version: 2 %
+*/
+
+#if !defined(_ABSPACSTOREINITIALIZER_H_)
+#define _ABSPACSTOREINITIALIZER_H_
+
+#if defined(USE_FAST_EAP_TYPE)
+	#include "eap_fast_types.h"
+#endif //#if defined(USE_FAST_EAP_TYPE)
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABSPACSTOREINITIALIZER_H)
+	#define EAP_CLASS_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H 
+	#define EAP_C_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H 
+	#define EAP_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H 
+	#define EAP_C_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H 
+#elif defined(EAP_EXPORT_ABSPACSTOREINITIALIZER_H)
+	#define EAP_CLASS_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABSPACSTOREINITIALIZER_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H 
+	#define EAP_C_FUNC_EXPORT_ABSPACSTOREINITIALIZER_H 
+#endif
+// End: added by script change_export_macros.sh.
+
+
+/// The class is the interface to partner class of the tls_base_application_c class which starts the PAC-store initialization.
+/// This declares the pure virtual member functions tls_base_application_c class could call.
+class EAP_CLASS_VISIBILITY_ABSPACSTOREINITIALIZER_H AbsPacStoreInitializer
+{
+private:
+	//--------------------------------------------------
+
+	//--------------------------------------------------
+protected:
+	//--------------------------------------------------
+
+	//--------------------------------------------------
+public:
+	//--------------------------------------------------
+
+	/**
+	 * The destructor of the AbsPacStoreInitializer class does nothing special.
+	 */
+	virtual ~AbsPacStoreInitializer()
+	{
+	}
+
+	/**
+	 * The constructor of the AbsPacStoreInitializer class does nothing special.
+	 */
+	AbsPacStoreInitializer()
+	{
+	}
+
+#if defined(USE_FAST_EAP_TYPE)
+
+	virtual TInt CompleteInitialisePacStore() = 0;
+
+#endif //#if defined(USE_FAST_EAP_TYPE)
+
+	//--------------------------------------------------
+}; // class AbsPacStoreInitializer
+
+#endif //#if !defined(_ABSPACSTOREINITIALIZER_H_)
+
+//--------------------------------------------------
+
+// End.

--- a/accesssec_plat/eap_type_api/inc/EapType.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/accesssec_plat/eap_type_api/inc/EapType.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 33 %
+* %version: 34 %
 */
 
 #ifndef _EAPTYPE_H_

--- a/accesssec_plat/eap_type_api/inc/EapTypeInfo.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/accesssec_plat/eap_type_api/inc/EapTypeInfo.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: %
+* %version: 5.1.4 %
 */
 
 #ifndef _EAPTYPEINFO_H_
@@ -33,7 +33,7 @@
 /**
 * Class for storing and transferring the EAP type informational parameters. 
 */
-class CEapTypeInfo : public CBase
+NONSHARABLE_CLASS(CEapTypeInfo) : public CBase
 {
 public:
 

--- a/accesssec_plat/eap_type_api/inc/EapTypePlugin.h	Fri Sep 03 09:22:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 8 %
-*/
-
-#ifndef _EAP_TYPE_PLUGIN_H_
-#define _EAP_TYPE_PLUGIN_H_
-
-// INCLUDES
-#include <e32base.h>
-#include <ecom/ecom.h> 
-
-#include <EapSettings.h>
-#include <EapTypeDefinitions.h>
-
-// FORWARD DECLARATIONS
-class abs_eap_am_tools_c;
-class eap_base_type_c;
-class abs_eap_base_type_c;
-class CEapTypeInfo;
-class eap_am_network_id_c;
-
-#ifndef RD_WLAN_3_1_BACKPORTING
-class abs_eap_configuration_if_c;
-#endif
-
-
-// CLASS DECLARATION
-
-/**
-* The interface class for direct EAP plug-in access.
-* Includes methods to create either the configuration interface or the EAP protocol interface.
-*/
-class CEapTypePlugin
-: public CBase
-{
-public:
-
-	/**
-	* Factory function that loads the EAP type implementation DLL (plug-in).
-	* Uses ECom architecture to load the correct EAP type DLL. Calls the initialization
-	* function of the EAP type
-	* @param aCue EAP type id that specifies which plugin is loaded.
-	* @param aIndexType Indicates the bearer used for this connection.
-	* @param aIndex Index for the connection. aIndexType and aIndex uniquely specify the connection.
-	* @return Pointer to the implementation.
-	*/
-	inline static CEapTypePlugin* NewL(const TDesC8& aCue, TIndexType aIndexType, TInt aIndex);	
-
-	/**
-	* Unloads the implementation DLL.
-	*/
-	inline virtual ~CEapTypePlugin();
-
-	/**
-	* Creates EAP protocol interface implementation. Instances an object that
-	* has been derived from eap_base_type_c that handles the communication 
-	* with EAP stack. 
-	* @param aTools Pointer to tools class.
-	* @param aPartner Used for callbacks to the stack.
-	* @param is_client_when_true Specifies whether the EAP type acts as a client or server.
-	* @param receive_network_id Network addresses
-	* @param eap_config_if Pointer used for call back to creater of stack (eapol_am_wlan_authentication_symbian_c class).
-	* @return Pointer to the implementation.
-	*/		
-	virtual eap_base_type_c* GetStackInterfaceL(abs_eap_am_tools_c* const aTools, 
-											   abs_eap_base_type_c* const aPartner,
-											   const bool is_client_when_true,
-											   const eap_am_network_id_c * const receive_network_id,
-											   abs_eap_configuration_if_c * const configuration_if) = 0;
-
-#if 0
-#ifndef RD_WLAN_3_1_BACKPORTING
-
-#else
-
-	/**
-	* Creates EAP protocol interface implementation. Instances an object that
-	* has been derived from eap_base_type_c that handles the communication 
-	* with EAP stack. 
-	* @param aTools Pointer to tools class.
-	* @param aPartner Used for callbacks to the stack.
-	* @param is_client_when_true Specifies whether the EAP type acts as a client or server.
-	* @param receive_network_id Network addresses
-	* @return Pointer to the implementation.
-	*/		
-
-	virtual eap_base_type_c* GetStackInterfaceL(abs_eap_am_tools_c* const aTools, 
-											   abs_eap_base_type_c* const aPartner,
-											   const bool is_client_when_true,
-											   const eap_am_network_id_c * const receive_network_id) = 0;
-	
-#endif // #ifndef RD_WLAN_3_1_BACKPORTING
-#endif
-
-
-	
-	/**
-	* Gets information about EAP type. 
-	* @return Pointer to a class that contains the EAP type information. Also pushed to cleanup stack.
-	*/
-	virtual CEapTypeInfo* GetInfoL() = 0;
-	
-	/**
-	* Deletes EAP type configuration
-	*/	
-	virtual void DeleteConfigurationL() = 0;
-
-	/**
-	* Returns the version of the interface that the EAP type implements.
-	* The client-side of the interface must always check the version with this function 
-	* and not call the functions that are not implemented. New functions must be
-	* added to the end of the interface so that the order of the old functions
-	* does not change.
-	* @return Integer indicating the version.
-	*/
-	virtual TUint GetInterfaceVersion() = 0;
-
-	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_OUTSIDE_PEAP is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/
-	inline static TBool IsDisallowedOutsidePEAP(const CImplementationInformation& aImplInfo);
-
-	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_INSIDE_PEAP is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/	
-	inline static TBool IsDisallowedInsidePEAP(const CImplementationInformation& aImplInfo);
-
-	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_INSIDE_TTLS is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/	
-	inline static TBool IsDisallowedInsideTTLS(const CImplementationInformation& aImplInfo);
-
-	/**
-	* Sets the tunneling type. This is used to indicate that this type is run inside another 
-	* EAP type. 
-	* @param aTunnelingType Type number for the tunneling type
-	*/	
-	virtual void SetTunnelingType(const TEapExpandedType aTunnelingType) = 0;
-	
-	/**
-	* Changes the index of the saved parameters.
-	* @param aIndexType Indicates the bearer used for this connection.
-	* @param aIndex Index for the connection. aIndexType and aIndex uniquely specify the connection.
-	*/
-	virtual void SetIndexL(
-		const TIndexType aIndexType, 
-		const TInt aIndex) = 0;
-
-	/**
-	* Sets the EAP types configuration
-	* @param aSettings Structure containing the settings
-	*/
-	virtual void SetConfigurationL(const EAPSettings& aSettings) = 0;
-
-	/**
-	* Gets the EAP types configuration
-	* @param aSettings Structure containing the settings
-	*/
-	virtual void GetConfigurationL(EAPSettings& aSettings) = 0;
-	
-	/**
-	* Copies the EAP types configuration
-	* @param aDestinationIndexType index type of the destination, ELan for WLAN.
-	* @param aDestinationIndex ID to where copy the settings.
-	*/
-	virtual void CopySettingsL(
-		const TIndexType aDestinationIndexType, 
-		const TInt aDestinationIndex) = 0;
-
-
-private:
-
-	/// ECom uses this key to keep track of DLL usage.
-	TUid iDtor_ID_Key;
-};
-
-#include "EapTypePlugin.inl"
-
-#endif // _EAP_TYPE_PLUGIN_H_
-
-// End of file

--- a/accesssec_plat/eap_type_api/inc/EapTypePlugin.inl	Fri Sep 03 09:22:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-/*
-* Copyright (c) 2001-2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  EAP and WLAN authentication protocols.
-*
-*/
-
-/*
-* %version: 6 %
-*/
-
-/* The meaning and bit positions used in "opaque_data" field in ECOM implementation
-
- 0 0 0 0 0 0 0 0 ---->All 0 means allowed both inside (encapsulated EAP) and outside (Outer EAP)
- | | | | | | | |
- | | | | | | | |_____ 1 means NOT_INSIDE_TUNNEL (NOT allowed as encapsulated EAP)
- | | | | | | |
- | | | | | | |_______ 1 means NOT_OUTSIDE_TUNNEL (only allowed as encapsulated EAP, NOT as outer EAP)
- | | | | | |  
- | | | | | |_________ 1 means NOT_INSIDE_PEAP
- | | | | |  
- | | | | |___________ 1 means NOT_OUTSIDE_PEAP  
- | | | | 
- | | | |_____________ 1 means NOT_INSIDE_TTLS
- | | | 
- | | |_______________ 1 means NOT_OUTSIDE_TTLS
- | | 
- | |_________________ 1 means NOT_INSIDE_FAST
- |
- |___________________ 1 means NOT_OUTSIDE_FAST
- 
- 
- // For historical reasons NOT_OUTSIDE_PEAP is used instead of NOT_OUTSIDE_TUNNEL
- // Both of these convey the same meaning. It means if an EAP is not allowed outside PEAP
- // (DisallowedOutsidePEAP), it can be used only as an encapsulated EAP.
- // EAP-MSCHAPv2 is an example for this.
-
- // The bits can be ORed. 
- // "NOT_OUTSIDE|NOT_OUTSIDE_PEAP" is 0x0A (0000 1010).
- // "NOT_OUTSIDE|NOT_OUTSIDE_PEAP|NOT_INSIDE_PEAP|NOT_INSIDE_FAST" is 0x4E (0100 1110).
- // "NOT_INSIDE|NOT_INSIDE_PEAP|NOT_INSIDE_TTLS|NOT_INSIDE_FAST" is 0x55 (0101 0101).
- // "NOT_INSIDE|NOT_INSIDE_PEAP|NOT_INSIDE_TTLS|NOT_INSIDE_FAST|NOT_OUTSIDE_PEAP|NOT_OUTSIDE" is 0x5F (0101 1111).
- 
-*/
-
-#include "EapTraceSymbian.h"
-
-
-const TUint8 KNotInsideTunnel = 0x01; // Only the last bit position is 1. 		(0000 0001)
-const TUint8 KNotOutsideTunnel = 0x02; // Only the 2nd last bit positions is 1. (0000 0010)
-
-const TUint8 KNotInsidePEAP = 0x04; // Only the 3rd last bit position is 1. 	(0000 0100)
-const TUint8 KNotOutsidePEAP = 0x08; // Only the 4th last bit positions is 1. 	(0000 1000)
-
-const TUint8 KNotInsideTTLS = 0x10; // Only the 5th last bit position is 1. 	(0001 0000)
-const TUint8 KNotOutsideTTLS = 0x20; // Only the 6th last bit position is 1. 	(0010 0000)
-
-const TUint8 KNotInsideFAST = 0x40; // Only the 7th last bit position is 1. 	(0100 0000)
-const TUint8 KNotOutsideFAST = 0x80;  // Only the first bit position is 1. 		(1000 0000)
-
-// Used By Server
-inline CEapTypePlugin* CEapTypePlugin::NewL(const TDesC8& aCue, TIndexType aIndexType, TInt aIndex)
-{
-    EAP_TRACE_DEBUG_SYMBIAN((_L("CEapTypePlugin::NewL(): start")));
-
-	// The EAP type id (aCue) is passed to ECom as resolver parameters
-    TEComResolverParams resolverParams;
-    resolverParams.SetDataType(aCue);
-	
-	// The arguments are stored to a iapInfo struct.
-	SIapInfo iapInfo;
-	iapInfo.indexType = aIndexType;
-	iapInfo.index = aIndex;
-	iapInfo.aEapType = aCue;
-
-	EAP_TRACE_DATA_DEBUG_SYMBIAN(("CEapTypePlugin::NewL(): resolverParams.DataType()",
-		resolverParams.DataType().Ptr(),
-		resolverParams.DataType().Size()));
-
-    EAP_TRACE_DEBUG_SYMBIAN((_L("CEapTypePlugin::NewL(): iapInfo.aEapType=0xfe%06x%08x\n"),
-		iapInfo.aEapType.GetVendorId(),
-		iapInfo.aEapType.GetVendorType()));
-
-	// This call finds and loads the correct DLL and after that calls the
-	// entry function in the interface implementation in the DLL.
-	TAny* ptr = 0;
-
-    TRAPD( err, ptr = REComSession::CreateImplementationL(
-        KEapTypeInterfaceUid,
-        _FOFF(CEapTypePlugin, iDtor_ID_Key), 
-		&iapInfo,
-        resolverParams));
-
-    EAP_TRACE_DEBUG_SYMBIAN((_L("CEapTypePlugin::NewL(): ends, err=%d, returns ptr=0x%08x\n"),
-		err,
-		ptr));
-
-	User::LeaveIfError(err);
-
-    return (CEapTypePlugin *) ptr;
-}
-
-inline CEapTypePlugin::~CEapTypePlugin()
-{
-    EAP_TRACE_DEBUG_SYMBIAN((_L("CEapTypePlugin::~CEapTypePlugin(): this=0x%08x"),
-		this));
-
-	EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: CEapTypePlugin::~CEapTypePlugin()"));
-
-	// Unload DLL
-    REComSession::DestroyedImplementation(iDtor_ID_Key);
-}
-
-inline TBool CEapTypePlugin::IsDisallowedOutsidePEAP(const CImplementationInformation& aImplInfo)
-{
-	
-	const TUint8 pluginOpaqueData = *(aImplInfo.OpaqueData().Ptr());
-	
-	if(pluginOpaqueData & KNotOutsidePEAP)
-	{
-		return ETrue;
-	}
-	return EFalse;
-	
-}
-
-inline TBool CEapTypePlugin::IsDisallowedInsidePEAP(const CImplementationInformation& aImplInfo)
-{
-	const TUint8 pluginOpaqueData = *(aImplInfo.OpaqueData().Ptr());
-	
-	if(pluginOpaqueData & KNotInsidePEAP)
-	{
-		return ETrue;
-	}
-	return EFalse;
-
-}
-
-inline TBool CEapTypePlugin::IsDisallowedInsideTTLS(const CImplementationInformation& aImplInfo)
-{
-	const TUint8 pluginOpaqueData = *(aImplInfo.OpaqueData().Ptr());
-	
-	if(pluginOpaqueData & KNotInsideTTLS)
-	{
-		return ETrue;
-	}
-	return EFalse;
-}
-
-// End of file

--- a/eapol/eapol_framework/eapol_common/am/common/DSS_random/dss_random.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/common/DSS_random/dss_random.h	Thu Sep 16 13:07:04 2010 +0300
@@ -21,13 +21,34 @@
 
 #include "eap_am_types.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_DSS_RANDOM_H)
+	#define EAP_CLASS_VISIBILITY_DSS_RANDOM_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_DSS_RANDOM_H 
+	#define EAP_C_FUNC_VISIBILITY_DSS_RANDOM_H 
+	#define EAP_FUNC_EXPORT_DSS_RANDOM_H 
+	#define EAP_C_FUNC_EXPORT_DSS_RANDOM_H 
+#elif defined(EAP_EXPORT_DSS_RANDOM_H)
+	#define EAP_CLASS_VISIBILITY_DSS_RANDOM_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_DSS_RANDOM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_DSS_RANDOM_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_DSS_RANDOM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_DSS_RANDOM_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_DSS_RANDOM_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_DSS_RANDOM_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_DSS_RANDOM_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_DSS_RANDOM_H 
+	#define EAP_C_FUNC_EXPORT_DSS_RANDOM_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_am_tools.h"
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-EAP_C_FUNC_IMPORT eap_status_e dss_pseudo_random(abs_eap_am_tools_c * const am_tools, u8_t *out, u32_t out_length, u8_t *xkey, u32_t xkey_length);
+EAP_C_FUNC_VISIBILITY_DSS_RANDOM_H eap_status_e dss_pseudo_random(abs_eap_am_tools_c * const am_tools, u8_t *out, u32_t out_length, u8_t *xkey, u32_t xkey_length);
 
 #ifdef  __cplusplus
 }

--- a/eapol/eapol_framework/eapol_common/am/common/eap_am_tools.cpp	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/common/eap_am_tools.cpp	Thu Sep 16 13:07:04 2010 +0300
@@ -445,7 +445,7 @@
 
 EAP_FUNC_EXPORT eap_status_e eap_am_tools_c::timer_thread_function()
 {
-	EAP_TRACE_TIMER(this, TRACE_FLAGS_TIMER, (EAPL("TIMER: Timer thread starts.\n")));
+	EAP_TRACE_DEBUG(this, TRACE_FLAGS_ALWAYS, (EAPL("TIMER: Timer thread starts.\n")));
 
 	u32_t static_sleep_time = get_timer_resolution_ms();
 	u64_t start_time = get_clock_ticks();
@@ -635,7 +635,7 @@
 
 	delete mutex;
 
-	EAP_TRACE_TIMER(this, TRACE_FLAGS_TIMER, (EAPL("TIMER: Timer thread stops.\n")));
+	EAP_TRACE_DEBUG(this, TRACE_FLAGS_ALWAYS, (EAPL("TIMER: Timer thread stops.\n")));
 
 	m_thread_stopped =true;
 
@@ -1650,7 +1650,7 @@
 	EAP_TRACE_DEBUG(
 		this,
 		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_tools_c::shutdown_am_tools(); this = 0x%08x\n"),
+		(EAPL("eap_am_tools_c::shutdown_am_tools(): this = 0x%08x\n"),
 		 this));
 
 	if (m_shutdown_was_called == false)

--- a/eapol/eapol_framework/eapol_common/am/common/eap_file_config.cpp	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/common/eap_file_config.cpp	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 33 %
+* %version: 35 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -2227,7 +2227,7 @@
 			}
 			else
 			{
-				// Some konfiguration objects are not included to message yet.
+				// Some configuration objects are not included to message yet.
 			}
 
 			atom = atom->get_next_atom();
@@ -2513,6 +2513,32 @@
 	}
 	else //if (status != eap_status_ok)
 	{
+		EAP_TRACE_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("\n")));
+
+		EAP_TRACE_DATA_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("ERROR: CONFIG MESSAGE: option failed"),
+			 selector.get_data(),
+			 selector.get_data_length()));
+		
+		EAP_TRACE_DATA_DEBUG(
+			m_am_tools, 
+			TRACE_FLAGS_DEFAULT, 
+			(EAPL("ERROR: CONFIG MESSAGE: data"), 
+			 config->get_data()->get_data(), 
+			 config->get_data()->get_data_length()));
+
+		EAP_TRACE_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("ERROR: CONFIG MESSAGE: option type %d=%s\n"),
+			 config->get_type(),
+			 eap_configuration_field_c::get_configure_type_string(config->get_type())));
+
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return EAP_STATUS_RETURN(m_am_tools, status);
 	}
@@ -2600,11 +2626,15 @@
 		}
 
 		status = add_option(option_header);
-		if (status != eap_status_ok)
+		if (status != eap_status_ok
+			&& status != eap_status_handler_exists_error // Here we skip duplicate configuration values.
+			)
 		{
 			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 			return EAP_STATUS_RETURN(m_am_tools, status);
 		}
+
+		status = eap_status_ok;
 	}
 
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);

--- a/eapol/eapol_framework/eapol_common/am/common/stack/eap_am_stack_trace.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/common/stack/eap_am_stack_trace.h	Thu Sep 16 13:07:04 2010 +0300
@@ -23,6 +23,27 @@
 #define _STACK_OUTPUT_H_
 
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_EAP_AM_STACK_TRACE_H)
+	#define EAP_CLASS_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H 
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H 
+	#define EAP_FUNC_EXPORT_EAP_AM_STACK_TRACE_H 
+	#define EAP_C_FUNC_EXPORT_EAP_AM_STACK_TRACE_H 
+#elif defined(EAP_EXPORT_EAP_AM_STACK_TRACE_H)
+	#define EAP_CLASS_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_EAP_AM_STACK_TRACE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_EAP_AM_STACK_TRACE_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_EAP_AM_STACK_TRACE_H 
+	#define EAP_C_FUNC_EXPORT_EAP_AM_STACK_TRACE_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 class abs_eap_am_tools_c;
 
@@ -30,7 +51,7 @@
  * This class implemets a stack trace. This code is highly processor dependent.
  * Only Intel processor with gcc or MSVC is supported.
  */
-class EAP_EXPORT stack_trace
+class EAP_CLASS_VISIBILITY_EAP_AM_STACK_TRACE_H stack_trace
 {
 private:
 
@@ -41,7 +62,7 @@
 	 * This function traces stack frames starting from bp.
 	 * The bp is pointer to base of the starting stack frame.
 	 */
-	EAP_FUNC_IMPORT void trace_frames(
+	EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H void trace_frames(
 		unsigned long *bp
 		);
 
@@ -50,18 +71,18 @@
 	/**
 	 * Destructor does nothing special.
 	 */
-	EAP_FUNC_IMPORT virtual ~stack_trace();
+	EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H virtual ~stack_trace();
 
 	/**
 	 * Constructor does nothing special.
 	 */
-	EAP_FUNC_IMPORT stack_trace(abs_eap_am_tools_c * const tools);
+	EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H stack_trace(abs_eap_am_tools_c * const tools);
 
 	/**
 	 * This function traces stack frames starting from current frame.
 	 * Value of parameter memory_address is traced in the begin.
 	 */
-	EAP_FUNC_IMPORT void trace(const void * const memory_address);
+	EAP_FUNC_VISIBILITY_EAP_AM_STACK_TRACE_H void trace(const void * const memory_address);
 
 };
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_aka_algorithm.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_aka_algorithm.h	Thu Sep 16 13:07:04 2010 +0300
@@ -27,6 +27,27 @@
 #include "abs_eap_am_tools.h"
 #include "eap_am_tools.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_AKA_ALGORITHM_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_type_aka_authentication_vector.h"
 
 enum aka_algorithm_e
@@ -39,7 +60,7 @@
 
 
 /// This class is implements Nokia test network AKA algorithm.
-class EAP_EXPORT abs_eap_am_aka_algorithm_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_AKA_ALGORITHM_H abs_eap_am_aka_algorithm_c
 {
 private:
 	//--------------------------------------------------

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_bloom_algorithm_store.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_bloom_algorithm_store.h	Thu Sep 16 13:07:04 2010 +0300
@@ -24,6 +24,29 @@
 
 
 #include "eap_tools.h"
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H 
+#endif
+// End: added by script change_export_macros.sh.
+
 
 //--------------------------------------------------
 
@@ -40,7 +63,7 @@
  *  Bit index count is count of separate indexes extracted from hash digest.
  *  Each index is n bits long. The size of the bit store is 2^n bits.
  */
-class EAP_EXPORT abs_eap_am_bloom_algorithm_store_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H abs_eap_am_bloom_algorithm_store_c
 {
 
 private:
@@ -56,14 +79,14 @@
 	/**
 	 * The destructor of the abs_eap_am_bloom_algorithm_store_c class does nothing special.
 	 */
-	EAP_FUNC_IMPORT virtual ~abs_eap_am_bloom_algorithm_store_c()
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H virtual ~abs_eap_am_bloom_algorithm_store_c()
 	{
 	}
 
 	/**
 	 * The constructor of the abs_eap_am_bloom_algorithm_store_c does nothing special.
 	 */
-	EAP_FUNC_IMPORT abs_eap_am_bloom_algorithm_store_c()
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_BLOOM_ALGORITHM_STORE_H abs_eap_am_bloom_algorithm_store_c()
 	{
 	}
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_crypto.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_crypto.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_ABS_EAP_AM_CRYPTO_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_CRYPTO_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_CRYPTO_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_CRYPTO_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_am_tools.h"
 #include "eap_array.h"
 
@@ -47,7 +68,7 @@
 
 /// Class eap_am_crypto offers services to authenticate data, encrypt data,
 /// decrypt data, generate keys and generate cryptographically strong random data.
-class EAP_EXPORT abs_eap_am_crypto_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_CRYPTO_H abs_eap_am_crypto_c
 {
 private:
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - -

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_file_input.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_file_input.h	Thu Sep 16 13:07:04 2010 +0300
@@ -25,6 +25,29 @@
 
 #include "eap_tools.h"
 #include "eap_array.h"
+#include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_FILE_INPUT_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_FILE_INPUT_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_FILE_INPUT_H 
+#endif
+// End: added by script change_export_macros.sh.
+
 
 //--------------------------------------------------
 
@@ -79,7 +102,7 @@
 /// This is interface to EAP file input.
 /** The EAP file input is used in configuration file read operations.
  */
-class EAP_EXPORT abs_eap_am_file_input_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_FILE_INPUT_H abs_eap_am_file_input_c
 {
 
 private:

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_general_settings.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_general_settings.h	Thu Sep 16 13:07:04 2010 +0300
@@ -25,12 +25,33 @@
 #include "eap_tools.h"
 #include "eap_status.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_GENERAL_SETTINGS_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 /** @file */
 
 /// This class is the common part of EAP message interface.
 /// This class is interface to the message creation and parsing function.
-class EAP_EXPORT abs_eap_am_general_settings_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_GENERAL_SETTINGS_H abs_eap_am_general_settings_c
 {
 
 private:

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_memory_store_data.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_memory_store_data.h	Thu Sep 16 13:07:04 2010 +0300
@@ -24,24 +24,45 @@
 
 
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MEMORY_STORE_DATA_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 /// This class is base class for data stored to memory store.
 /**
  * Here are no real functions.
  */
-class EAP_EXPORT abs_eap_am_memory_store_data_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H abs_eap_am_memory_store_data_c
 {
 public:
 
 	/**
 	 * The destructor of the abs_eap_am_memory_store_data_c class does nothing special.
 	 */
-	EAP_FUNC_IMPORT virtual ~abs_eap_am_memory_store_data_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H virtual ~abs_eap_am_memory_store_data_c();
 
 	/**
 	 * The constructor of the abs_eap_am_memory_store_data_c does nothing special.
 	 */
-	EAP_FUNC_IMPORT abs_eap_am_memory_store_data_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MEMORY_STORE_DATA_H abs_eap_am_memory_store_data_c();
 
 };
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_message_if.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_message_if.h	Thu Sep 16 13:07:04 2010 +0300
@@ -24,13 +24,34 @@
 
 #include "eap_tools.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_MESSAGE_IF_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MESSAGE_IF_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 //--------------------------------------------------
 
 /** @file */
 
 /// This class is abstract interface to send data messages through abstract interface.
-class EAP_EXPORT abs_eap_am_message_if_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_MESSAGE_IF_H abs_eap_am_message_if_c
 {
 
 private:

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_mutex.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_mutex.h	Thu Sep 16 13:07:04 2010 +0300
@@ -25,21 +25,42 @@
 #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_ABS_EAP_AM_MUTEX_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_MUTEX_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_MUTEX_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 class eap_am_mutex_reference_c;
 
 // ---------------------------------------------
 
 /// This class is interface to mutex.
-class EAP_EXPORT abs_eap_am_mutex_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H abs_eap_am_mutex_c
 {
 private:
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~abs_eap_am_mutex_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual ~abs_eap_am_mutex_c();
 
-	EAP_FUNC_IMPORT abs_eap_am_mutex_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H abs_eap_am_mutex_c();
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -47,32 +68,32 @@
 	 * This function enters the mutex. Thread will block until the mutex is released
 	 * by other owner of the mutex.
 	 */
-	EAP_FUNC_IMPORT virtual eap_status_e mutex_enter() = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual eap_status_e mutex_enter() = 0;
 
 	/**
 	 * This function leaves the mutex. Other blocking thread will continue execution.
 	 */
-	EAP_FUNC_IMPORT virtual eap_status_e mutex_leave(abs_eap_am_tools_c * const m_am_tools) = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual eap_status_e mutex_leave(abs_eap_am_tools_c * const m_am_tools) = 0;
 
 	/**
 	 * The mutex handle must be dublicated in Symbian operating system for each thread.
 	 */
-	EAP_FUNC_IMPORT virtual abs_eap_am_mutex_c * dublicate_mutex() = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual abs_eap_am_mutex_c * dublicate_mutex() = 0;
 
 	/**
 	 * This function returns the flag that indicates whether the mutex is reserved. 
 	 * This is used in debug asserts. Those will check the mutex is really reserved when critical code is entered.
 	 */
-	EAP_FUNC_IMPORT virtual bool get_is_reserved() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual bool get_is_reserved() const = 0;
 
 	/**
 	 * Returns the validity of the mutex.
 	 */
-	EAP_FUNC_IMPORT virtual bool get_is_valid() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual bool get_is_valid() const = 0;
 
 #if defined(USE_EAPOL_MUTEX_SEMAPHORE_TRACES)
-	EAP_FUNC_IMPORT virtual eap_am_mutex_reference_c * get_reference() const = 0;
-	EAP_FUNC_IMPORT virtual void set_am_tools(abs_eap_am_tools_c * const tools) = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual eap_am_mutex_reference_c * get_reference() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual void set_am_tools(abs_eap_am_tools_c * const tools) = 0;
 #endif //#if defined(USE_EAPOL_MUTEX_SEMAPHORE_TRACES)
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
@@ -82,7 +103,7 @@
 // ---------------------------------------------
 
 /// This class defines a reference counter of a mutex.
-class EAP_EXPORT eap_am_mutex_reference_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_reference_c
 {
 
 private:
@@ -100,41 +121,41 @@
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~eap_am_mutex_reference_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual ~eap_am_mutex_reference_c();
 
-	EAP_FUNC_IMPORT eap_am_mutex_reference_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_reference_c();
 
 	/**
 	 * This function adds one reference to the mutex. 
 	 */
-	EAP_FUNC_IMPORT void add_reference();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H void add_reference();
 
 	/**
 	 * This function removes one reference to the mutex. 
 	 */
-	EAP_FUNC_IMPORT void remove_reference();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H void remove_reference();
 
 	/**
 	 * This function returns the reference count of the mutex. 
 	 */
-	EAP_FUNC_IMPORT u32_t get_reference_count();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H u32_t get_reference_count();
 
 	/**
 	 * This function sets the flag that indicates whether the mutex is reserved. 
 	 */
-	EAP_FUNC_IMPORT void set_is_reserved(const bool is_reserved);
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H void set_is_reserved(const bool is_reserved);
 
 	/**
 	 * This function returns the flag that indicates whether the mutex is reserved. 
 	 * This is used in debug asserts. Those will check the mutex is really reserved when critical code is entered.
 	 */
-	EAP_FUNC_IMPORT bool get_is_reserved();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H bool get_is_reserved();
 };
 
 // ---------------------------------------------
 
 /// This class is base of the mutex.
-class EAP_EXPORT eap_am_mutex_base_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_base_c
 {
 private:
 
@@ -148,16 +169,16 @@
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~eap_am_mutex_base_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H virtual ~eap_am_mutex_base_c();
 
-	EAP_FUNC_IMPORT eap_am_mutex_base_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_base_c();
 
-	EAP_FUNC_IMPORT eap_am_mutex_base_c(const eap_am_mutex_base_c * const owner);
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_base_c(const eap_am_mutex_base_c * const owner);
 
 	/**
 	 * This function returns pointer to the reference counter object of the mutex.
 	 */
-	EAP_FUNC_IMPORT eap_am_mutex_reference_c * get_reference() const;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H eap_am_mutex_reference_c * get_reference() const;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -165,12 +186,12 @@
 	 * This function returns the flag that indicates whether the mutex is reserved. 
 	 * This is used in debug asserts. Those will check the mutex is really reserved when critical code is entered.
 	 */
-	EAP_FUNC_IMPORT bool get_is_reserved() const;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H bool get_is_reserved() const;
 
 	/**
 	 * Returns the validity of the mutex.
 	 */
-	EAP_FUNC_IMPORT bool get_is_valid() const;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_MUTEX_H bool get_is_valid() const;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_pac_store.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_pac_store.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: %
+* %version: 7 %
 */
 
 #if !defined(_ABS_EAP_AM_PAC_STORE_H_)
@@ -25,12 +25,33 @@
 #include "eap_tools.h"
 #include "eap_status.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_PAC_STORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_PAC_STORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PAC_STORE_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PAC_STORE_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 /** @file */
 
 /// This class is the common part of EAP message interface.
 /// This class is interface to the message creation and parsing function.
-class EAP_EXPORT abs_eap_am_pac_store_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_PAC_STORE_H abs_eap_am_pac_store_c
 {
 
 private:
@@ -43,12 +64,6 @@
 	{
 	}
 
-	virtual eap_status_e complete_open_pac_store(
-		const eap_status_e completion_status) = 0;
-
-	virtual eap_status_e complete_create_device_seed(
-		const eap_status_e completion_status) = 0;
-
 	virtual eap_status_e complete_is_master_key_present(
 	  const bool is_present) = 0;
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_plugin.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_plugin.h	Thu Sep 16 13:07:04 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: %
+* %version: 5 %
 */
 
 #if !defined(_ABS_EAP_AM_PLUGIN_H_)
@@ -25,6 +25,27 @@
 #include "eap_tools.h"
 #include "eap_status.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_PLUGIN_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_PLUGIN_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_PLUGIN_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_PLUGIN_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 class eap_method_settings_c;
 
@@ -32,7 +53,7 @@
 
 /// This class is the common part of EAP message interface.
 /// This class is interface to the message creation and parsing function.
-class EAP_EXPORT abs_eap_am_plugin_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_PLUGIN_H abs_eap_am_plugin_c
 {
 
 private:

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_radius.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_radius.h	Thu Sep 16 13:07:04 2010 +0300
@@ -23,12 +23,33 @@
 #define _ABS_EAP_AM_TYPE_RADIUS_H_
 
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_RADIUS_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_RADIUS_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_RADIUS_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_RADIUS_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_sim_triplets.h"
 #include "eap_radius_types.h"
 
 /// This class declares the functions adaptation module of RADIUS EAP type
 /// requires from the RADIUS EAP type.
-class EAP_EXPORT abs_eap_am_radius_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_RADIUS_H abs_eap_am_radius_c
 {
 private:
 	//--------------------------------------------------

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_semaphore.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_semaphore.h	Thu Sep 16 13:07:04 2010 +0300
@@ -25,21 +25,42 @@
 #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_ABS_EAP_AM_SEMAPHORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_SEMAPHORE_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SEMAPHORE_H 
+#endif
+// End: added by script change_export_macros.sh.
 
 class eap_am_semaphore_reference_c;
 
 // ---------------------------------------------
 
 /// This class is interface to semaphore.
-class EAP_EXPORT abs_eap_am_semaphore_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H abs_eap_am_semaphore_c
 {
 private:
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~abs_eap_am_semaphore_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual ~abs_eap_am_semaphore_c();
 
-	EAP_FUNC_IMPORT abs_eap_am_semaphore_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H abs_eap_am_semaphore_c();
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -47,28 +68,28 @@
 	 * This function reserves the semaphore. Thread will block until the semaphore is released
 	 * by other owner of the semaphore.
 	 */
-	EAP_FUNC_IMPORT virtual eap_status_e semaphore_reserve() = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual eap_status_e semaphore_reserve() = 0;
 
 	/**
 	 * This function releases the semaphore. Other blocking thread will continue execution.
 	 */
-	EAP_FUNC_IMPORT virtual eap_status_e semaphore_release() = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual eap_status_e semaphore_release() = 0;
 
 	/**
 	 * The semaphore handle must be dublicated in Symbian operating system for each thread.
 	 */
-	EAP_FUNC_IMPORT virtual abs_eap_am_semaphore_c * dublicate_semaphore() = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual abs_eap_am_semaphore_c * dublicate_semaphore() = 0;
 
-	EAP_FUNC_IMPORT virtual u32_t get_count() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual u32_t get_count() const = 0;
 
 	/**
 	 * Returns the validity of the semaphore.
 	 */
-	EAP_FUNC_IMPORT virtual bool get_is_valid() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual bool get_is_valid() const = 0;
 
 #if defined(USE_EAPOL_MUTEX_SEMAPHORE_TRACES)
-	EAP_FUNC_IMPORT virtual eap_am_semaphore_reference_c * get_reference() const = 0;
-	EAP_FUNC_IMPORT virtual void set_am_tools(abs_eap_am_tools_c * const tools) = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual eap_am_semaphore_reference_c * get_reference() const = 0;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual void set_am_tools(abs_eap_am_tools_c * const tools) = 0;
 #endif //#if defined(USE_EAPOL_MUTEX_SEMAPHORE_TRACES)
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
@@ -78,7 +99,7 @@
 // ---------------------------------------------
 
 /// This class defines a reference counter of a semaphore.
-class EAP_EXPORT eap_am_semaphore_reference_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_reference_c
 {
 
 private:
@@ -88,21 +109,21 @@
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~eap_am_semaphore_reference_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual ~eap_am_semaphore_reference_c();
 
-	EAP_FUNC_IMPORT eap_am_semaphore_reference_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_reference_c();
 
-	EAP_FUNC_IMPORT void add_reference();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H void add_reference();
 
-	EAP_FUNC_IMPORT void remove_reference();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H void remove_reference();
 
-	EAP_FUNC_IMPORT u32_t get_reference_count();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H u32_t get_reference_count();
 };
 
 // ---------------------------------------------
 
 /// This class is base of the semaphore.
-class EAP_EXPORT eap_am_semaphore_base_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_base_c
 {
 private:
 
@@ -112,18 +133,18 @@
 
 public:
 
-	EAP_FUNC_IMPORT virtual ~eap_am_semaphore_base_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H virtual ~eap_am_semaphore_base_c();
 
-	EAP_FUNC_IMPORT eap_am_semaphore_base_c();
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_base_c();
 
-	EAP_FUNC_IMPORT eap_am_semaphore_base_c(const eap_am_semaphore_base_c * const owner);
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_base_c(const eap_am_semaphore_base_c * const owner);
 
-	EAP_FUNC_IMPORT eap_am_semaphore_reference_c * get_reference() const;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H eap_am_semaphore_reference_c * get_reference() const;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 
 	/// Returns the validity of the semaphore.
-	EAP_FUNC_IMPORT bool get_is_valid() const;
+	EAP_FUNC_VISIBILITY_ABS_EAP_AM_SEMAPHORE_H bool get_is_valid() const;
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 

--- a/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_sim_algorithm.h	Fri Sep 03 09:22:44 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/am/include/abs_eap_am_sim_algorithm.h	Thu Sep 16 13:07:04 2010 +0300
@@ -27,6 +27,27 @@
 #include "abs_eap_am_tools.h"
 #include "eap_am_tools.h"
 #include "eap_am_export.h"
+// Start: added by script change_export_macros.sh.
+#if defined(EAP_NO_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_NONSHARABLE 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H 
+#elif defined(EAP_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H)
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_EXPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_C_FUNC_EXPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H EAP_FUNC_EXPORT 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H EAP_C_FUNC_EXPORT 
+#else
+	#define EAP_CLASS_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_IMPORT 
+	#define EAP_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_FUNC_IMPORT 
+	#define EAP_C_FUNC_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H EAP_C_FUNC_IMPORT 
+	#define EAP_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H 
+	#define EAP_C_FUNC_EXPORT_ABS_EAP_AM_SIM_ALGORITHM_H 
+#endif
+// End: added by script change_export_macros.sh.
 #include "eap_sim_triplets.h"
 
 enum sim_algorithm_e
@@ -38,7 +59,7 @@
 
 
 /// This class is implements Nokia test network SIM algorithm.
-class EAP_EXPORT abs_eap_am_sim_algorithm_c
+class EAP_CLASS_VISIBILITY_ABS_EAP_AM_SIM_ALGORITHM_H abs_eap_am_sim_algorithm_c
 {
 private:
 	//--------------------------------------------------