diff -r f54bfd820e04 -r b5e99d8877c7 rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp
--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp	Thu Aug 19 10:16:25 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp	Tue Aug 31 15:32:57 2010 +0300
@@ -315,49 +315,91 @@
 void UT_CSrtpAuthentication_RCC::Teardown(  )
     {
     delete iAuthenticator;
+	iAuthenticator = NULL;
     
 	delete iRFC2202_Test1_Key_160bits;
 	delete iRFC2202_Test1_Data_16bits;
 	delete iRFC2202_Test1_Tag_80bits;
 	delete iRFC2202_Test1_Tag_32bits;
+	
+	iRFC2202_Test1_Key_160bits = NULL;
+	iRFC2202_Test1_Data_16bits = NULL;
+	iRFC2202_Test1_Tag_80bits = NULL;
+	iRFC2202_Test1_Tag_32bits = NULL;
 
 	delete iRFC2202_Test2_Key;
 	delete iRFC2202_Test2_Data_28bits;
 	delete iRFC2202_Test2_Tag_80bits;
 	delete iRFC2202_Test2_Tag_32bits;
+	
+	iRFC2202_Test2_Key = NULL;
+	iRFC2202_Test2_Data_28bits = NULL;
+	iRFC2202_Test2_Tag_80bits = NULL;
+	iRFC2202_Test2_Tag_32bits = NULL;
 
 	delete iRFC2202_Test3_Key_160bits;
 	delete iRFC2202_Test3_Data_400bits;
 	delete iRFC2202_Test3_Tag_80bits;
 	delete iRFC2202_Test3_Tag_32bits;
+	
+	iRFC2202_Test3_Key_160bits = NULL;
+	iRFC2202_Test3_Data_400bits = NULL;
+	iRFC2202_Test3_Tag_80bits = NULL;
+	iRFC2202_Test3_Tag_32bits = NULL;
 
     delete iRFC2202_Test4_Key_200bits;
     delete iRFC2202_Test4_Data_400bits;
     delete iRFC2202_Test4_Tag_80bits;
     delete iRFC2202_Test4_Tag_32bits;
+	
+	iRFC2202_Test4_Key_200bits = NULL;
+    iRFC2202_Test4_Data_400bits = NULL;
+    iRFC2202_Test4_Tag_80bits = NULL;
+    iRFC2202_Test4_Tag_32bits = NULL;
 
     delete iRFC2202_Test5_Key_160bits;
     delete iRFC2202_Test5_Data;
     delete iRFC2202_Test5_Tag_80bits;
     delete iRFC2202_Test5_Tag_32bits;
+	
+	iRFC2202_Test5_Key_160bits = NULL;
+    iRFC2202_Test5_Data = NULL;
+    iRFC2202_Test5_Tag_80bits = NULL;
+    iRFC2202_Test5_Tag_32bits = NULL;
 
 	delete iRFC2202_Test6_Key_640bits;
 	delete iRFC2202_Test6_Data_54bits;
 	delete iRFC2202_Test6_Tag_80bits;
 	delete iRFC2202_Test6_Tag_32bits;
+	
+	iRFC2202_Test6_Key_640bits = NULL;
+	iRFC2202_Test6_Data_54bits = NULL;
+	iRFC2202_Test6_Tag_80bits = NULL;
+	iRFC2202_Test6_Tag_32bits = NULL;
 
 	delete iRFC2202_Test7_Key_640bits;
 	delete iRFC2202_Test7_Data_73bits;
 	delete iRFC2202_Test7_Tag_80bits;
 	delete iRFC2202_Test7_Tag_32bits;
+	
+	iRFC2202_Test7_Key_640bits = NULL;
+	iRFC2202_Test7_Data_73bits = NULL;
+	iRFC2202_Test7_Tag_80bits = NULL;
+	iRFC2202_Test7_Tag_32bits = NULL;
+	
 	delete iTest8_Key_160bits;
 	delete iTest8_Data_168bits;
 	delete iTest8_Data2_32bits;
 	delete iTest8_Tag_80bits;
+	
+	iTest8_Key_160bits = NULL;
+	iTest8_Data_168bits = NULL;
+	iTest8_Data2_32bits = NULL;
+	iTest8_Tag_80bits = NULL;
     }
 
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test1_Key_160bits, 
  	                                         *iRFC2202_Test1_Data_16bits,
@@ -371,7 +413,7 @@
  	delete result;     	 	 	
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test1_Key_160bits, 
  	                                         *iRFC2202_Test1_Data_16bits,
@@ -380,7 +422,7 @@
     }
 
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test2_Key, 
  	                                         *iRFC2202_Test2_Data_28bits,
@@ -394,7 +436,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test2_Key, 
  	                                         *iRFC2202_Test2_Data_28bits,
@@ -403,7 +445,7 @@
     }
 
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test3_Key_160bits, 
  	                                         *iRFC2202_Test3_Data_400bits,
@@ -417,7 +459,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test3_Key_160bits, 
  	                                         *iRFC2202_Test3_Data_400bits,
@@ -425,7 +467,7 @@
 
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test4_Key_200bits, 
  	                                         *iRFC2202_Test4_Data_400bits,
@@ -439,7 +481,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE(  iAuthenticator->AuthenticateL(32, *iRFC2202_Test4_Key_200bits, 
  	                                         *iRFC2202_Test4_Data_400bits,
@@ -447,7 +489,7 @@
 
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test5_Key_160bits, 
  	                                         *iRFC2202_Test5_Data,
@@ -461,7 +503,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test5_Key_160bits, 
  	                                         *iRFC2202_Test5_Data,
@@ -469,7 +511,7 @@
 
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test6_Key_640bits, 
  	                                         *iRFC2202_Test6_Data_54bits,
@@ -483,7 +525,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE(  iAuthenticator->AuthenticateL(32, *iRFC2202_Test6_Key_640bits, 
  	                                         *iRFC2202_Test6_Data_54bits,
@@ -491,7 +533,7 @@
 
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_80L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_EightyL(  )
     {
  	HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test7_Key_640bits, 
  	                                         *iRFC2202_Test7_Data_73bits,
@@ -505,7 +547,7 @@
  	delete result;    
     }
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL(  )
     {
  	EUNIT_ASSERT_SPECIFIC_LEAVE(  iAuthenticator->AuthenticateL(32, *iRFC2202_Test7_Key_640bits, 
  	                                         *iRFC2202_Test7_Data_73bits,
@@ -514,7 +556,7 @@
     }
 
 
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_32L(  )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_ThirtyTwoL(  )
     {
     TBuf8<20> buf; 
     TBuf8<19> buf2;
@@ -593,8 +635,8 @@
 
 void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test_KeyChangedL()
 {
-    UT_AuthenticateL_RFC2202_Test2_80L();
-    UT_AuthenticateL_RFC2202_Test3_80L();
+    UT_AuthenticateL_RFC2202_Test2_EightyL();
+    UT_AuthenticateL_RFC2202_Test3_EightyL();
 }
 
 void UT_CSrtpAuthentication_RCC::Hex(HBufC8& aString)
@@ -630,104 +672,104 @@
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test1_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test1_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 1 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test1_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 2 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test2_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test2_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 2 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test2_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 3 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test3_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test3_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 3 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test3_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 4 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test4_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test4_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 4 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test4_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 5 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test5_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test5_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 5 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test5_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 6 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test6_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test6_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 6 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test6_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 7 80 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test7_80L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test7_EightyL, Teardown)
 
 EUNIT_TEST(
     "AuthenticateL - 7 32 bits",
     "CSrtpAuthentication_RCC",
     "AuthenticateL",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_RFC2202_Test7_32L, Teardown)
+    SetupL, UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL, Teardown)
 EUNIT_TEST(
     "AuthenticateL - RealPacket",
     "CSrtpAuthentication_RCC",
     "AuthenticateL with Real Packet",
     "FUNCTIONALITY",
-    SetupL, UT_AuthenticateL_Test8_32L, Teardown)
+    SetupL, UT_AuthenticateL_Test8_ThirtyTwoL, Teardown)
   
 EUNIT_TEST(
     "AuthenticateL - KeyChanged",