--- a/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTCP.cpp	Tue Aug 31 15:32:57 2010 +0300
+++ b/rtp/srtpstack/tsrc/ut_srtpstack/src/UT_CSRTPCryptoHandlerSRTCP.cpp	Wed Sep 01 12:27:36 2010 +0100
@@ -228,26 +228,14 @@
     delete iTestPayload160Bits;
     delete iTestMKI128Bits;
     delete iTestAuthTag80Bits;
-	
-	iDecryptedPayload = NULL;
-    iTestPayload160Bits = NULL;
-    iTestMKI128Bits = NULL;
-    iTestAuthTag80Bits = NULL;
 
     delete iStreamIn;
-    delete iSRTPSession;   
-
-    iStreamIn = NULL;
-    iSRTPSession = NULL;	
+    delete iSRTPSession;    
 
     
     delete iRFC3711_SessionEncrKey128bits;
     delete iRFC3711_SessionSaltKey128bits;
-    delete iRFC3711_SessionAuthKey128bits;   
-
-    iRFC3711_SessionEncrKey128bits = NULL;
-    iRFC3711_SessionSaltKey128bits = NULL;
-    iRFC3711_SessionAuthKey128bits = NULL; 	
+    delete iRFC3711_SessionAuthKey128bits;    
 
     }
 
@@ -263,7 +251,7 @@
 
 
 
-void UT_CSRTPCryptoHandlerSRTCP::UT_DeriveSessionKeysL_OneL()
+void UT_CSRTPCryptoHandlerSRTCP::UT_DeriveSessionKeysL_1L()
 	{
 	HBufC8* encSrtcpPacket =HBufC8::NewLC(KSRTCPPacket().Length());
 	*encSrtcpPacket=KSRTCPPacket;
@@ -656,7 +644,7 @@
     "CSRTPCryptoHandlerSRTCP",
     "DeriveSessionKeys",
     "FUNCTIONALITY",
-    SetupL, UT_DeriveSessionKeysL_OneL, Teardown)
+    SetupL, UT_DeriveSessionKeysL_1L, Teardown)
     
 EUNIT_TEST(
     "Authentication1",