diff -r f18401adf8e1 -r 641f389e9157 cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby
--- a/cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby	Thu Aug 19 11:38:48 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby	Tue Aug 31 17:00:08 2010 +0300
@@ -45,10 +45,50 @@
 ECOM_PLUGIN(101faaa3.dll, 101faaa3.rsc)
 ECOM_PLUGIN(101faaa5.dll, 101faaa5.rsc)
 
+#if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
+data = ZDRIVE\tkeystore\scripts\thwkeystore.script		tkeystore\scripts\thwkeystore.script
+data = ZDRIVE\tkeystore\scripts\thwkeystore.ini			tkeystore\scripts\thwkeystore.ini
+data = ZPRIVATE\101f7e95\hwkeys.dat					private\101f7e95\hwkeys.dat
+data = ZDRIVE\tkeystore\data\hwkeys.dat				tkeystore\scripts\hwkeys.dat
+file = ABI_DIR\BUILD_DIR\tcryptotokenhai.dll			sys\bin\tcryptotokenhai.dll
+ECOM_PLUGIN(101faaaa.dll, 101faaaa.rsc)
+#endif // SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT && SYMBIAN_ENABLE_SDP_ECC
 
 //scripts
+#ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
+data = ZDRIVE\tkeystore\scripts\registration.ini		tkeystore\scripts\registration.ini
+data = ZDRIVE\tkeystore\scripts\initialize.script	tkeystore\scripts\initialize.script
+data = ZDRIVE\tkeystore\scripts\reg_first_identity.script	tkeystore\scripts\reg_first_identity.script
+data = ZDRIVE\tkeystore\scripts\reg_second_identity.script	tkeystore\scripts\reg_second_identity.script
+data = ZDRIVE\tkeystore\scripts\authobjects_useauth.script	tkeystore\scripts\authobjects_useauth.script
+data = ZDRIVE\tkeystore\scripts\authobjects_useauth.ini	tkeystore\scripts\authobjects_useauth.ini
 
 //TMS support
+data = ZDRIVE\tkeystore\scripts\cancel_useauth.script		tkeystore\scripts\cancel_useauth.script
+data = ZDRIVE\tkeystore\scripts\exportscript_useauth.script	tkeystore\scripts\exportscript_useauth.script
+data = ZDRIVE\tkeystore\scripts\oom_useauth.script			tkeystore\scripts\oom_useauth.script
+data = ZDRIVE\tkeystore\scripts\reload_useauth.script		tkeystore\scripts\reload_useauth.script
+data = ZDRIVE\tkeystore\scripts\servoom_useauth.script		tkeystore\scripts\servoom_useauth.script
+data = ZDRIVE\tkeystore\scripts\tkeystore_authentication1.script	tkeystore\scripts\tkeystore_authentication1.script
+data = ZDRIVE\tkeystore\scripts\tkeystore_authentication2.script	tkeystore\scripts\tkeystore_authentication2.script
+data = ZDRIVE\tkeystore\scripts\tkeystore_nouserregistered.script	tkeystore\scripts\tkeystore_nouserregistered.script
+data = ZDRIVE\tkeystore\scripts\tkeystore_useauth.script		tkeystore\scripts\tkeystore_useauth.script
+data = ZDRIVE\tkeystore\scripts\capability_useauth.script		tkeystore\scripts\capability_useauth.script
+data = ZDRIVE\tkeystore\scripts\authenticate_useauth.script		tkeystore\scripts\authenticate_useauth.script
+data = ZDRIVE\tkeystore\scripts\cancel_useauth.ini		tkeystore\scripts\cancel_useauth.ini
+data = ZDRIVE\tkeystore\scripts\exportscript_useauth.ini	tkeystore\scripts\exportscript_useauth.ini
+data = ZDRIVE\tkeystore\scripts\oom_useauth.ini			tkeystore\scripts\oom_useauth.ini
+data = ZDRIVE\tkeystore\scripts\reload_useauth.ini		tkeystore\scripts\reload_useauth.ini
+data = ZDRIVE\tkeystore\scripts\servoom_useauth.ini		tkeystore\scripts\servoom_useauth.ini
+data = ZDRIVE\tkeystore\scripts\tkeystore_authentication1.ini	tkeystore\scripts\tkeystore_authentication1.ini
+data = ZDRIVE\tkeystore\scripts\tkeystore_authentication2.ini	tkeystore\scripts\tkeystore_authentication2.ini
+data = ZDRIVE\tkeystore\scripts\tkeystore_nouserregistered.ini	tkeystore\scripts\tkeystore_nouserregistered.ini
+data = ZDRIVE\tkeystore\scripts\tkeystore_useauth.ini		tkeystore\scripts\tkeystore_useauth.ini
+data = ZDRIVE\tkeystore\scripts\capability_useauth.ini		tkeystore\scripts\capability_useauth.ini
+data = ZDRIVE\tkeystore\scripts\authenticate_useauth.ini		tkeystore\scripts\authenticate_useauth.ini
+
+#else
+//TMS support
 data = ZDRIVE\tkeystore\scripts\tkeystore.script		tkeystore\scripts\tkeystore.script
 data = ZDRIVE\tkeystore\scripts\cancel.script		tkeystore\scripts\cancel.script
 data = ZDRIVE\tkeystore\scripts\oom.script			tkeystore\scripts\oom.script
@@ -67,6 +107,11 @@
 data = ZDRIVE\tkeystore\scripts\authobjects.ini		tkeystore\scripts\authobjects.ini
 data = ZDRIVE\tkeystore\scripts\reload.ini		tkeystore\scripts\reload.ini
 
+#ifdef SYMBIAN_AUTH_SERVER
+data = ZDRIVE\tkeystore\scripts\oldserver_newfeature.script		tkeystore\scripts\oldserver_newfeature.script
+data = ZDRIVE\tkeystore\scripts\oldserver_newfeature.ini		tkeystore\scripts\oldserver_newfeature.ini
+#endif // SYMBIAN_AUTH_SERVER
+#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
 
 //	test data
 data = ZDRIVE\tkeystore\data\pkcs8dh.001			tkeystore\data\pkcs8dh.001
@@ -232,9 +277,11 @@
 data = ZDRIVE\tcertapps\scripts\script1.ini			tcertapps\scripts\script1.ini attrib=r
 data = ZDRIVE\tcertapps\scripts\apipolicing.ini	tcertapps\scripts\apipolicing.ini attrib=r
 
-#if defined SDP_ROM1
+
+#if defined SYMBIAN_KEYSTORE_USE_AUTH_SERVER || defined SDP_ROM1
 //Nothing is included
 #else
+#ifdef _SERIAL_DOWNLOAD
 // additional certstore needed in normal rom for sec-filetokens tests which uses certstore1 ,2,...
 ECOM_PLUGIN(tadditionalstores.dll, tadditionalstores.rsc)
 // The below test data needed for sec-filetokens-tools.script which will run only in normal image(testsecurity_sdp.bat)
@@ -253,6 +300,7 @@
 // Test keystore. Contains two keys, a DSA key (label gm0) and a RSA key (label gm1)
 // The passphrase timeout is set to 30
 data = ZPRIVATE\101F72A6\keys.dat          	private\101F72A6\keys.dat
-#endif // SDP_ROM1
+#endif
+#endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
 
 #endif