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