# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273583797 -10800
# Node ID 3634639e6dc7d100668027775b2a18f65f98bab5
# Parent  618faafb198059eb76ad31995f2cbf13b21bba16
Revision: 201017
Kit: 201019

diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp
--- a/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/tls_peap/symbian/plugin/src/EapTlsPeapUtils.cpp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 76.1.1.1.5 %
+* %version: 76.1.1.1.6 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -1986,6 +1986,8 @@
 #endif //#ifdef USE_EAP_EXPANDED_TYPES
 
 	EAP_TRACE_DEBUG_SYMBIAN((_L("EapTlsPeapUtils::ReadCertRowsToArrayL -Start")) );
+	
+	CleanupClosePushL( aArray );
 
 	HBufC* buf = HBufC::NewLC(512);
 	TPtr sqlStatement = buf->Des();
@@ -2035,6 +2037,7 @@
 	// Close database
 	CleanupStack::PopAndDestroy(colSet); 
 	CleanupStack::PopAndDestroy(2); // view, buf
+	CleanupStack::Pop( &aArray );
 }
 
 void EapTlsPeapUtils::ReadUintRowsToArrayL(
@@ -2059,6 +2062,8 @@
 	
 	EAP_TRACE_DEBUG_SYMBIAN((_L("EapTlsPeapUtils::ReadUintRowsToArrayL -Start")) );
 
+	CleanupClosePushL( aArray );
+
 	HBufC* buf = HBufC::NewLC(512);
 	TPtr sqlStatement = buf->Des();
 	
@@ -2095,6 +2100,7 @@
 
 	// Close database
 	CleanupStack::PopAndDestroy(2); // view, buf
+	CleanupStack::Pop( &aArray );
 }
 
 // Don't use this finction as Label is not saved for certificates saved by SetConfigurationL().
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eapaka.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapaka.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 17.2.2 %
+* %version: 17.2.3 %
 */
 
 #include <platform_paths.hrh>
@@ -94,8 +94,6 @@
 		
 #endif // End of #if !defined(WINS) && defined(USE_EAP_AKA_INTERFACE)
 
-MACRO EAP_NO_EXPORTS
-
 LIBRARY     eikdlg.lib
 LIBRARY     eikcore.lib
 LIBRARY     hlplch.lib
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapmschapv2.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15.2.2 %
+* %version: 18 %
 */
 
 #include <platform_paths.hrh>
@@ -66,7 +66,7 @@
 SOURCE        EapMsChapV2UiDataConnection.cpp
 SOURCE        EapMsChapV2UiMsChapV2Data.cpp
 LIBRARY       avkon.lib
-STATICLIBRARY	EAPMSCHAPV2UI.LIB
+STATICLIBRARY	eapmschapv2ui.lib
 
 USERINCLUDE   ../am/type/mschapv2/symbian/plugin/inc
 USERINCLUDE   ../../eapol_common/type/mschapv2/include
@@ -98,8 +98,6 @@
 
 LANG		  SC
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapprotectedsetup.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 12.2.2 %
+* %version: 12.2.3 %
 */
 
 #include <platform_paths.hrh>
@@ -149,8 +149,6 @@
 LIBRARY		featmgr.lib
 */
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsecurid.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 16.2.2 %
+* %version: 16.2.3 %
 */
 
 #include <platform_paths.hrh>
@@ -89,8 +89,6 @@
 
 LANG		  SC
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eapsim.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eapsim.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 18.2.2 %
+* %version: 18.2.3 %
 */
 
 #include <platform_paths.hrh>
@@ -94,8 +94,6 @@
 	LIBRARY		CustomAPI.lib etelmm.lib etel.lib	// For ETel connection	
 #endif // End of #if !defined(WINS) && defined(USE_EAP_GSMSIM_INTERFACE)
 
-MACRO EAP_NO_EXPORTS
-
 LIBRARY     eikdlg.lib
 LIBRARY     eikcore.lib
 LIBRARY     hlplch.lib
diff -r 618faafb1980 -r 3634639e6dc7 eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp
--- a/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Tue Apr 27 16:41:49 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/group/eaptlspeap.mmp	Tue May 11 16:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 44.2.2 %
+* %version: 44.2.3 %
 */
 
 #include <platform_paths.hrh>
@@ -159,8 +159,6 @@
 
 LIBRARY     charconv.lib
 
-MACRO EAP_NO_EXPORTS=1
-
 //-------------------------------------------------------------------
 
 //-------------------------------------------------------------------