diff -r 675a964f4eb5 -r 35751d3474b7 cryptomgmtlibs/securitytestfw/test/testutil/server/testutilstartup.cpp
--- a/cryptomgmtlibs/securitytestfw/test/testutil/server/testutilstartup.cpp	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptomgmtlibs/securitytestfw/test/testutil/server/testutilstartup.cpp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,96 +1,94 @@
-/*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-* TestUtil - entry point
-*
-*/
-
-
-
-
-/**
- @file 
- @test
- @internalComponent
-*/
-
-#include <e32std.h>
-#include <e32base.h>
-
-#include "testutilserver.h"
-#include "testutilclientserver.h"
-
-//
-// Perform server initialisation, in particular creation of the scheduler and 
-// server and then run the scheduler
-//
-static void RunServerL()
-//
-// Perform all server initialisation, in particular creation of the
-// scheduler and server and then run the scheduler
-//
-	{
-	// naming the server thread after the server helps to debug panics
-	User::LeaveIfError(RThread().RenameMe(KTestUtilServerName));
-	//
-	// create and install the active scheduler we need
-	CActiveScheduler* s=new(ELeave) CActiveScheduler;
-	CleanupStack::PushL(s);
-	CActiveScheduler::Install(s);
-	//
-	// create the server (leave it on the cleanup stack)
-	CTestUtilServer::NewLC();
-	//
-	// Initialisation complete, now signal the client
-
-	RProcess::Rendezvous(KErrNone);
-
-	//
-	// Ready to run
-	CActiveScheduler::Start();
-	//
-	// Cleanup the server and scheduler
-	CleanupStack::PopAndDestroy(2);
-	}
-
-//
-// Server process entry-point
-//
-TInt E32Main()
-	{
-	__UHEAP_MARK;
-	//
-	CTrapCleanup* cleanup=CTrapCleanup::New();
-	TInt r=KErrNoMemory;
-	if (cleanup)
-		{
-		TRAP(r,RunServerL());
-		delete cleanup;
-		}
-	//
-	__UHEAP_MARKEND;
-	return r;
-	}
-
-
-void PanicClient(const RMessagePtr2& aMessage,TTestUtilPanic aPanic)
-//
-// RMessagePtr2::Panic() also completes the message. This is:
-// (a) important for efficient cleanup within the kernel
-// (b) a problem if the message is completed a second time
-//
-	{
-	_LIT(KPanic,"TestUtilServer");
-	aMessage.Panic(KPanic,aPanic);
-	}
+/*
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+* TestUtil - entry point
+*
+*/
+
+
+/**
+ @file 
+ @test
+ @internalComponent
+*/
+
+#include <e32std.h>
+#include <e32base.h>
+
+#include "testutilserver.h"
+#include "testutilclientserver.h"
+
+//
+// Perform server initialisation, in particular creation of the scheduler and 
+// server and then run the scheduler
+//
+static void RunServerL()
+//
+// Perform all server initialisation, in particular creation of the
+// scheduler and server and then run the scheduler
+//
+	{
+	// naming the server thread after the server helps to debug panics
+	User::LeaveIfError(RThread().RenameMe(KTestUtilServerName));
+	//
+	// create and install the active scheduler we need
+	CActiveScheduler* s=new(ELeave) CActiveScheduler;
+	CleanupStack::PushL(s);
+	CActiveScheduler::Install(s);
+	//
+	// create the server (leave it on the cleanup stack)
+	CTestUtilServer::NewLC();
+	//
+	// Initialisation complete, now signal the client
+
+	RProcess::Rendezvous(KErrNone);
+
+	//
+	// Ready to run
+	CActiveScheduler::Start();
+	//
+	// Cleanup the server and scheduler
+	CleanupStack::PopAndDestroy(2);
+	}
+
+//
+// Server process entry-point
+//
+TInt E32Main()
+	{
+	__UHEAP_MARK;
+	//
+	CTrapCleanup* cleanup=CTrapCleanup::New();
+	TInt r=KErrNoMemory;
+	if (cleanup)
+		{
+		TRAP(r,RunServerL());
+		delete cleanup;
+		}
+	//
+	__UHEAP_MARKEND;
+	return r;
+	}
+
+
+void PanicClient(const RMessagePtr2& aMessage,TTestUtilPanic aPanic)
+//
+// RMessagePtr2::Panic() also completes the message. This is:
+// (a) important for efficient cleanup within the kernel
+// (b) a problem if the message is completed a second time
+//
+	{
+	_LIT(KPanic,"TestUtilServer");
+	aMessage.Panic(KPanic,aPanic);
+	}