--- a/eapol/eapol_framework/eapol_symbian/am/include/EapTlsPeapNotifierStructs.h	Fri May 14 15:54:13 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/include/EapTlsPeapNotifierStructs.h	Fri Jun 11 13:40:22 2010 +0300
@@ -16,24 +16,59 @@
 */
 
 /*
-* %version: 6.1.2 %
+* %version: %
 */
 
 #ifndef _CERTIFICATESELECTIONINFO_H_
 #define _CERTIFICATESELECTIONINFO_H_
 
 #include "EapTlsPeapUtils.h"
+#include "EapTraceSymbian.h"
 
 const TUint KIdentityFieldLength = 64;
 
-struct TCertificateSelectionInfo
+class TCertificateSelectionInfo
 {
-	TInt iCount;
-	TFixedArray<SCertEntry, 32> iCertificates;
+
+public:
+
+	TCertificateSelectionInfo()
+	{
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TCertificateSelectionInfo::TCertificateSelectionInfo()\n")));
+		EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: TCertificateSelectionInfo::TCertificateSelectionInfo()\n"));
+	}
+
+	virtual ~TCertificateSelectionInfo()
+	{
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TCertificateSelectionInfo::~TCertificateSelectionInfo()\n")));
+		EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: TCertificateSelectionInfo::~TCertificateSelectionInfo()\n"));
+
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TCertificateSelectionInfo::~TCertificateSelectionInfo(): calls iCertificates.ResetAndDestroy()")));
+		iCertificates.ResetAndDestroy(); // ResetAndDestroy() function must be called because the objects represented by the array need to be deleted before the array object is destroyed.
+
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TCertificateSelectionInfo::~TCertificateSelectionInfo(): calls iCertificates.Close()")));
+		iCertificates.Close(); // The Close() function must be called before RPointerArray object is destroyed.
+	}
+
+	RPointerArray<EapCertificateEntry> iCertificates;
 };
 
-struct TIdentityInfo
+class TIdentityInfo
 {
+public:
+
+	TIdentityInfo()
+	{
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TIdentityInfo::TIdentityInfo()\n")));
+		EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: TIdentityInfo::TIdentityInfo()\n"));
+	}
+
+	virtual ~TIdentityInfo()
+	{
+		EAP_TRACE_DEBUG_SYMBIAN((_L("TIdentityInfo::~TIdentityInfo()\n")));
+		EAP_TRACE_RETURN_STRING_SYMBIAN(_L("returns: TIdentityInfo::~TIdentityInfo()\n"));
+	}
+
 	TBool iUseManualUsername;
 	TBuf<KIdentityFieldLength> iUsername;
 	TBuf<KIdentityFieldLength> iRealm;