--- a/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/tkeystore.mmp	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/tkeystore/tkeystore.mmp	Thu Sep 10 14:01:51 2009 +0300
@@ -1,70 +1,80 @@
-/*
-* Copyright (c) 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: 
-*
-*/
-/**
-@file
-
-@SYMPurpose t_keystore.exe Test harness for keystore
-*/
-
-TARGET	t_keystore.exe
-TARGETTYPE	exe
-
-UID 0x10000079 0x101F7E95
-
-VENDORID 0x70000001
-
-// Need WriteDeviceData to call SetTimeout 
-// Need AllFiles to delete keystore data file
-// (Don't worry, we test things work without this capability!)
-// Need others so we can test various settings for the management policy (we
-// can't "give away" management priviledge)
-CAPABILITY AllFiles ReadUserData WriteUserData ReadDeviceData WriteDeviceData DRM
-
-SOURCEPATH	.
-SOURCE t_keystore.cpp
-SOURCE t_keystore_actions.cpp
-SOURCE t_addkey.cpp
-SOURCE t_delete.cpp
-SOURCE t_list.cpp
-SOURCE t_import.cpp
-SOURCE t_export.cpp
-SOURCE t_exportpublic.cpp
-SOURCE t_compare.cpp
-SOURCE t_open.cpp
-SOURCE t_deletekeystoredata.cpp
-SOURCE t_authobjects.cpp
-SOURCE t_settimeout.cpp
-SOURCE t_relockstore.cpp
-SOURCE t_settime.cpp
-SOURCE t_corrupt.cpp
-SOURCE t_listall.cpp
-
-SOURCE t_policyaccessors.cpp
-
-USERINCLUDE ../../../../cryptomgmtlibs/securitytestfw/test/testhandler2
-USERINCLUDE ../tfiletokens
-
-SYSTEMINCLUDE ../../../../crypto/weakcrypto/inc
-SYSTEMINCLUDE ../../source/generic/client 
-SYSTEMINCLUDE ../../source/generic/common
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/ecom
-
-LIBRARY	euser.lib efsrv.lib ecom.lib cryptography.lib
-LIBRARY certstore.lib crypto.lib hash.lib
-LIBRARY t_testhandler2.lib ctframework.lib x509.lib
-LIBRARY estor.lib pbe.lib random.lib tfiletokens.lib
+/*
+* Copyright (c) 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: 
+*
+*/
+
+/**
+@file
+
+@SYMPurpose t_keystore.exe Test harness for keystore
+*/
+
+TARGET	t_keystore.exe
+TARGETTYPE	exe
+
+UID 0x10000079 0x101F7E95
+
+VENDORID 0x70000001
+
+// Need WriteDeviceData to call SetTimeout 
+// Need AllFiles to delete keystore data file
+// (Don't worry, we test things work without this capability!)
+// Need others so we can test various settings for the management policy (we
+// can't "give away" management priviledge)
+CAPABILITY AllFiles ReadUserData WriteUserData ReadDeviceData WriteDeviceData DRM
+
+SOURCEPATH	.
+SOURCE t_keystore.cpp
+SOURCE t_keystore_actions.cpp
+SOURCE t_addkey.cpp
+SOURCE t_delete.cpp
+SOURCE t_list.cpp
+SOURCE t_import.cpp
+SOURCE t_export.cpp
+SOURCE t_exportpublic.cpp
+SOURCE t_compare.cpp
+SOURCE t_open.cpp
+SOURCE t_deletekeystoredata.cpp
+SOURCE t_authobjects.cpp
+SOURCE t_settimeout.cpp
+SOURCE t_relockstore.cpp
+SOURCE t_settime.cpp
+SOURCE t_corrupt.cpp
+SOURCE t_listall.cpp
+SOURCE t_policyaccessors.cpp
+#ifdef SYMBIAN_AUTH_SERVER
+SOURCE t_authenticationpolicy.cpp
+#endif // SYMBIAN_AUTH_SERVER
+
+USERINCLUDE ../../../../cryptomgmtlibs/securitytestfw/test/testhandler2
+USERINCLUDE ../tfiletokens
+
+SYSTEMINCLUDE ../../../../crypto/weakcrypto/inc
+SYSTEMINCLUDE ../../source/generic/client 
+SYSTEMINCLUDE ../../source/generic/common
+SYSTEMINCLUDE /epoc32/include
+SYSTEMINCLUDE /epoc32/include/ecom
+SYSTEMINCLUDE ../../Inc
+
+LIBRARY	euser.lib efsrv.lib ecom.lib cryptography.lib
+LIBRARY certstore.lib crypto.lib hash.lib
+LIBRARY t_testhandler2.lib ctframework.lib x509.lib
+LIBRARY estor.lib pbe.lib random.lib tfiletokens.lib
+
+#ifdef SYMBIAN_AUTH_SERVER
+LIBRARY	authclient.lib
+#endif // SYMBIAN_AUTH_SERVER
+
+SMPSAFE