diff -r f18401adf8e1 -r 641f389e9157 cryptoservices/filebasedcertificateandkeystores/group/bld.inf
--- a/cryptoservices/filebasedcertificateandkeystores/group/bld.inf	Thu Aug 19 11:38:48 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/group/bld.inf	Tue Aug 31 17:00:08 2010 +0300
@@ -34,6 +34,11 @@
 // ROMKIT includes
 ../Inc/filetokens.iby /epoc32/rom/include/filetokens.iby
 
+#ifdef SYMBIAN_AUTH_SERVER
+// file tokens cenrep file for storing the default authentication policy.
+../source/keystore/Server/200218e6.txt			z:/private/10202be9/200218e6.txt
+#endif // SYMBIAN_AUTH_SERVER
+
 PRJ_TESTEXPORTS
 //	keystore
 
@@ -65,6 +70,57 @@
 ../test/tkeystore/scripts/batchfiles/tkeystore_authobject_post.bat	/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_authobject_post.bat	
 ../test/tkeystore/scripts/batchfiles/tkeystore_export_post.bat	/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_export_post.bat	
 
+#ifdef SYMBIAN_AUTH_SERVER
+../test/tkeystore/scripts/authobjects_v2_useauth.script	/epoc32/winscw/c/tkeystore/scripts/authobjects_useauth.script
+../test/tkeystore/scripts/authobjects_v2_useauth.ini	/epoc32/winscw/c/tkeystore/scripts/authobjects_useauth.ini
+
+../test/tkeystore/scripts/createoldkeystore.script			/epoc32/winscw/c/tkeystore/scripts/createoldkeystore.script
+../test/tkeystore/scripts/createoldkeystore.ini			/epoc32/winscw/c/tkeystore/scripts/createoldkeystore.ini
+../test/tkeystore/scripts/testnewkeystore.script			/epoc32/winscw/c/tkeystore/scripts/testnewkeystore.script
+../test/tkeystore/scripts/testnewkeystore.ini			/epoc32/winscw/c/tkeystore/scripts/testnewkeystore.ini
+
+../test/tkeystore/scripts/oldserver_newfeature.script		/epoc32/winscw/c/tkeystore/scripts/oldserver_newfeature.script
+../test/tkeystore/scripts/tkeystore_useauth.script			/epoc32/winscw/c/tkeystore/scripts/tkeystore_useauth.script
+../test/tkeystore/scripts/oom_useauth.script				/epoc32/winscw/c/tkeystore/scripts/oom_useauth.script
+../test/tkeystore/scripts/servoom_useauth.script			/epoc32/winscw/c/tkeystore/scripts/servoom_useauth.script
+../test/tkeystore/scripts/exportscript_useauth.script		/epoc32/winscw/c/tkeystore/scripts/exportscript_useauth.script
+../test/tkeystore/scripts/reload_useauth.script			/epoc32/winscw/c/tkeystore/scripts/reload_useauth.script
+../test/tkeystore/scripts/cancel_useauth.script			/epoc32/winscw/c/tkeystore/scripts/cancel_useauth.script
+../test/tkeystore/scripts/tkeystore_authentication1.script	/epoc32/winscw/c/tkeystore/scripts/tkeystore_authentication1.script
+../test/tkeystore/scripts/tkeystore_authentication2.script	/epoc32/winscw/c/tkeystore/scripts/tkeystore_authentication2.script
+../test/tkeystore/scripts/tkeystore_nouserregistered.script /epoc32/winscw/c/tkeystore/scripts/tkeystore_nouserregistered.script
+../test/tkeystore/scripts/capability_useauth.script	/epoc32/winscw/c/tkeystore/scripts/capability_useauth.script
+../test/tkeystore/scripts/authenticate_useauth.script	/epoc32/winscw/c/tkeystore/scripts/authenticate_useauth.script
+
+../test/tkeystore/scripts/oldserver_newfeature.ini		/epoc32/winscw/c/tkeystore/scripts/oldserver_newfeature.ini
+../test/tkeystore/scripts/tkeystore_useauth.ini			/epoc32/winscw/c/tkeystore/scripts/tkeystore_useauth.ini
+../test/tkeystore/scripts/oom_useauth.ini				/epoc32/winscw/c/tkeystore/scripts/oom_useauth.ini
+../test/tkeystore/scripts/servoom_useauth.ini			/epoc32/winscw/c/tkeystore/scripts/servoom_useauth.ini
+../test/tkeystore/scripts/exportscript_useauth.ini		/epoc32/winscw/c/tkeystore/scripts/exportscript_useauth.ini
+../test/tkeystore/scripts/reload_useauth.ini			/epoc32/winscw/c/tkeystore/scripts/reload_useauth.ini
+../test/tkeystore/scripts/cancel_useauth.ini			/epoc32/winscw/c/tkeystore/scripts/cancel_useauth.ini
+../test/tkeystore/scripts/tkeystore_authentication1.ini	/epoc32/winscw/c/tkeystore/scripts/tkeystore_authentication1.ini
+../test/tkeystore/scripts/tkeystore_authentication2.ini	/epoc32/winscw/c/tkeystore/scripts/tkeystore_authentication2.ini
+../test/tkeystore/scripts/tkeystore_nouserregistered.ini /epoc32/winscw/c/tkeystore/scripts/tkeystore_nouserregistered.ini
+../test/tkeystore/scripts/capability_useauth.ini	/epoc32/winscw/c/tkeystore/scripts/capability_useauth.ini
+../test/tkeystore/scripts/authenticate_useauth.ini	/epoc32/winscw/c/tkeystore/scripts/authenticate_useauth.ini
+
+../test/tkeystore/scripts/registration.ini				/epoc32/winscw/c/tkeystore/scripts/registration.ini
+../test/tkeystore/scripts/reg_first_identity.script		/epoc32/winscw/c/tkeystore/scripts/reg_first_identity.script
+../test/tkeystore/scripts/reg_second_identity.script	/epoc32/winscw/c/tkeystore/scripts/reg_second_identity.script
+../test/tkeystore/scripts/initialize.script				/epoc32/winscw/c/tkeystore/scripts/initialize.script
+
+../test/tkeystore/scripts/batchfiles/epoc_keystoreusesauthserver.ini	/epoc32/winscw/c/tkeystore/scripts/batchfiles/epoc_keystoreusesauthserver.ini
+../test/tkeystore/scripts/batchfiles/replace_epoc_ini.bat				/epoc32/winscw/c/tkeystore/scripts/batchfiles/replace_epoc_ini.bat
+../test/tkeystore/scripts/batchfiles/restore_epoc_ini.bat				/epoc32/winscw/c/tkeystore/scripts/batchfiles/restore_epoc_ini.bat
+../test/tkeystore/scripts/batchfiles/tkeystore_useauthserver_post.bat	/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_useauthserver_post.bat
+../test/tkeystore/scripts/batchfiles/tkeystore_useauthserver_pre.bat	/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_useauthserver_pre.bat
+../test/tkeystore/scripts/batchfiles/tkeystore_migrate_pre.bat			/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_migrate_pre.bat
+../test/tkeystore/scripts/batchfiles/tkeystore_migrate_post.bat			/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_migrate_post.bat
+../test/tkeystore/scripts/batchfiles/tkeystore_migrate_copykeys.bat		/epoc32/winscw/c/tkeystore/scripts/batchfiles/tkeystore_migrate_copykeys.bat
+
+#endif // SYMBIAN_AUTH_SERVER
+
 // ttesttools data
 
 ../test/ttesttools/data/cert_addapps.txt	/epoc32/winscw/c/ttesttools/data/cert_addapps.txt
@@ -158,6 +214,16 @@
 ../test/ttesttools/scripts/sec-filetokens-tools.script	/epoc32/winscw/c/ttesttools/scripts/sec-filetokens-tools.script
 ../test/ttesttools/scripts/sec-filetokens-tools.ini	/epoc32/winscw/c/ttesttools/scripts/sec-filetokens-tools.ini
 
+#ifdef SYMBIAN_AUTH_SERVER
+../test/ttesttools/data/key_migrate.txt	/epoc32/winscw/c/ttesttools/data/key_migrate.txt
+../test/ttesttools/data/key_migrated_param_missing1.txt	/epoc32/winscw/c/ttesttools/data/key_migrated_param_missing1.txt
+../test/ttesttools/data/key_migrated_param_missing2.txt	/epoc32/winscw/c/ttesttools/data/key_migrated_param_missing2.txt
+../test/ttesttools/data/key_migrate_default.txt			/epoc32/winscw/c/ttesttools/data/key_migrate_default.txt
+../test/ttesttools/data/key_migrated_help.txt			/epoc32/winscw/c/ttesttools/data/key_migrated_help.txt
+../test/ttesttools/scripts/keytool_migrate.script		/epoc32/winscw/c/ttesttools/scripts/keytool_migrate.script
+../test/ttesttools/scripts/keytool_migrate.ini			/epoc32/winscw/c/ttesttools/scripts/keytool_migrate.ini
+#endif // SYMBIAN_AUTH_SERVER
+
 
 //	keystore data
 
@@ -274,6 +340,14 @@
 // ROMKIT includes
 ../Inc/filetokenstests.iby /epoc32/rom/include/filetokenstests.iby
 
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+../test/tkeystore/scripts/thwkeystore.script			/epoc32/winscw/c/tkeystore/scripts/thwkeystore.script
+../test/tkeystore/scripts/thwkeystore.ini			/epoc32/winscw/c/tkeystore/scripts/thwkeystore.ini
+../test/tkeystore/data/hwkeys.dat				/epoc32/data/z/private/101f7e95/hwkeys.dat
+../test/tkeystore/data/hwkeys.dat				/epoc32/release/winscw/udeb/z/private/101f7e95/hwkeys.dat
+../test/tkeystore/data/hwkeys.dat				/epoc32/release/winscw/urel/z/private/101f7e95/hwkeys.dat
+../test/tkeystore/data/hwkeys.dat				/epoc32/winscw/c/tkeystore/data/hwkeys.dat
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
 
 PRJ_MMPFILES
 
@@ -283,6 +357,10 @@
 fstokencli.mmp
 fstokenserver.mmp
 
+#ifdef SYMBIAN_AUTH_SERVER
+fstokenserver_useauth.mmp
+#endif
+
 filekeystoreplugin.mmp
 filecertstoreplugin.mmp
 #endif // TOOLS2
@@ -292,6 +370,10 @@
 
 #ifndef TOOLS
 #ifndef TOOLS2
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+../test/tcryptotokenhai/tcryptotokenhai.mmp
+../test/thwkeystore/client/thwkeystoreclient.mmp
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
 
 ../test/tfiletokens/tfiletokens.mmp
 ../test/tkeystore/tkeystore.mmp