--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSrtpAuthentication_RCC.cpp Wed Sep 01 12:27:36 2010 +0100
@@ -315,91 +315,49 @@
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_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -413,7 +371,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test1_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test1_Key_160bits,
*iRFC2202_Test1_Data_16bits,
@@ -422,7 +380,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -436,7 +394,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test2_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test2_Key,
*iRFC2202_Test2_Data_28bits,
@@ -445,7 +403,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -459,7 +417,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test3_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test3_Key_160bits,
*iRFC2202_Test3_Data_400bits,
@@ -467,7 +425,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -481,7 +439,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test4_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test4_Key_200bits,
*iRFC2202_Test4_Data_400bits,
@@ -489,7 +447,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -503,7 +461,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test5_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test5_Key_160bits,
*iRFC2202_Test5_Data,
@@ -511,7 +469,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -525,7 +483,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test6_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test6_Key_640bits,
*iRFC2202_Test6_Data_54bits,
@@ -533,7 +491,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_EightyL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_80L( )
{
HBufC8* result = iAuthenticator->AuthenticateL(80, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -547,7 +505,7 @@
delete result;
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_RFC2202_Test7_32L( )
{
EUNIT_ASSERT_SPECIFIC_LEAVE( iAuthenticator->AuthenticateL(32, *iRFC2202_Test7_Key_640bits,
*iRFC2202_Test7_Data_73bits,
@@ -556,7 +514,7 @@
}
-void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_ThirtyTwoL( )
+void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test8_32L( )
{
TBuf8<20> buf;
TBuf8<19> buf2;
@@ -635,8 +593,8 @@
void UT_CSrtpAuthentication_RCC::UT_AuthenticateL_Test_KeyChangedL()
{
- UT_AuthenticateL_RFC2202_Test2_EightyL();
- UT_AuthenticateL_RFC2202_Test3_EightyL();
+ UT_AuthenticateL_RFC2202_Test2_80L();
+ UT_AuthenticateL_RFC2202_Test3_80L();
}
void UT_CSrtpAuthentication_RCC::Hex(HBufC8& aString)
@@ -672,104 +630,104 @@
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 1 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test1_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test1_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 2 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test2_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test2_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 3 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test3_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test3_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 4 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test4_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test4_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 5 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test5_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test5_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 6 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test6_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test6_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 80 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_EightyL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_80L, Teardown)
EUNIT_TEST(
"AuthenticateL - 7 32 bits",
"CSrtpAuthentication_RCC",
"AuthenticateL",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_RFC2202_Test7_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_RFC2202_Test7_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - RealPacket",
"CSrtpAuthentication_RCC",
"AuthenticateL with Real Packet",
"FUNCTIONALITY",
- SetupL, UT_AuthenticateL_Test8_ThirtyTwoL, Teardown)
+ SetupL, UT_AuthenticateL_Test8_32L, Teardown)
EUNIT_TEST(
"AuthenticateL - KeyChanged",