multimediacommsengine/mmcesrv/mmcemediamanager/src/mcesecuremediasession.cpp
branchRCL_3
changeset 13 fb1bbf85a302
parent 12 91f50911ea81
child 19 3f7c7e6eea8a
--- a/multimediacommsengine/mmcesrv/mmcemediamanager/src/mcesecuremediasession.cpp	Tue May 25 13:07:26 2010 +0300
+++ b/multimediacommsengine/mmcesrv/mmcemediamanager/src/mcesecuremediasession.cpp	Wed Jun 09 10:06:41 2010 +0300
@@ -49,8 +49,8 @@
             iSession( aSession ),
             iSecureInterface(aSecureInterface),
             iKeyNeedUpdated( ETrue ),
-            iCryptoContextUpdate (EFalse),
-            iLSReadyToBind ( ETrue ),
+            iCryptoContextUpdate (EFalse ),
+            iLSReadyToBind ( EFalse ),
             iStringTable( NULL )
     {
     
@@ -433,7 +433,7 @@
 	{
 	MCEMM_DEBUG("CMceSecureDesStream::BindStreamCrypto(), Entry");
 	TInt err(KErrNone);
-	if (iLSReadyToBind && iSession.iClientCryptoSuites.Count())
+	if (iSession.iClientCryptoSuites.Count())
 		{
 		for (TInt i=0; i<iSession.MccStreams().Count(); i++)
 			{
@@ -441,22 +441,22 @@
 			MCEMM_DEBUG_DVALUE("	CMceSrvStream id =", stream->Data().Id().iId );	
 			MCEMM_DEBUG_DVALUE("	App id", stream->Data().Id().iAppId );		
 			TInt secStreamCount = iMceSecureDesStreams.Count();
-            for (TInt j=0; j<secStreamCount; j++)
-                {
-                CMceSecureDesStream* secureStream=iMceSecureDesStreams[j];
-                MCEMM_DEBUG_DVALUE("	SrvStream id in SecureStream ", secureStream->MediaStream().Id().iId);	
-                MCEMM_DEBUG_DVALUE("	App id in SecureStream ", secureStream->MediaStream().Id().iAppId);	
-                if(secureStream->iWaitingBinding)
-                    {
-                    if (stream->Data().Id()== secureStream->MediaStream().Id() || 
-                         ( stream->Data().BoundStream() && 
-                           stream->Data().iLinkedStream->Id() == secureStream->MediaStream().Id() ) ) 
-                        {
-                        //bind
-                        err = secureStream->BindCrypto(*stream);					
-                        }
-                    }
-                }
+    		for (TInt j=0; j<secStreamCount; j++)
+				{
+				CMceSecureDesStream* secureStream=iMceSecureDesStreams[j]; 
+				MCEMM_DEBUG_DVALUE("	SrvStream id in SecureStream ", secureStream->MediaStream().Id().iId);	
+				MCEMM_DEBUG_DVALUE("	App id in SecureStream ", secureStream->MediaStream().Id().iAppId);	
+				if (stream->Data().Id()== secureStream->MediaStream().Id() || 
+					 ( stream->Data().BoundStream() && 
+					   stream->Data().iLinkedStream->Id() == secureStream->MediaStream().Id() ) ) 
+					{
+					//bind
+				    if( secureStream->iWaitingBinding )
+				    	{
+						secureStream->BindCrypto(*stream);
+				    	}
+					}
+				}
 			}
 		}
 	MCEMM_DEBUG("CMceSecureDesStream::BindStreamCrypto(), Exit");