Revision: 201033
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 18 Aug 2010 11:33:05 +0300
changeset 91 a675745f8b2e
parent 80 b4bf7a662141
child 98 7355aab40bca
Revision: 201033 Kit: 201033
authenticationservices/authenticationserver/group/bld.inf
authorisation/userpromptservice/group/bld.inf
authorisation/userpromptservice/inc/tups.iby
authorisation/userpromptservice/test/group/bld.inf
authorisation/userpromptservice/test/tups/packages/create.bat
authorisation/userpromptservice/test/tups/packages/integ_buildsis.fil
authorisation/userpromptservice/test/tups/packages/tupsinteg_ca_not_instore.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_dialog1.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_eclipse1.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_evaluator1.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_policies1.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_policies2.pkg
authorisation/userpromptservice/test/tups/packages/tupsinteg_post1.pkg
authorisation/userpromptservice/test/tups_install/tupsserver.cpp
bld.inf
build.config.xml
contentmgmt/cafrecogniserconfig/ReccafConfig.iby
contentmgmt/contentaccessfwfordrm/group/tcaf.mmp
contentmgmt/referencedrmagent/refcafhelper/group/bld.inf
contentmgmt/referencedrmagent/tcaf/scripts/consumerstep.ini
contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script
contentmgmt/referencedrmagent/tcaf/scripts/managerstep.ini
contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script
contentmgmt/referencedrmagent/tcaf/source/CafutilsStep.cpp
crypto/weakcrypto/group/bld.inf
crypto/weakcrypto/strong/bld.inf
crypto/weakcryptospi/group/bld.inf
crypto/weakcryptospi/inc/cryptotests.iby
crypto/weakcryptospi/test/kms/bld.inf
crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi.script
crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi_v2.script
cryptomgmtlibs/cryptotokenfw/group/bld.inf
cryptomgmtlibs/securitycommonutils/group/bld.inf
cryptomgmtlibs/securitytestfw/group/asnpkcs.pkg
cryptomgmtlibs/securitytestfw/group/authorisation.pkg
cryptomgmtlibs/securitytestfw/group/bld.inf
cryptomgmtlibs/securitytestfw/group/caf.pkg
cryptomgmtlibs/securitytestfw/group/certman.pkg
cryptomgmtlibs/securitytestfw/group/crypto.pkg
cryptomgmtlibs/securitytestfw/group/custom/postrun_custom.xml
cryptomgmtlibs/securitytestfw/group/custom/prerun_custom.xml
cryptomgmtlibs/securitytestfw/group/filetokesn.pkg
cryptomgmtlibs/securitytestfw/group/ocsptests.pkg
cryptomgmtlibs/securitytestfw/group/recog.pkg
cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby
cryptomgmtlibs/securitytestfw/inc/cryptodeps.iby
cryptomgmtlibs/securitytestfw/test/autotesting/copysecuritytestfiles.bat
cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf
cryptomgmtlibs/securitytestfw/test/testhandler2/tScriptSetup.cpp
cryptomgmtlibs/securityutils/group/bld.inf
cryptoplugins/cryptospiplugins/test/h4drv/crypto_h4/bld.inf
cryptoservices/browserrootcertificates/browserrootcerts.mrp
cryptoservices/browserrootcertificates/certconvert.py
cryptoservices/browserrootcertificates/readme.txt
cryptoservices/browserrootcertificates/trustmapping.txt
cryptoservices/certificateandkeymgmt/group/bld.inf
cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/inc/tpkcs12integrationserver.iby
cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby
cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby
cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.mmp
cryptoservices/filebasedcertificateandkeystores/test/ttesttools/ttesttoolserver.cpp
cryptoservices/rootcertificates/data/SymbianA.der
cryptoservices/rootcertificates/data/SymbianB.der
cryptoservices/rootcertificates/data/SymbianSignedCerts.txt
cryptoservices/rootcertificates/data/swicertstore.dat
cryptoservices/rootcertificates/data/symbianc.der
cryptoservices/rootcertificates/data/symbiand.der
cryptoservices/rootcertificates/group/bld.inf
cryptoservices/rootcertificates/group/rootcerts.iby
cryptoservices/rootcertificates/group/rootcerts.mrp
cryptoservices/rootcertificates/rootcerts.history.xml
package_definition.xml
package_map.xml
securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby
securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby
securityanddataprivacytools/securityconfig/ups/ups_config.iby
securityanddataprivacytools/securitytools/certapp/group/certapp.mmp
sysdef_1_4_0-1.dtd
--- a/authenticationservices/authenticationserver/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/authenticationservices/authenticationserver/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -30,9 +30,6 @@
 
 PRJ_EXPORTS
 
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/authserver_client.h		/epoc32/include/authserver/authserver_client.h
-#endif
 ../inc/authserver/authclient.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authclient.h)
 ../inc/authserver/authexpression.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.h)
 ../inc/authserver/authexpression.inl		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/authexpression.inl)
@@ -46,9 +43,6 @@
 ../inc/authserver/protectionkey.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/protectionkey.h)
 ../inc/authserver/aspubsubdefs.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/aspubsubdefs.h)
 ../inc/authserver/idandstring.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(authserver/idandstring.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/authserver/log.h						/epoc32/include/authserver/log.h
-#endif
 ../inc/authserver/authpatchdata.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(authserver/authpatchdata.h)
 
 
--- a/authorisation/userpromptservice/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -24,13 +24,14 @@
 #include "../examples/bld.inf"
 
 PRJ_EXPORTS
-../inc/ups.hrh			/epoc32/include/ups/ups.hrh
+../inc/ups.hrh			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/ups.hrh)
 ../inc/upsconst.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upsconst.h)
 ../inc/upserr.h			SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upserr.h)
 ../inc/upstypes.h		SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ups/upstypes.h)
 ../inc/ups.iby			/epoc32/rom/include/ups.iby
 
 
+
 PRJ_TESTEXPORTS
 ../inc/tups.iby				/epoc32/rom/include/tups.iby
 ../inc/tups_integ.iby		/epoc32/rom/include/tups_integ.iby
--- a/authorisation/userpromptservice/inc/tups.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/inc/tups.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -22,8 +22,11 @@
 #include <testexecute.iby>
 #include <tupspolicies.iby>
 #include <tups_integ.iby>
+#ifdef _SERIAL_DOWNLOAD
 #include <upstechview.iby>
-
+#else
+#include <security_ups_utils.iby>
+#endif
 define ZDRIVE \epoc32\data\Z
 
 REM User Prompt Service Tests
--- a/authorisation/userpromptservice/test/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -80,13 +80,13 @@
 tups_dialogcreator_always.mmp
 tups_dialogcreator_never.mmp
 tups_dialogcreator07.mmp
-tups_notifier.mmp
+//tups_notifier.mmp
 tups_nopolicies_server.mmp
 
 tupsinteg_post1.mmp  // target need to be deleted after sis creation 
 
-//// create SIS files for postmanufacture tests and negative postmanufacture tests   /////
-makefile  ../tups/packages/integ_buildsis.fil
+//// create SIS files for postmanufact
+gnumakefile ../tups/packages/integ_buildsis.fil
 
 gnumakefile ../tups/packages/testromstub.mak
 
--- a/authorisation/userpromptservice/test/tups/packages/create.bat	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/create.bat	Wed Aug 18 11:33:05 2010 +0300
@@ -21,10 +21,10 @@
 makesis %3.pkg %4_unsigned.sis
 
 echo signsis
-if "%5"=="ROOT5CA" signsis %4_unsigned.sis %4.sis %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\root5ca\ca.pem  %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\root5ca\ca.key.pem
-if "%5"=="ALL" signsis %4_unsigned.sis %4.sis %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\symbiantestallcapabilitiesca\symbiantestallcapabilitiesca.pem  %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\symbiantestallcapabilitiesca\cakey.pem
-if "%5"=="TESTROOT" signsis %4_unsigned.sis %4.sis %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\symbiantestrootcadsa\ca.pem %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\symbiantestrootcadsa\ca.key.pem
-if "%5"=="SELF" signsis %4_unsigned.sis %4.sis %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\certificatesnotinstore\selfsigned_cert.pem %SECURITYSOURCEDIR%\testframework\testcertificates\ups\test\certificatesnotinstore\selfsigned_key.pem
+if "%5"=="ROOT5CA" signsis %4_unsigned.sis %4.sis "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\root5ca\ca.pem"  "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\root5ca\ca.key.pem"
+if "%5"=="ALL" signsis %4_unsigned.sis %4.sis "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\symbiantestallcapabilitiesca\symbiantestallcapabilitiesca.pem"  "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\symbiantestallcapabilitiesca\cakey.pem"
+if "%5"=="TESTROOT" signsis %4_unsigned.sis %4.sis "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\symbiantestrootcadsa\ca.pem" "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\symbiantestrootcadsa\ca.key.pem"
+if "%5"=="SELF" signsis %4_unsigned.sis %4.sis "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\certificatesnotinstore\selfsigned_cert.pem" "\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\testcertificates\ups\test\certificatesnotinstore\selfsigned_key.pem"
 
 if "%1"=="WINSCW" goto COPYWINSCW;
 if "%1"=="ARMV5" goto COPYARMV5;
--- a/authorisation/userpromptservice/test/tups/packages/integ_buildsis.fil	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/integ_buildsis.fil	Wed Aug 18 11:33:05 2010 +0300
@@ -1,73 +1,11 @@
-MAKEDATA :
-!IF "$(PLATFORM)" == "GCCXML" || "$(PLATFORM)" == "TOOLS" || "$(PLATFORM)" == "TOOLS2" 
-	cd
-	echo ----------------
-	echo  Do nothing ...
-	echo ----------------
-!ELSE
-	cd
-	echo --------------------------------------------------------------
-	echo Copying required input datas
-	echo --------------------------------------------------------------
-
-	call copy.bat $(PLATFORM) $(CFG)
-
-	echo --------------------------------------------------------------
-	echo Building SIS file to install removable test client
-	echo --------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_post1 tupsinteg_post1 ROOT5CA
-	
-
-	echo --------------------------------------------------------------
-	echo Building SIS to install policy files post manufacture.
-	echo --------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies1 tupsinteg_policies1 ROOT5CA
-
-	echo --------------------------------------------------------------
-	echo Building SIS to install policy files post manufacture.
-	echo --------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies2 tupsinteg_policies2 ROOT5CA
+ifeq "$(PLATFORM)" "WINSCW"
+ACTION=doaction
+endif
 
-	echo --------------------------------------------------------------
-	echo Building SIS file to install a policy evaluator via SWI
-	echo --------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_evaluator1	tupsinteg_evaluator1 ALL
-    
-	echo ---------------------------------------------------------------------------
-	echo Building SIS file to install a policy evaluator and dialog creator via SWI
-	echo ---------------------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_dialog1 tupsinteg_dialog1 ALL
-
-	echo -------------------------------------- 
-	echo Building SIS to eclipse policy files.
-	echo --------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_eclipse1 tupsinteg_eclipse1 ROOT5CA
+ifeq "$(PLATFORM)" "ARMV5"
+ACTION=doaction
+endif
 
-	echo --------------------------------------------------------------------------
-	echo Building SIS to (attempt to) install policy files (incorrect cert used)
-	echo --------------------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies1	tupsinteg_policies1_negative TESTROOT
-
-	echo -----------------------------------------------------------------------
-	echo Building SIS to install policy files signed with CA cert not in store
-	echo -----------------------------------------------------------------------
-	
-	call create.bat $(PLATFORM) $(CFG) tupsinteg_ca_not_instore tupsinteg_ca_not_instore SELF
-
-	echo
-
-!ENDIF
-
-
-DO_NOTHING:
-	rem do nothing
 
 #
 # The targets invoked by abld...
@@ -85,9 +23,90 @@
 
 FINAL : MAKEDATA
 
+
+DO_NOTHING:
+	
+
+ifndef ACTION
+#
+# Not supported on this target so nothing to do
+#
+MAKEDATA :
+	@echo ----------------
+	@echo  Do nothing ...
+	@echo ----------------
+
+CLEAN:
+
+RELEASABLES:
+
+else
+#
+# WINSCW or ARM
+#
+MAKEDATA :
+	@cd
+	@echo --------------------------------------------------------------
+	@echo Copying required input datas
+	@echo --------------------------------------------------------------
+
+	call copy.bat $(PLATFORM) $(CFG)
+
+	@echo --------------------------------------------------------------
+	@echo Building SIS file to install removable test client
+	@echo --------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_post1 tupsinteg_post1 ROOT5CA
+	
+
+	@echo --------------------------------------------------------------
+	@echo Building SIS to install policy files post manufacture.
+	@echo --------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies1 tupsinteg_policies1 ROOT5CA
+
+	@echo --------------------------------------------------------------
+	@echo Building SIS to install policy files post manufacture.
+	@echo --------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies2 tupsinteg_policies2 ROOT5CA
+
+	@echo --------------------------------------------------------------
+	@echo Building SIS file to install a policy evaluator via SWI
+	@echo --------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_evaluator1	tupsinteg_evaluator1 ALL
+    
+	@echo ---------------------------------------------------------------------------
+	@echo Building SIS file to install a policy evaluator and dialog creator via SWI
+	@echo ---------------------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_dialog1 tupsinteg_dialog1 ALL
+
+	@echo -------------------------------------- 
+	@echo Building SIS to eclipse policy files.
+	@echo --------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_eclipse1 tupsinteg_eclipse1 ROOT5CA
+
+	@echo --------------------------------------------------------------------------
+	@echo Building SIS to (attempt to) install policy files (incorrect cert used)
+	@echo --------------------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_policies1	tupsinteg_policies1_negative TESTROOT
+
+	@echo -----------------------------------------------------------------------
+	@echo Building SIS to install policy files signed with CA cert not in store
+	@echo -----------------------------------------------------------------------
+	
+	call create.bat $(PLATFORM) $(CFG) tupsinteg_ca_not_instore tupsinteg_ca_not_instore SELF
+
+	@echo
+
+
 CLEAN : 
 	if exist %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_post1.sis 	del /q %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_post1.sis 
 	if exist %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_policies1.sis 	del /q %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_policies1.sis 
 	if exist %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_policies2.sis 	del /q %EPOCROOT%epoc32\release\"$(PLATFORM)"\"$(CFG)"\z\tups\integ\packages\tupsinteg_policies2.sis 
 	
-
+endif
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_ca_not_instore.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_ca_not_instore.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -25,5 +25,8 @@
 ; The VERIFY option is used to flag the files as non-modifiable so that SWI
 ; checks the hashes during restore.
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+
 "t_ups_101f7f1f_ff000001_version2.rsc"-"!:\private\10283558\policies\ups_101f7f1f_ff000001.rsc", VERIFY
 "dummy.txt"-"C:\tups\integ\ca_no_instore_was_installed.txt"
\ No newline at end of file
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_dialog1.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_dialog1.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -25,6 +25,9 @@
 ; The VERIFY option is used to flag the files as non-modifiable so that SWI
 ; checks the hashes during restore.
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+
 "t_ups_101f7f1f_0000aaa2_version1.rsc"-"!:\private\10283558\policies\ups_101f7f1f_0000aaa2.rsc", VERIFY
 "tups_dialogcreator07.rsc"-"!:\resource\plugins\tups_dialogcreator07.rsc" 
 "tups_dialogcreator07.dll"-"!:\sys\bin\tups_dialogcreator07.dll" 
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_eclipse1.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_eclipse1.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -25,6 +25,9 @@
 ; The VERIFY option is used to flag the files as non-modifiable so that SWI
 ; checks the hashes during restore.
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+
 "eclipse_ups_101f7f1f_0000aaa3.rsc"-"!:\private\10283558\policies\ups_101f7f1f_0000aaa3.rsc", VERIFY
 "t_ups_101f7f1f_0000aaa4.rsc"-"!:\private\10283558\policies\ups_101f7f1f_0000aaa4.rsc", VERIFY
 "dummy.txt"-"C:\tups\integ\eclipse1pkg_was_installed.txt"
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_evaluator1.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_evaluator1.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -22,6 +22,8 @@
 %{"Symbian Software Ltd"}
 :"Symbian Software Ltd"
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
 
 ; installs a new policy evaluator to be used for ups integration tests. 
 "tups_policyevaluator05.rsc"-"!:\resource\plugins\tups_policyevaluator05.rsc" 
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_policies1.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_policies1.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -25,4 +25,7 @@
 ; The VERIFY option is used to flag the files as non-modifiable so that SWI
 ; checks the hashes during restore.
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+
 "t_ups_101f7f1f_ff000001_version1.rsc"-"!:\private\10283558\policies\ups_101f7f1f_ff000001.rsc", VERIFY
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_policies2.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_policies2.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -25,5 +25,8 @@
 ; The VERIFY option is used to flag the files as non-modifiable so that SWI
 ; checks the hashes during restore.
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
+
 "t_ups_101f7f1f_ff000001_version2.rsc"-"!:\private\10283558\policies\ups_101f7f1f_ff000001.rsc", VERIFY
 "dummy.txt"-"C:\tups\integ\policies2pkg_was_installed.txt"
\ No newline at end of file
--- a/authorisation/userpromptservice/test/tups/packages/tupsinteg_post1.pkg	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups/packages/tupsinteg_post1.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -21,6 +21,8 @@
 %{"Vendor"}
 :"ups integration test"
 
+;Supports Series 60 v 5.2
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
 
 ; Do not be scare about this strange manouvre, this runs in conjuction with a .fil file.
 "tupsinteg_post1.exe"-"!:\sys\bin\tupsinteg_post1.exe" 
--- a/authorisation/userpromptservice/test/tups_install/tupsserver.cpp	Tue Jul 06 16:21:56 2010 +0300
+++ b/authorisation/userpromptservice/test/tups_install/tupsserver.cpp	Wed Aug 18 11:33:05 2010 +0300
@@ -17,20 +17,6 @@
 */
 
 
-
-#include <c32comm.h>
-
-#if defined (__WINS__)
-#define PDD_NAME		_L("ECDRV")
-#else
-#define PDD_NAME		_L("EUART1")
-#define PDD2_NAME		_L("EUART2")
-#define PDD3_NAME		_L("EUART3")
-#define PDD4_NAME		_L("EUART4")
-#endif
-
-#define LDD_NAME		_L("ECOMM")
-
 /**
  * @file
  *
@@ -56,22 +42,6 @@
 	return server;
 	}
 
-static void InitCommsL()
-    {
-    TInt ret = User::LoadPhysicalDevice(PDD_NAME);
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-
-#ifndef __WINS__
-    ret = User::LoadPhysicalDevice(PDD2_NAME);
-    ret = User::LoadPhysicalDevice(PDD3_NAME);
-    ret = User::LoadPhysicalDevice(PDD4_NAME);
-#endif
-
-    ret = User::LoadLogicalDevice(LDD_NAME);
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-    ret = StartC32();
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-    }
 
 LOCAL_C void MainL()
 	{
@@ -80,7 +50,6 @@
 	RProcess().DataCaging(RProcess::EDataCagingOn);
 	RProcess().SecureApi(RProcess::ESecureApiOn);
 #endif
-	InitCommsL();
 	
 	CActiveScheduler* sched=NULL;
 	sched=new(ELeave) CActiveScheduler;
--- a/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/*
-* Copyright (c) 2008-2010 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: 
-* BLD.INF
-* Builds for the sdp subsystem 
-* This is the bld.inf file for building the secuirity subsystem.  It works for
-* both beech and cedar, using the appropriate macros (if defined) to determine
-* what gets built.
-*
-*/
-
-
-/**
- @file
-*/
-
-#ifndef TOOLS2
-// Disable everything except security_tools for TOOLS2 target
-
-#include "cryptomgmtlibs/securityutils/group/bld.inf"
-#include "cryptomgmtlibs/securitycommonutils/group/bld.inf"
-#ifdef SYMBIAN_CRYPTOSPI
-	#include "crypto/weakcryptospi/group/bld.inf"
-	#include "crypto/weakcryptospi/strong/bld.inf"	
-	#include "cryptoplugins/cryptospiplugins/group/bld.inf"	
-#else
-	#ifndef __SECURITY_COVERAGE_BUILD__
-		#include "crypto/weakcrypto/group/bld.inf"
-		#include "crypto/weakcrypto/strong/bld.inf"	
-	#endif
-
-#endif
-
-#include "cryptomgmtlibs/cryptotokenfw/group/bld.inf"
-#include "cryptoservices/asnpkcs/group/bld.inf"
-#include "cryptoservices/certificateandkeymgmt/group/bld.inf"
-
-// DEF139848 fix - Forward Propogation from Symtb9.1 - Illegal dependency from OCSP to HTTP.
-//#include "mw/securitysrv/pkiutilities/ocsp/group/bld.inf"
-
-#include "cryptoservices/filebasedcertificateandkeystores/group/bld.inf"
-#include "securityanddataprivacytools/securityconfig/group/bld.inf"
-#include "cryptomgmtlibs/securitytestfw/group/bld.inf"
-#include "contentmgmt/cafrecogniserconfig/bld.inf"
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include "contentmgmt/referencedrmagent/refcafhelper/group/bld.inf"
-#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include "contentmgmt/contentaccessfwfordrm/group/bld.inf"
-#include "contentmgmt/cafstreamingsupport/group/bld.inf"
-#include "contentmgmt/referencedrmagent/RefTestAgent/group/bld.inf"
-
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include "contentmgmt/mtputils/group/bld.inf"
-#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-
-#include "authorisation/userpromptservice/group/bld.inf"
-#include "authorisation/userpromptutils/group/bld.inf"
-
-
-#ifdef SYMBIAN_AUTH_SERVER
-#include "authenticationservices/authenticationserver/group/bld.inf"
-#endif
-
-#endif //TOOLS2
-
-// Only the certapp build with TOOLS2
-#include "securityanddataprivacytools/securitytools/group/bld.inf"
-
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build.config.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+  <!ENTITY layer_real_source_path "common/generic/security/os/security" >
+]>
+
+<SystemDefinition name="security" schema="1.4.0">
+	<systemModel>
+		<layer name="os_layer">
+
+			<!-- 
+			<module name="authenticationserver">
+				<unit name="authserver" unitID="secdo.authserver" bldFile="&layer_real_source_path;\authenticationservices\authenticationserver\group" mrp="&layer_real_source_path;\authenticationservices\authenticationserver\group\security_authserver.mrp"/>
+			</module>
+			-->
+
+			<module name="userpromptservice">
+				<unit name="ups" unitID="secdo.ups" bldFile="&layer_real_source_path;\authorisation\userpromptservice\group" mrp="&layer_real_source_path;\authorisation\userpromptservice\group\security_ups.mrp"/>
+			</module>
+			<module name="userpromptutils">
+				<unit name="upsutils" unitID="secdo.upsutils" bldFile="&layer_real_source_path;\authorisation\userpromptutils\group" mrp="&layer_real_source_path;\authorisation\userpromptutils\group\security_ups_utils.mrp"/>
+			</module>
+			<module name="reccafconfig">
+				<unit name="reccafconfig" unitID="secdo.reccafconfig" bldFile="&layer_real_source_path;\contentmgmt\cafrecogniserconfig" mrp="&layer_real_source_path;\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp"/>
+			</module>
+			<module name="caf streaming support">
+				<unit name="cafstreamingsupport" unitID="secdo.cafstreamingsupport" bldFile="&layer_real_source_path;\contentmgmt\cafstreamingsupport\group" mrp="&layer_real_source_path;\contentmgmt\cafstreamingsupport\group\security_streamingcaf.mrp"/>
+			</module>
+			<module name="content access framework for drm">
+				<unit name="contentaccessfwfordrm" unitID="secdo.contentaccessfwfordrm" bldFile="&layer_real_source_path;\contentmgmt\contentaccessfwfordrm\group" mrp="&layer_real_source_path;\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
+			</module>
+			<!-- 
+			<module name="mtputils">
+				<unit name="mtputils" unitID="secdo.mtputils" bldFile="&layer_real_source_path;\contentmgmt\mtputils\group" mrp="&layer_real_source_path;\contentmgmt\mtputils\group\security_mtputils.mrp"/>
+			</module>
+			-->
+			<module name="reference drmagent">
+				<unit name="rta" unitID="secdo.rta" bldFile="&layer_real_source_path;\contentmgmt\referencedrmagent\RefTestAgent\group" mrp="&layer_real_source_path;\contentmgmt\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
+			</module>
+			<module name="weakcryptospi">
+				<unit name="weakcryptospi" unitID="secdo.weakcryptospi" bldFile="&layer_real_source_path;\crypto\weakcryptospi\group" mrp="&layer_real_source_path;\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
+			</module>
+			<module name="strongcryptospi">
+				<unit name="strongcryptospi" unitID="secdo.strongcryptospi" bldFile="&layer_real_source_path;\crypto\weakcryptospi\strong" mrp="&layer_real_source_path;\crypto\weakcryptospi\group\security_cryptospi_strong.mrp"/>
+			</module>
+			<module name="cryptotoken framework">
+				<unit name="secdo.cryptotokenfw" unitID="secdo.cryptotokenfw" bldFile="&layer_real_source_path;\cryptomgmtlibs\cryptotokenfw\group" mrp="&layer_real_source_path;\cryptomgmtlibs\cryptotokenfw\group\security_cryptotokens.mrp"/>
+			</module>
+			<module name="security common utils">
+				<unit name="secdo.securitycommonutils" unitID="secdo.securitycommonutils" bldFile="&layer_real_source_path;\cryptomgmtlibs\securitycommonutils\group" mrp="&layer_real_source_path;\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
+			</module>
+			<module name="security utils">
+				<unit name="secdo.securityutils" unitID="secdo.securityutils" bldFile="&layer_real_source_path;\cryptomgmtlibs\securityutils\group" mrp="&layer_real_source_path;\cryptomgmtlibs\securityutils\group\security_common.mrp"/>
+			</module>
+			<module name="crypto spi plugins">
+				<unit name="secdo.cryptospiplugins" unitID="secdo.cryptospiplugins" bldFile="&layer_real_source_path;\cryptoplugins\cryptospiplugins\group" mrp="&layer_real_source_path;\cryptoplugins\cryptospiplugins\group\security_cryptospi_plugins.mrp"/>
+			</module>
+			<module name="asnpkcs">
+				<unit name="secdo.asnpkcs" unitID="secdo.asnpkcs" bldFile="&layer_real_source_path;\cryptoservices\asnpkcs\group" mrp="&layer_real_source_path;\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
+			</module>
+			<module name="certificate and key management">
+				<unit name="secdo.certman" unitID="secdo.certman" bldFile="&layer_real_source_path;\cryptoservices\certificateandkeymgmt\group" mrp="&layer_real_source_path;\cryptoservices\certificateandkeymgmt\group\security_certman.mrp"/>
+			</module>
+			<module name="file based certificate and keystores">
+				<unit name="secdo.filetokens" unitID="secdo.filetokens" bldFile="&layer_real_source_path;\cryptoservices\filebasedcertificateandkeystores\group" mrp="&layer_real_source_path;\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
+			</module>
+			<module name="securityanddataprivacytools">
+				<unit name="secdo.securityconfig" unitID="secdo.securityconfig" bldFile="&layer_real_source_path;\securityanddataprivacytools\securityconfig\group" mrp="&layer_real_source_path;\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
+			</module>
+			<module name="securitytools">
+				<unit name="secdo.securitytools" unitID="sos.securitytools" bldFile="&layer_real_source_path;\securityanddataprivacytools\securitytools\group" mrp="&layer_real_source_path;\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
+			</module>
+    </layer>
+	<layer name="unit_test_layer">
+			<module name="Securityfw_test">
+				<unit name="secdo.securitytestfw" unitID="secdo.securitytestfw.test" bldFile="&layer_real_source_path;\cryptomgmtlibs\securitytestfw\group" mrp="&layer_real_source_path;\cryptomgmtlibs\securitytestfw\group\security_testframework.mrp"/>
+			</module>
+			<module name="Security_test">
+			<!-- 
+				<unit name="secdo.authserver" unitID="secdo.authserver.test" bldFile="&layer_real_source_path;\authenticationservices\authenticationserver\group" mrp="&layer_real_source_path;\authenticationservices\authenticationserver\group\security_authserver.mrp"/>
+			-->
+				<unit name="secdo.ups" unitID="secdo.ups.test" bldFile="&layer_real_source_path;\authorisation\userpromptservice\group" mrp="&layer_real_source_path;\authorisation\userpromptservice\group\security_ups.mrp"/>
+				<unit name="secdo.cafstreamingsupport" unitID="secdo.cafstreamingsupport.test" bldFile="&layer_real_source_path;\contentmgmt\cafstreamingsupport\group" mrp="&layer_real_source_path;\contentmgmt\cafstreamingsupport\group\security_streamingcaf.mrp"/>
+				<unit name="secdo.contentaccessfwfordrm" unitID="secdo.contentaccessfwfordrm.test" bldFile="&layer_real_source_path;\contentmgmt\contentaccessfwfordrm\group" mrp="&layer_real_source_path;\contentmgmt\contentaccessfwfordrm\group\security_caf2.mrp"/>
+			<!-- 
+				<unit name="secdo.mtputils" unitID="secdo.mtputils.test" bldFile="&layer_real_source_path;\contentmgmt\mtputils\group" mrp="&layer_real_source_path;\contentmgmt\mtputils\group\security_mtputils.mrp"/>
+			-->
+				<unit name="secdo.rta" unitID="secdo.rta.test" bldFile="&layer_real_source_path;\contentmgmt\referencedrmagent\RefTestAgent\group" mrp="&layer_real_source_path;\contentmgmt\referencedrmagent\RefTestAgent\group\security_rta.mrp"/>
+				<unit name="secdo.weakcryptospi" unitID="secdo.weakcryptospi.test" bldFile="&layer_real_source_path;\crypto\weakcryptospi\group" mrp="&layer_real_source_path;\crypto\weakcryptospi\group\security_cryptospi_weak.mrp"/>
+				<unit name="secdo.cryptotokenfw" unitID="secdo.cryptotokenfw.test" bldFile="&layer_real_source_path;\cryptomgmtlibs\cryptotokenfw\group" mrp="&layer_real_source_path;\cryptomgmtlibs\cryptotokenfw\group\security_cryptotokens.mrp"/>
+				<unit name="secdo.securitycommonutils" unitID="secdo.securitycommonutils.test" bldFile="&layer_real_source_path;\cryptomgmtlibs\securitycommonutils\group" mrp="&layer_real_source_path;\cryptomgmtlibs\securitycommonutils\group\security_commonutils.mrp"/>
+				<unit name="secdo.securityutils" unitID="secdo.securityutils.test" bldFile="&layer_real_source_path;\cryptomgmtlibs\securityutils\group" mrp="&layer_real_source_path;\cryptomgmtlibs\securityutils\group\security_common.mrp"/>
+				<unit name="secdo.cryptospiplugins" unitID="secdo.cryptospiplugins.test" bldFile="&layer_real_source_path;\cryptoplugins\cryptospiplugins\group" mrp="&layer_real_source_path;\cryptoplugins\cryptospiplugins\group\security_cryptospi_plugins.mrp"/>
+				<unit name="secdo.asnpkcs" unitID="secdo.asnpkcs.test" bldFile="&layer_real_source_path;\cryptoservices\asnpkcs\group" mrp="&layer_real_source_path;\cryptoservices\asnpkcs\group\security_asnpkcs.mrp"/>
+				<unit name="secdo.certman" unitID="secdo.certman.test" bldFile="&layer_real_source_path;\cryptoservices\certificateandkeymgmt\group" mrp="&layer_real_source_path;\cryptoservices\certificateandkeymgmt\group\security_certman.mrp"/>
+				<unit name="secdo.filetokens" unitID="secdo.filetokens.test" bldFile="&layer_real_source_path;\cryptoservices\filebasedcertificateandkeystores\group" mrp="&layer_real_source_path;\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp"/>
+				<unit name="secdo.securityconfig" unitID="secdo.securityconfig.test" bldFile="&layer_real_source_path;\securityanddataprivacytools\securityconfig\group" mrp="&layer_real_source_path;\securityanddataprivacytools\securityconfig\group\security_config.mrp"/>
+				<unit name="secdo.securitytools" unitID="sos.securitytools.test" bldFile="&layer_real_source_path;\securityanddataprivacytools\securitytools\group" mrp="&layer_real_source_path;\securityanddataprivacytools\securitytools\group\security_tools.mrp"/>
+			</module>
+    </layer>
+  </systemModel>
+</SystemDefinition>
--- a/contentmgmt/cafrecogniserconfig/ReccafConfig.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/cafrecogniserconfig/ReccafConfig.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -19,6 +19,6 @@
 #define __RECCAFCONFIG_IBY__
 
 // Store file in Apparc Server Private Directory
-data=ZPRIVATE\10003A3F\RecCaf\RecCafMimeTypes.txt 	\private\10003a3f\RecCaf\RecCafMimeTypes.txt
+data=ZPRIVATE\10003a3f\reccaf\reccafmimetypes.txt 	\private\10003a3f\reccaf\reccafmimetypes.txt
 
 #endif
--- a/contentmgmt/contentaccessfwfordrm/group/tcaf.mmp	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/contentaccessfwfordrm/group/tcaf.mmp	Wed Aug 18 11:33:05 2010 +0300
@@ -46,6 +46,10 @@
 USERINCLUDE		../source/caf
 USERINCLUDE		../inc
 
+#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+USERINCLUDE		../../referencedrmagent/refcafhelper/inc
+#endif
+
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 OS_LAYER_LIBC_SYSTEMINCLUDE
--- a/contentmgmt/referencedrmagent/refcafhelper/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/refcafhelper/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -34,7 +34,6 @@
 
 PRJ_TESTEXPORTS
 
-../inc/refcafhelper.h		/epoc32/include/test/refcafhelper.h
 
 // ROM test iby
 ../inc/refcafhelper.iby /epoc32/rom/include/refcafhelper.iby
\ No newline at end of file
--- a/contentmgmt/referencedrmagent/tcaf/scripts/consumerstep.ini	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/consumerstep.ini	Wed Aug 18 11:33:05 2010 +0300
@@ -44,18 +44,18 @@
 WITHOUTINTENT=true
 
 [DRMFileOpenPerformance]
-FileName = c:\tcaf\testdata\notes1.txt
+FileName = z:\tcaf\testdata\notes1.txt
 IterationCount = 5
 MaxTimeLimitInMS = 50	//Maximum time for the file open operation.Any time exceeding this leads to test failure.
 
 [DRMFileOpenPerformance_SingleRTAObject]
-FileName = c:\tcaf\testdata\audio.content
+FileName = z:\tcaf\testdata\audio.content
 IterationCount = 5
 MaxTimeLimitInMS = 140	//Maximum time for the file open operation.Any time exceeding this leads to test failure.
 
 
 [DRMFileOpenPerformance_MultipleRTAObject]
-FileName = c:\tcaf\testdata\audiomulti.content|\picture.jpg
+FileName = z:\tcaf\testdata\audiomulti.content|\picture.jpg
 IterationCount = 5
 MaxTimeLimitInMS = 140	//Maximum time for the file open operation.Any time exceeding this leads to test failure.
 UniqueId = \picture.jpg
\ No newline at end of file
--- a/contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/drmfileperformance_armv5.script	Wed Aug 18 11:33:05 2010 +0300
@@ -29,7 +29,7 @@
 //! @SYMTestActions		Attempt to obtain the time taken to open a plaintext ile.
 //! @SYMTestExpectedResults	Test fails if the time to open the plaintext file exceeds the value specified in the INI file.
 
-RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep c:\tcaf\consumerstep.ini DRMFileOpenPerformance
+RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep z:\tcaf\consumerstep.ini DRMFileOpenPerformance
 END_TESTCASE 			SEC-CAF-DRMFP-0001
 
 START_TESTCASE 			SEC-CAF-DRMFP-0002
@@ -43,7 +43,7 @@
 //! @SYMTestActions		Attempt to obtain the time taken to open a file containing single content object.
 //! @SYMTestExpectedResults	Test fails if the time to open a file containing single content object exceeds the value specified in the INI file.
 
-RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep c:\tcaf\consumerstep.ini DRMFileOpenPerformance_SingleRTAObject
+RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep z:\tcaf\consumerstep.ini DRMFileOpenPerformance_SingleRTAObject
 END_TESTCASE 			SEC-CAF-DRMFP-0002
 
 START_TESTCASE 			SEC-CAF-DRMFP-0003
@@ -57,7 +57,7 @@
 //! @SYMTestActions		Attempt to obtain the time taken to open a file containing multiple content objects.
 //! @SYMTestExpectedResults	Test fails if the time to open a file containing multiple content objects exceeds the value specified in the INI file.
 
-RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep c:\tcaf\consumerstep.ini DRMFileOpenPerformance_MultipleRTAObject
+RUN_TEST_STEP 100 tcaf CAFDRMFileOpenPerformanceStep z:\tcaf\consumerstep.ini DRMFileOpenPerformance_MultipleRTAObject
 END_TESTCASE 			SEC-CAF-DRMFP-0003
 
 
--- a/contentmgmt/referencedrmagent/tcaf/scripts/managerstep.ini	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/managerstep.ini	Wed Aug 18 11:33:05 2010 +0300
@@ -158,7 +158,7 @@
 result 	    =-17450
 
 [ListAgents]
-count	    =3
+count	    =5
 result 	    =0
 
 [AgentSpecific]
--- a/contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/tcaf/scripts/nodrmcapsteps.script	Wed Aug 18 11:33:05 2010 +0300
@@ -16,7 +16,7 @@
 
 // Test cases for validating the methods newly enforced DRM capability.
 
-RUN_PROGRAM 100 SETCAP tcaf.exe 0 -SID 80001234 tcafnodrmcap.exe
+RUN_PROGRAM 100 SETCAP tcaf.exe 0 -SID 80002345 tcafnodrmcap.exe
 
 LOAD_SUITE tcafnodrmcap
 
--- a/contentmgmt/referencedrmagent/tcaf/source/CafutilsStep.cpp	Tue Jul 06 16:21:56 2010 +0300
+++ b/contentmgmt/referencedrmagent/tcaf/source/CafutilsStep.cpp	Wed Aug 18 11:33:05 2010 +0300
@@ -26,7 +26,7 @@
 #include "CafUtilsStep.h"
 
 #ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include <test/refcafhelper.h>     
+#include "refcafhelper.h"
 #include <caf/cafhelper.h>     
 #endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT 
 
--- a/crypto/weakcrypto/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcrypto/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -30,9 +30,6 @@
 ../inc/cryptopanic.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptopanic.h)
 ../inc/hash.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(hash.h)
 ../inc/random.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(random.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/keyidentifierutil.h
-#endif
 ../inc/randsvr.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(randsvr.h)
 ../inc/randcliserv.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(randcliserv.h)
 ../inc/pkcs5kdf.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs5kdf.h)
@@ -44,11 +41,6 @@
 ../inc/pbe.iby /epoc32/rom/include/pbe.iby
 
 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/randsvrimpl.h 				/epoc32/include/randsvrimpl.h
-#endif
-#endif
 
 #ifndef SYMBIAN_CRYPTOSPI
 #ifndef TOOLS // Don't build anything for tools
--- a/crypto/weakcrypto/strong/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcrypto/strong/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -43,9 +43,6 @@
 ../inc/rc2.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(rc2.h)
 ../inc/rijndael.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(rijndael.h)
 ../inc/streamcipher.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(streamcipher.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/symmetric.h
-#endif
 ../inc/msymmetriccipher.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(msymmetriccipher.h)
 ../inc/mode.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mode.h)
 ../inc/cryptostrength.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptostrength.h)
--- a/crypto/weakcryptospi/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcryptospi/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -53,12 +53,6 @@
 ../inc/spi/macplugin.h					SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/macplugin.h)
 #endif
 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/spi/rulecharacteristics.h		/epoc32/include/rulecharacteristics.h
-#endif
-#endif
-
 
 // Now, the export control measures do not apply for the below set of headers. Hence, they can be exported.
 ../inc/spi/asymmetriccipherplugin.h		      SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cryptospi/asymmetriccipherplugin.h)
--- a/crypto/weakcryptospi/inc/cryptotests.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcryptospi/inc/cryptotests.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -24,7 +24,10 @@
 #include "pkcs5kdftests.iby"
 #include "paddingtests.iby"
 #include "tcryptospi.iby"
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 #include "cryptospi_testplugins.iby"
+#endif
 
 #if (defined(SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT) && defined(SYMBIAN_ENABLE_SDP_ECC))
 #include "cryptospi_testwmdrmplugins.iby"
@@ -114,6 +117,9 @@
 data = ZDRIVE\tbigint\tprimefailuretests.ini		tbigint\tprimefailuretests.ini
 data = ZDRIVE\tbigint\tprimegen.ini             tbigint\tprimegen.ini
 
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
+
 #if !defined(SMP)
 // Proof of concept KMS (Key Management Server)
 // Add them to the Core image (core.img) only. As rofs1.img does not support the device, and extension.
@@ -133,6 +139,7 @@
 file=ABI_DIR\BUILD_DIR\kmsclient.dll		sys\bin\kmsclient.dll
 
 file=ABI_DIR\BUILD_DIR\kmstest.exe			sys\bin\kmstest.exe
+#endif
 
 #endif
 // End of cryptotests.iby 
--- a/crypto/weakcryptospi/test/kms/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcryptospi/test/kms/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -22,13 +22,6 @@
 
 PRJ_TESTEXPORTS
 
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-exported_include/keyhandle.h /epoc32/include/keyhandle.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-exported_include/kmsclient.h /epoc32/include/kmsclient.h
-#endif
-
 PRJ_TESTMMPFILES
 
 // kmsldd/kmsldd
--- a/crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi.script	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi.script	Wed Aug 18 11:33:05 2010 +0300
@@ -21,27 +21,27 @@
 //
 
 //Symmetric Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_SymmetricCipherTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_SymmetricCipherTestCases.script
 
 //Asymmertric Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_ASymmetricCipherTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_ASymmetricCipherTestCases.script
 
 //Hash and Hmac Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_HashHmacTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_HashHmacTestCases.script
 
 //Random Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_RandomTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_RandomTestCases.script
 
 //Key Exchange, Generation, Signer and Verifier Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_MiscellaneousTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_MiscellaneousTestCases.script
 
 //Plug-in Load Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_pluginloadtestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_pluginloadtestcases.script
 
 //Plug-in Characteristics
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_plugincharstestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_plugincharstestcases.script
 
 //Plug-in Rule Based Selection
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_ruleselectiontestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_ruleselectiontestcases.script
 
 PRINT Complate_Te_CryptoSpi_Tests
--- a/crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi_v2.script	Tue Jul 06 16:21:56 2010 +0300
+++ b/crypto/weakcryptospi/test/tcryptospi/scripts/tcryptospi_v2.script	Wed Aug 18 11:33:05 2010 +0300
@@ -21,33 +21,33 @@
 //
 
 //Symmetric Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_SymmetricCipherTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_SymmetricCipherTestCases.script
 
 //Asymmertric Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_ASymmetricCipherTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_ASymmetricCipherTestCases.script
 
 //Hash Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_HashHmacTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_HashHmacTestCases.script
 
 //Hash Test Cases use the new CreateHashL()
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_hash_test_cases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_hash_test_cases.script
 
 //Mac Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_mac_test_cases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_mac_test_cases.script
 
 //Random Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_RandomTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_RandomTestCases.script
 
 //Key Exchange, Generation, Signer and Verifier Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_MiscellaneousTestCases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_MiscellaneousTestCases.script
 
 //Plug-in Load Test Cases
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_pluginloadtestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_pluginloadtestcases.script
 
 //Plug-in Characteristics
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_plugincharstestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_plugincharstestcases.script
 
 //Plug-in Rule Based Selection
-RUN_SCRIPT c:\testdata\tcryptospi\scripts\te_ruleselectiontestcases.script
+RUN_SCRIPT z:\testdata\tcryptospi\scripts\te_ruleselectiontestcases.script
 
 PRINT Complate_Te_CryptoSpi_Tests
--- a/cryptomgmtlibs/cryptotokenfw/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/cryptotokenfw/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -38,14 +38,12 @@
 ../inc/ct/TCTTokenTypeAttribute.h						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tcttokentypeattribute.h)
 ../inc/ct/TCTFindTokenTypesByInterface.h				SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tctfindtokentypesbyinterface.h)
 ../inc/ct/TCTFindTokenTypesByInterfaceAndAttribute.h	SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tctfindtokentypesbyinterfaceandattribute.h)
-../inc/ct/InterfaceUID.hrh 								/epoc32/include/ct/interfaceuid.hrh
+../inc/ct/InterfaceUID.hrh 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/interfaceuid.hrh)
 ../inc/CryptoTokenRegistryInfo.rh						SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(cryptotokenregistryinfo.rh)
 ../inc/ct/tcttokenhandle.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/tcttokenhandle.h)
 ../inc/ct/RCPointerArray.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/rcpointerarray.h)
 ../inc/ct/RMPointerArray.h								SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct/rmpointerarray.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/ct/logger.h										/epoc32/include/ct/logger.h
-#endif
+
 ../inc/ct.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(ct.h)
 ../inc_interfaces/MCTAuthObject.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctauthobject.h)
 ../inc_interfaces/mcertstore.h 							SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(mcertstore.h)
@@ -66,14 +64,6 @@
 ../inc/securitydefsconst.h								SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(securitydefsconst.h)
 ../inc_interfaces/MCTKeyStoreUIDs.h						SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(mctkeystoreuids.h)
 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc_interfaces/mctcertappinterface.h					/epoc32/include/mctcertappinterface.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/ct/cttokentypedeletehandler.h 					/epoc32/include/cttokentypedeletehandler.h
-#endif
-#endif
 
 PRJ_TESTEXPORTS
 
--- a/cryptomgmtlibs/securitycommonutils/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitycommonutils/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -27,11 +27,6 @@
 ../inc/scscommon.h   	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scscommon.h)
 ../inc/scscommon.inl 	SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/scscommon.inl)
 
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/scsserverconstants.h     /epoc32/include/scsserverconstants.h
-#endif
-#endif
 
 //IPCStream Exports
 ../inc/nullstream.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(scs/nullstream.h)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/asnpkcs.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,27 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"ASN PKCS Tests"}, (0x101FB3E7), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"asnpkcs integration test"
+
+
+"\common\generic\security\os\security\cryptoservices\asnpkcs\test\scripts\tasnpkcstests.ini"-"c:\tasnpkcstests.ini"
+"\common\generic\security\os\security\cryptoservices\asnpkcs\test\scripts\tasnpkcstests.script"-"c:\tasnpkcstests.script1"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/authorisation.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,183 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"Ups Tests"}, (0x101FB3E8), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"ups integration test"
+
+"\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\hosts"-"c:\private\10000882\hosts"
+"\common\generic\security\os\security\cryptomgmtlibs\securitytestfw\test\autotesting\copysecuritytestfiles.bat"-"c:\autotesting\copysecuritytestfiles.bat"
+"\common\generic\security\os\security\authorisation\userpromptservice\database\test\tupsdb\scripts\tupsdb.ini"-"c:\tups\tupsdb\scripts\tupsdb.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\database\test\tupsdb\scripts\tupsdb.script"-"c:\tups\tupsdb\scripts\tupsdb.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\database\test\tupsdb\scripts\tupsdbperformance.ini"-"c:\tups\tupsdb\scripts\tupsdbperformance.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\database\test\tupsdb\scripts\tupsdbperformance.script"-"c:\tups\tupsdb\scripts\tupsdbperformance.script"
+"\epoc32\data\z\private\10283558\policies\ups_10283559_0000002a.rsc"-"c:\private\10283558\policies\ups_10283559_0000002a.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_10283559_0000002b.rsc"-"c:\private\10283558\policies\ups_10283559_0000002b.rsc"
+
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_00000000.rsc"-"c:\private\10283558\policies\ups_101f7f1f_00000000.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_00000000.rsc"-"c:\private\10283558\policies\ups_101f7faa_00000000.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_00000000.rsc"-"c:\private\10283558\policies\ups_101f7fbb_00000000.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_12300456.rsc"-"c:\private\10283558\policies\ups_101f7f1f_12300456.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1230045b.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1230045b.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_12300777.rsc"-"c:\private\10283558\policies\ups_101f7f1f_12300777.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_bad00001.rsc"-"c:\private\10283558\policies\ups_101f7f1f_bad00001.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_bad00002.rsc"-"c:\private\10283558\policies\ups_101f7f1f_bad00002.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000abc1.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000abc1.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_1000abc1.rsc"-"c:\private\10283558\policies\ups_101f7faa_1000abc1.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_1000abc1.rsc"-"c:\private\10283558\policies\ups_101f7fbb_1000abc1.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000dddd.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000dddd.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000ddd2.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000ddd2.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000a00a.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000a00a.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000a00b.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000a00b.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000a00c.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000a00c.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000a00d.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000a00d.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000a00e.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000a00e.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_c00cace1.rsc"-"c:\private\10283558\policies\ups_101f7f1f_c00cace1.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_c00cace1.rsc"-"c:\private\10283558\policies\ups_101f7faa_c00cace1.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_c00cace1.rsc"-"c:\private\10283558\policies\ups_101f7fbb_c00cace1.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7784_00000666.rsc"-"c:\private\10283558\policies\ups_101f7784_00000666.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_b1000011.rsc"-"c:\private\10283558\policies\ups_101f7f1f_b1000011.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_b1000012.rsc"-"c:\private\10283558\policies\ups_101f7f1f_b1000012.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_b1000021.rsc"-"c:\private\10283558\policies\ups_101f7faa_b1000021.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_b1000022.rsc"-"c:\private\10283558\policies\ups_101f7faa_b1000022.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_b1000031.rsc"-"c:\private\10283558\policies\ups_101f7fbb_b1000031.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_b1000032.rsc"-"c:\private\10283558\policies\ups_101f7fbb_b1000032.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_b1100011.rsc"-"c:\private\10283558\policies\ups_101f7f1f_b1100011.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_b1100012.rsc"-"c:\private\10283558\policies\ups_101f7f1f_b1100012.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_b1100021.rsc"-"c:\private\10283558\policies\ups_101f7faa_b1100021.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_b1100022.rsc"-"c:\private\10283558\policies\ups_101f7faa_b1100022.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_b1100031.rsc"-"c:\private\10283558\policies\ups_101f7fbb_b1100031.rsc" 
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_b1100032.rsc"-"c:\private\10283558\policies\ups_101f7fbb_b1100032.rsc" 
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000e032.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000e032.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000e033.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000e033.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000e034.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000e034.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000e035.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000e035.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000daa1.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000daa1.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000d004.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000d004.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7faa_1000d004.rsc"-"c:\private\10283558\policies\ups_101f7faa_1000d004.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7fbb_1000d004.rsc"-"c:\private\10283558\policies\ups_101f7fbb_1000d004.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_0000aaa1.rsc"-"c:\private\10283558\policies\ups_101f7f1f_0000aaa1.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_0000aaa3.rsc"-"c:\private\10283558\policies\ups_101f7f1f_0000aaa3.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7790_00000666.rsc"-"c:\private\10283558\policies\ups_101f7790_00000666.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_1000b012.rsc"-"c:\private\10283558\policies\ups_101f7f1f_1000b012.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_00000666.rsc"-"c:\private\10283558\policies\ups_101f7f1f_00000666.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_00000999.rsc"-"c:\private\10283558\policies\ups_101f7f1f_00000999.rsc"
+
+"\epoc32\data\z\private\10283558\policies\ups_101f7790_100C5678.rsc"-"c:\private\10283558\policies\ups_101f7790_100C5678.rsc"
+"\epoc32\data\z\private\10283558\policies\ups_101f7f1f_100C5678.rsc"-"c:\private\10283558\policies\ups_101f7f1f_100C5678.rsc"
+
+;REM Integration test scripts exports 
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\scripts\tups_integ.ini"-"c:\tups\integ\scripts\tups_integ.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\scripts\tups_integ.script"-"c:\tups\integ\scripts\tups_integ.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\scripts\tups_properties.ini"-"c:\tups\integ\scripts\tups_properties.ini"
+
+;REM Integration test corrupted databases exports 
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\corrupted_db_integ\ups_corrupted1.db"-"c:\tups\integ\corrupted_db_integ\ups_corrupted1.db"
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\corrupted_db_integ\ups_corrupted2.db"-"c:\tups\integ\corrupted_db_integ\ups_corrupted2.db"
+
+
+;REM Integration test sis files and related.
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\packages\uninstall.xml"-"c:\tups\integ\packages\uninstall.xml"
+"\common\generic\security\os\security\authorisation\userpromptservice\test\tups\packages\simple.xml"-"c:\tups\integ\packages\simple.xml"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_post1.sis"-"c:\tups\integ\packages\tupsinteg_post1.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_policies1.sis"-"c:\tups\integ\packages\tupsinteg_policies1.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_policies2.sis"-"c:\tups\integ\packages\tupsinteg_policies2.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_evaluator1.sis"-"c:\tups\integ\packages\tupsinteg_evaluator1.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_dialog1.sis"-"c:\tups\integ\packages\tupsinteg_dialog1.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_eclipse1.sis"-"c:\tups\integ\packages\tupsinteg_eclipse1.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_ca_not_instore.sis"-"c:\tups\integ\packages\tupsinteg_ca_not_instore.sis"
+"\epoc32\data\z\tups\integ\packages\tupsinteg_policies1_negative.sis"-"c:\tups\integ\packages\tupsinteg_policies1_negative.sis"
+
+
+;REM Integration test, file to simulate tamper attempt for backup and restore.
+"\epoc32\data\Z\tups\integ\tampered_backup\backup10285777.1"-"c:\tups\integ\tampered_backup\backup10285777.1"
+
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tpolicycache.script"-"c:\tups\tpolicies\scripts\tpolicycache.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyerrors.ini"-"c:\tups\tpolicies\scripts\policyerrors.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policymatch.ini"-"c:\tups\tpolicies\scripts\policymatch.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policymatchoom.ini"-"c:\tups\tpolicies\scripts\policymatchoom.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyeclipse.ini"-"c:\tups\tpolicies\scripts\policyeclipse.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policypanic0.ini"-"c:\tups\tpolicies\scripts\policypanic0.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\pluginmanager.ini"-"c:\tups\tpolicies\scripts\pluginmanager.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tserviceconfig.script"-"c:\tups\tpolicies\scripts\tserviceconfig.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tserviceconfig.ini"-"c:\tups\tpolicies\scripts\tserviceconfig.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tupsnotifier.script"-"c:\tups\tpolicies\scripts\tupsnotifier.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tupsnotifier.ini"-"c:\tups\tpolicies\scripts\tupsnotifier.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\tpolicyreader.script"-"c:\tups\tpolicies\scripts\tpolicyreader.script"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_valid.ini"-"c:\tups\tpolicies\scripts\policyreader_valid.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_empty.ini"-"c:\tups\tpolicies\scripts\policyreader_empty.ini"	
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_invalidoptions.ini"-"c:\tups\tpolicies\scripts\policyreader_invalidoptions.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_invalidsystemserversecurity.ini"-"c:\tups\tpolicies\scripts\policyreader_invalidsystemserversecurity.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_noexist.ini"-"c:\tups\tpolicies\scripts\policyreader_noexist.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_nodefaultpolicyevaluator.ini"-"c:\tups\tpolicies\scripts\policyreader_nodefaultpolicyevaluator.ini"
+"\common\generic\security\os\security\authorisation\userpromptservice\policies\test\tupspolicies\scripts\policyreader_nodefaultdialogcreator.ini"-"c:\tups\tpolicies\scripts\policyreader_nodefaultdialogcreator.ini"
+
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01031000_01031001.rsc"-"c:\tups\tpolicies\policies\ups_01031000_01031001.rsc"
+
+
+		
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01031000_01031002.rsc"-"c:\tups\tpolicies\policies\ups_01031000_01031002.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01032000_01032001.rsc"-"c:\tups\tpolicies\policies\ups_01032000_01032001.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01033000_01032001.rsc"-"c:\tups\tpolicies\policies\ups_01033000_01032001.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01035000_01035001.rsc"-"c:\tups\tpolicies\policies\ups_01035000_01035001.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01036000_01036001.rsc"-"c:\tups\tpolicies\policies\ups_01036000_01036001.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01037000_01037001.rsc"-"c:\tups\tpolicies\policies\ups_01037000_01037001.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01038000_01038001.rsc"-"c:\tups\tpolicies\policies\ups_01038000_01038001.rsc"
+
+"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01033000_01032001.rsc"-"c:\tups\tpolicies\eclipse\ups_01033000_01032001.rsc"
+"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01034000_01032001.rsc"-"c:\tups\tpolicies\eclipse\ups_01034000_01032001.rsc"
+"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01035000_01035001.rsc"-"c:\tups\tpolicies\eclipse\ups_01035000_01035001.rsc"
+"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01036000_01036001.rsc"-"c:\tups\tpolicies\eclipse\ups_01036000_01036001.rsc"
+;"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01041000_01041001.rsc"-"c:\tups\tpolicies\eclipse\ups_01041000_01041001.rsc"
+;"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01041000_01041002.rsc"-"c:\tups\tpolicies\eclipse\ups_01041000_01041002.rsc"
+;"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01042000_01042001.rsc"-"c:\tups\tpolicies\eclipse\ups_01042000_01042001.rsc"
+;"\epoc32\data\Z\tups\tpolicies\eclipse\ups_01043000_01043001.rsc"-"c:\tups\tpolicies\eclipse\ups_01043000_01043001.rsc"
+
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_empty.rsc"-"c:\tups\tpolicies\policyreader\policyreader_empty.rsc"
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_invalidoptions.rsc"-"c:\tups\tpolicies\policyreader\policyreader_invalidoptions.rsc"
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_invalidsystemserversecurity.rsc"-"c:\tups\tpolicies\policyreader\policyreader_invalidsystemserversecurity.rsc"
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_valid.rsc"-"c:\tups\tpolicies\policyreader\policyreader_valid.rsc"
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_nodefaultpolicyevaluator.rsc"-"c:\tups\tpolicies\policyreader\policyreader_nodefaultpolicyevaluator.rsc"
+"\epoc32\data\Z\tups\tpolicies\policyreader\policyreader_nodefaultdialogcreator.rsc"-"c:\tups\tpolicies\policyreader\policyreader_nodefaultdialogcreator.rsc"
+
+; These files should be ignored by the policy cache
+"\epoc32\data\Z\tups\tpolicies\policies\invalidpolicy.txt"-"c:\tups\tpolicies\policies\invalidpolicy.txt"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01032000.rsc"-"c:\tups\tpolicies\policies\ups_01032000.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01032000_QWERTYUI.rsc"-"c:\tups\tpolicies\policies\ups_01032000_QWERTYUI.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01032000_11111111"-"c:\tups\tpolicies\policies\ups_01032000_11111111"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_0103200011111111.rsc"-"c:\tups\tpolicies\policies\ups_0103200011111111.rsc"
+"\epoc32\data\Z\tups\tpolicies\policies\ups_01032000_11111111.rsc\invalidpolicy.txt"-"c:\tups\tpolicies\policies\ups_01032000_11111111.rsc\invalidpolicy.txt"
+
+"\epoc32\data\Z\private\10283558\policies\ups_01041000_01041001.rsc"-"c:\private\10283558\policies\ups_01041000_01041001.rsc"
+
+
+
--- a/cryptomgmtlibs/securitytestfw/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -36,11 +36,9 @@
 
 PRJ_TESTEXPORTS
 
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/rtestwrapper.h /epoc32/include/scs/rtestwrapper.h
-#endif
 ../inc/securitytestframework.iby	/epoc32/rom/include/securitytestframework.iby
 
+
 // configuration file for the CommsDB set up
 ../test/autotesting/auto.cfg /epoc32/winscw/c/auto.cfg
 ../test/autotesting/auto_broken.cfg /epoc32/winscw/c/auto_broken.cfg
@@ -69,7 +67,7 @@
 ../test/autotesting/testexecute.ini  /epoc32/winscw/c/system/data/testexecute.ini
 
 // batch files for automated hardware testing
-
+	../test/autotesting/copysecuritytestfiles.bat /epoc32/winscw/c/autohardware/copysecuritytestfiles.bat
 	../test/autotesting/hosts		     /epoc32/winscw/c/autohardware/hosts
 	../test/autotesting/testsecurity_sdp.bat	     /epoc32/winscw/c/autohardware/testsecurity_sdp.bat
 	../test/autotesting/testsecurity_sdp_auth.bat	     /epoc32/winscw/c/autohardware/testsecurity_sdp_auth.bat
@@ -120,75 +118,6 @@
 ../inc/sntpclient.iby  /epoc32/rom/include/sntpclient.iby
 ../inc/cryptodeps.iby  /epoc32/rom/include/cryptodeps.iby
 
-// Include files for testhandler2
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tcancel.h /epoc32/include/testhandler2/tcancel.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_certstoreactionmemfail.h	/epoc32/include/testhandler2/t_certstoreactionmemfail.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/Thardcodedsetup.h /epoc32/include/testhandler2/thardcodedsetup.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tHardcodedTests.h /epoc32/include/testhandler2/thardcodedtests.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_input.h /epoc32/include/testhandler2/t_input.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_message.h /epoc32/include/testhandler2/t_message.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_mtestspec.h /epoc32/include/testhandler2/t_mtestspec.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_output.h /epoc32/include/testhandler2/t_output.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tscriptandhardcoded.h /epoc32/include/testhandler2/tscriptandhardcoded.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tScriptSetup.h /epoc32/include/testhandler2/tscriptsetup.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tScriptTests.h /epoc32/include/testhandler2/tscripttests.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tSyncAction.h /epoc32/include/testhandler2/tsyncaction.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_testaction.h /epoc32/include/testhandler2/t_testaction.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_testactionspec.h /epoc32/include/testhandler2/t_testactionspec.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_testhandler.h /epoc32/include/testhandler2/t_testhandler.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/ttesthandlersettings.h /epoc32/include/testhandler2/ttesthandlersettings.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_testsetup.h /epoc32/include/testhandler2/t_testsetup.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/tTestSpec.h /epoc32/include/testhandler2/ttestspec.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_utils.h /epoc32/include/testhandler2/t_utils.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2/t_errorconverter.h /epoc32/include/testhandler2/t_errorconverter.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-./../test/testhandler2extra/t_inputextra.h /epoc32/include/testhandler2/t_inputextra.h
-#endif
-
-// testhandler_on_testexecute export
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/testexecuteinterface.h /epoc32/include/testexecuteinterface.h
-#endif
 
 ../test/securityframeworktestserver/group/securityframeworktestserver.iby /epoc32/rom/include/securityframeworktestserver.iby
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/caf.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,126 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"CAF Tests"}, (0x101FB3E3), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"CAF integration test"
+
+
+"\epoc32\data\z\tcaf\tcaf.script"-"c:\test\tcaf\tcaf.script"
+"\epoc32\data\z\tcaf\tcafnodrmcap.script"-"c:\test\tcaf\tcafnodrmcap.script"
+"\epoc32\data\z\tcaf\nodrmcapsteps.ini"-"c:\tcaf\nodrmcapsteps.ini"
+
+
+"\epoc32\data\z\tcaf\performance.ini"-"c:\tcaf\performance.ini"
+
+"\epoc32\data\z\tcaf\managerstep.ini"-"c:\tcaf\managerstep.ini"
+
+"\epoc32\data\z\tcaf\rightsmanagerstep.ini"-"c:\tcaf\rightsmanagerstep.ini"
+
+;#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+"\epoc32\data\z\tcaf\consumerstep_64bit.script"-"c:\test\tcaf\consumerstep_64bit.script"
+;#endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+"\epoc32\data\z\tcaf\drmfileperformance_armv5.script"-"c:\test\tcaf\drmfileperformance_armv5.script"
+"\epoc32\data\z\tcaf\consumerstep.ini"-"c:\tcaf\consumerstep.ini"
+
+"\epoc32\data\z\tcaf\recognize.ini"-"c:\tcaf\recognize.ini"
+
+"\epoc32\data\z\tcaf\contentstep.ini"-"c:\tcaf\contentstep.ini"
+
+
+"\epoc32\data\z\tcaf\supply.ini"-"c:\tcaf\supply.ini"
+
+"\epoc32\data\z\tcaf\cafutils.ini"-"c:\tcaf\cafutils.ini"
+
+"\epoc32\data\z\tcaf\contentiteratorstep.ini"-"c:\tcaf\contentiteratorstep.ini"
+"\epoc32\data\z\tcaf\attributes.ini"-"c:\tcaf\attributes.ini"
+
+
+"\epoc32\data\z\tcaf\stringattributes.ini"-"c:\tcaf\stringattributes.ini"
+"\epoc32\data\z\tcaf\testdata\copyfile.txt"-"c:\tcaf\testdata\copyfile.txt"
+"\epoc32\data\z\tcaf\testdata\TestAgentPrivateDir\protected_content.txt"-"c:\tcaf\testdata\TestAgentPrivateDir\protected_content.txt"
+"\epoc32\data\z\tcaf\testdata\dummydata.txt"-"c:\tcaf\testdata\dummydata.txt"
+"\epoc32\data\z\tcaf\testdata\test.drm"-"c:\tcaf\testdata\test.drm"
+"\epoc32\data\z\tcaf\testdata\test.drm.bin"-"c:\tcaf\testdata\test.drm.bin"
+"\epoc32\data\z\tcaf\testdata\uppercasetest.drm"-"c:\tcaf\testdata\uppercasetest.drm"
+"\epoc32\data\z\tcaf\testdata\test.txt"-"c:\tcaf\testdata\test.txt"
+"\epoc32\data\z\tcaf\testdata\Insttest.jad"-"c:\tcaf\testdata\Insttest.jad"
+"\epoc32\data\z\tcaf\testdata\good.gif"-"c:\tcaf\testdata\good.gif"
+"\epoc32\data\z\tcaf\testdata\error.gif"-"c:\tcaf\testdata\error.gif"
+"\epoc32\data\z\tcaf\testdata\picture.jpg"-"c:\tcaf\testdata\picture.jpg"
+"\epoc32\data\z\tcaf\testdata\audio.content"-"c:\tcaf\testdata\audio.content"
+"\epoc32\data\z\tcaf\testdata\audiomulti.content"-"c:\tcaf\testdata\audiomulti.content"
+"\epoc32\data\z\tcaf\testdata\notes1.txt"-"c:\tcaf\testdata\notes1.txt"
+
+
+; Store file in Apparc Server Private Directory
+"\epoc32\data\z\private\10003A3F\RecCaf\RecCafMimeTypes.txt"-"c:\private\10003a3f\RecCaf\RecCafMimeTypes.txt"
+
+
+"\epoc32\data\z\rta\rta.script"-"c:\test\rta\rta.script"
+;#ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+"\epoc32\data\z\rta\rta_64bit.script"-"c:\test\rta\rta_64bit.script"
+;#endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+"\epoc32\data\z\rta\rta.ini"-"c:\rta\rta.ini
+"\epoc32\data\z\rta\testdata\sample.txt"-"c:\rta\testdata\sample.txt"
+"\epoc32\data\z\rta\testdata\content.xml"-"c:\rta\testdata\content.xml"
+"\epoc32\data\z\rta\testdata\content2.xml"-"c:\rta\testdata\content2.xml"
+"\epoc32\data\z\rta\testdata\rights.xml"-"c:\rta\testdata\rights.xml"
+"\epoc32\data\z\rta\testdata\rights2.xml"-"c:\rta\testdata\rights2.xml"
+"\epoc32\data\z\rta\testdata\rights3.xml"-"c:\rta\testdata\rights3.xml"
+"\epoc32\data\z\rta\testdata\stringattributes.xml"-"c:\rta\testdata\stringattributes.xml"
+"\epoc32\data\z\rta\testdata\AudioContent.xml"-"c:\rta\testdata\AudioContent.xml"
+"\epoc32\data\z\rta\testdata\AudioRights.xml"-"c:\rta\testdata\AudioRights.xml"
+"\epoc32\data\z\rta\testdata\AudioTst.wav"-"c:\rta\testdata\AudioTst.wav"
+"\epoc32\data\z\rta\testdata\rights_v0.db"-"c:\rta\testdata\rights_v0.db"
+"\epoc32\data\z\rta\testdata\corruptcontent.content"-"c:\rta\testdata\corruptcontent.content"
+"\epoc32\data\z\rta\testdata\negativelengthcontent.content"-"c:\rta\testdata\negativelengthcontent.content"
+"\epoc32\data\z\rta\testdata\containeruniqueidboundarycheck.xml"-"c:\rta\testdata\containeruniqueidboundarycheck.xml"
+"\epoc32\data\z\rta\testdata\contentnameboundarycheck.xml"-"c:\rta\testdata\contentnameboundarycheck.xml"
+"\epoc32\data\z\rta\testdata\contentuniqueidboundarycheck.xml"-"c:\rta\testdata\contentuniqueidboundarycheck.xml"
+"\epoc32\data\z\rta\testdata\containernouniqueid.xml"-"c:\rta\testdata\containernouniqueid.xml"
+"\epoc32\data\z\rta\testdata\contentnouniqueid.xml"-"c:\rta\testdata\contentnouniqueid.xml"
+"\epoc32\data\z\rta\testdata\containeremptyuniqueid.xml"-"c:\rta\testdata\containeremptyuniqueid.xml"
+"\epoc32\data\z\rta\testdata\contentemptyuniqueid.xml"-"c:\rta\testdata\contentemptyuniqueid.xml"
+"\epoc32\data\z\rta\testdata\content3.xml"-"c:\rta\testdata\content3.xml"
+
+
+
+; Test Streaming CAF Agent scripts
+"\epoc32\data\z\tcaf\tscaf\tscaf.ini"-"c:\tcaf\tscaf\tscaf.ini"
+"\epoc32\data\z\tcaf\tscaf\tscaf.script"-"c:\test\tcaf\tscaf\tscaf.script1"
+
+
+; Test Streaming CAF Agent data
+"\epoc32\data\z\tcaf\tscaf\data\rosimple.dr"-"c:\tcaf\tscaf\data\rosimple.dr"
+"\epoc32\data\z\tcaf\tscaf\data\roexpired.dr"-"c:\tcaf\tscaf\data\roexpired.dr"
+"\epoc32\data\z\tcaf\tscaf\data\roprogramprotected.dr"-"c:\tcaf\tscaf\data\roprogramprotected.dr"
+"\epoc32\data\z\tcaf\tscaf\data\roserviceprotected.dr"-"c:\tcaf\tscaf\data\roserviceprotected.dr"
+"\epoc32\data\z\tcaf\tscaf\data\rorecordable.dr"-"c:\tcaf\tscaf\data\rorecordable.dr"
+"\epoc32\data\z\tcaf\tscaf\data\postacquisitiontest.dr"-"c:\tcaf\tscaf\data\postacquisitiontest.dr"
+
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_programprotect01.dr"-"c:\tcaf\tscaf\data\tscaf_rights_programprotect01.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_programprotect02.dr"-"c:\tcaf\tscaf\data\tscaf_rights_programprotect02.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_programprotect03.dr"-"c:\tcaf\tscaf\data\tscaf_rights_programprotect03.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_serviceprotect01.dr"-"c:\tcaf\tscaf\data\tscaf_rights_serviceprotect01.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_serviceprotect02.dr"-"c:\tcaf\tscaf\data\tscaf_rights_serviceprotect02.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_serviceprotect03.dr"-"c:\tcaf\tscaf\data\tscaf_rights_serviceprotect03.dr"
+"\epoc32\data\z\tcaf\tscaf\data\tscaf_rights_expired01.dr"-"c:\tcaf\tscaf\data\tscaf_rights_expired01.dr"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/certman.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,892 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"Certman Tests"}, (0x101FB3E2), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"Certman integration test"
+
+"\epoc32\winscw\c\tpkixcert\scripts\tpkixtest_part1.script"-"c:\tpkixcert\scripts\tpkixtest_part1.script1"
+"\epoc32\winscw\c\tpkixcert\scripts\tpkixtest_part2.script"-"c:\tpkixcert\scripts\tpkixtest_part2.script1"
+"\epoc32\winscw\c\tpkixcert\scripts\cancel1.script"-"c:\tpkixcert\scripts\cancel1.script1"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert.script"-"c:\twtlscert\scripts\twtlscert.script1"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert1.script"-"c:\twtlscert\scripts\twtlscert1.script1"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert2.script"-"c:\twtlscert\scripts\twtlscert2.script1"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert3.script"-"c:\twtlscert\scripts\twtlscert3.script1"
+"\epoc32\winscw\c\tcertstore\scripts\t_certstore_sha2.script"-"c:\tcertstore\scripts\t_certstore_sha2.script1"
+
+"\epoc32\winscw\c\tcertstore\scripts\swicertstore1hw.script"-"c:\tcertstore\scripts\swicertstore1.script1"
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore1-conf1.script"-"c:\tcertstore\scripts\unifiedcertstore1-conf1.script1"
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore2-conf1.script"-"c:\tcertstore\scripts\unifiedcertstore2-conf1.script1"
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore3-conf1.script"-"c:\tcertstore\scripts\unifiedcertstore3-conf1.script1"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent1.script"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent1.script1"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent2.script"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent2.script1"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent3.script"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent3.script1"
+"\epoc32\winscw\c\tcertstore\scripts\dsa.script"-"c:\tcertstore\scripts\dsa.script1"
+"\epoc32\winscw\c\tcertstore\scripts\reload.script"-"c:\tcertstore\scripts\reload.script1"
+
+"\epoc32\winscw\c\tcertstore\scripts\swicertstore4.script"-"c:\tcertstore\scripts\swicertstore4.script1"
+"\epoc32\winscw\c\tcertstore\scripts\wri-swicertstorehw.script"-"c:\tcertstore\scripts\wri-swicertstore1.script1"
+"\epoc32\winscw\c\tcertstore\scripts\apipolicing.script"-"c:\tcertstore\scripts\apipolicing.script1"
+"\epoc32\winscw\c\tcertstore\scripts\filecertstore_errors.script"-"c:\tcertstore\scripts\filecertstore_errors.script1"
+
+"\epoc32\winscw\c\tcertstore\multiple_certstore\scripts\tfilecertstore14.script"-"c:\tcertstore\multiple_certstore\scripts\tfilecertstore14.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509.script"-"c:\tx509\scripts\tx509.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509-oom1.script"-"c:\tx509\scripts\tx509-oom1.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509-oom2.script"-"c:\tx509\scripts\tx509-oom2.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509_dev_certs.script"-"c:\tx509\scripts\tx509_dev_certs.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509_dev_certs_oom.script"-"c:\tx509\scripts\tx509_dev_certs_oom.script1"
+"\epoc32\winscw\c\tx509\scripts\tx509-dnames.script"-"c:\tx509\scripts\tx509-dnames.script1"
+"\epoc32\winscw\c\tasn1\scripts\tasn1.script"-"c:\tasn1\scripts\tasn1.script1"
+"\epoc32\winscw\c\tpkcs10\scripts\tpkcs10_v2.script"-"c:\tpkcs10\scripts\tpkcs10_v2.script"
+"\epoc32\winscw\c\tpkixcert_tef\scripts\tpkixcert_tef.script"-"c:\tpkixcert_tef\scripts\tpkixcert_tef.script"
+
+"\epoc32\winscw\c\system\tocsp\Certs\Root1_RSA.cer"-"c:\System\TOCSP\Certs\Root1_RSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Signing1_RSA.cer"-"c:\System\TOCSP\Certs\Signing1_RSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Good-R1.cer"-"c:\System\TOCSP\Certs\Good-R1.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Revoked-R1.cer"-"c:\System\TOCSP\Certs\Revoked-R1.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Suspended-R1.cer"-"c:\System\TOCSP\Certs\Suspended-R1.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Unknown-R1.cer"-"c:\System\TOCSP\Certs\Unknown-R1.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Expired-R1.cer"-"c:\System\TOCSP\Certs\Expired-R1.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\Root2_DSA.cer"-"c:\System\TOCSP\Certs\Root2_DSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Signing2_DSA.cer"-"c:\System\TOCSP\Certs\Signing2_DSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Good_R2.cer"-"c:\System\TOCSP\Certs\Good_R2.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Revoked_R2.cer"-"c:\System\TOCSP\Certs\Revoked_R2.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Suspended_R2.cer"-"c:\System\TOCSP\Certs\Suspended_R2.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Unknown_R2.cer"-"c:\System\TOCSP\Certs\Unknown_R2.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\Valicert1_RSA.cer"-"c:\System\TOCSP\Certs\Valicert1_RSA.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\CertCo-signing-root.cer"-"c:\System\TOCSP\Certs\CertCo-signing-root.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\Root5-RSA.cer"-"c:\System\TOCSP\Certs\Root5-RSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Signing5-RSA.cer"-"c:\System\TOCSP\Certs\Signing5-RSA.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Good-R5.cer"-"c:\System\TOCSP\Certs\Good-R5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Revoked-R5.cer"-"c:\System\TOCSP\Certs\Revoked-R5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Unknown-R5.cer"-"c:\System\TOCSP\Certs\Unknown-R5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Expired-R5.cer"-"c:\System\TOCSP\Certs\Expired-R5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Suspended-R5.cer"-"c:\System\TOCSP\Certs\Suspended-R5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\GoodAIA-R5.cer"-"c:\System\TOCSP\Certs\GoodAIA-R5.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\Good-M5.cer"-"c:\System\TOCSP\Certs\Good-M5.cer"
+"\epoc32\winscw\c\system\tocsp\Certs\Mid5-RSA.cer"-"c:\System\TOCSP\Certs\Mid5-RSA.cer"
+
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca1-root.der"-"c:\System\TOCSP\Certs\OpenSSL\ca1-root.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca1-entity1.der"-"c:\System\TOCSP\Certs\OpenSSL\ca1-entity1.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca1-entity2.der"-"c:\System\TOCSP\Certs\OpenSSL\ca1-entity2.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca1-entity3.der"-"c:\System\TOCSP\Certs\OpenSSL\ca1-entity3.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca2-root.der"-"c:\System\TOCSP\Certs\OpenSSL\ca2-root.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca2-entity1.der"-"c:\System\TOCSP\Certs\OpenSSL\ca2-entity1.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca2-entity2.der"-"c:\System\TOCSP\Certs\OpenSSL\ca2-entity2.der"
+"\epoc32\winscw\c\system\tocsp\Certs\OpenSSL\ca2-entity3.der"-"c:\System\TOCSP\Certs\OpenSSL\ca2-entity3.der"
+
+
+
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Good-R1.der"-"c:\System\TOCSP\Certs\newopenssl\Good-R1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Good-R2.der"-"c:\System\TOCSP\Certs\newopenssl\Good-R2.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Good-R5.der"-"c:\System\TOCSP\Certs\newopenssl\Good-R5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\GoodAIA-R5.der"-"c:\System\TOCSP\Certs\newopenssl\GoodAIA-R5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Good-M5.der"-"c:\System\TOCSP\Certs\newopenssl\Good-M5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Revoked-R1.der"-"c:\System\TOCSP\Certs\newopenssl\Revoked-R1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Revoked-R2.der"-"c:\System\TOCSP\Certs\newopenssl\Revoked-R2.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Revoked-R5.der"-"c:\System\TOCSP\Certs\newopenssl\Revoked-R5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Unknown-R1.der"-"c:\System\TOCSP\Certs\newopenssl\Unknown-R1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Unknown-R2.der"-"c:\System\TOCSP\Certs\newopenssl\Unknown-R2.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Unknown-R5.der"-"c:\System\TOCSP\Certs\newopenssl\Unknown-R5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Expired-R1.der"-"c:\System\TOCSP\Certs\newopenssl\Expired-R1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Expired-R2.der"-"c:\System\TOCSP\Certs\newopenssl\Expired-R2.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Expired-R5.der"-"c:\System\TOCSP\Certs\newopenssl\Expired-R5.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\OCSPSigner-R1.der"-"c:\System\TOCSP\Certs\newopenssl\OCSPSigner-R1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\OCSPSigner-R2.der"-"c:\System\TOCSP\Certs\newopenssl\OCSPSigner-R2.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\OCSPSigner-R5.der"-"c:\System\TOCSP\Certs\newopenssl\OCSPSigner-R5.der"
+
+
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Root1-RSA.der"-"c:\System\TOCSP\Certs\newopenssl\Root1-RSA.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Root2-DSA.der"-"c:\System\TOCSP\Certs\newopenssl\Root2-DSA.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\Root5-RSA.der"-"c:\System\TOCSP\Certs\newopenssl\Root5-RSA.der"
+
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-1-1.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-1-1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-1-1_Good.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-1-1_Good.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-1-1_RespSign.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-1-1_RespSign.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-1-1_Revoked.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-1-1_Revoked.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-1-1_Unknown.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-1-1_Unknown.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-DSA-1-1.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-DSA-1-1.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Good.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Good.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_RespSign.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_RespSign.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Revoked.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Revoked.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Unknown.der"-"c:\System\TOCSP\Certs\newopenssl\CADelg-DSA-1-1_Unknown.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\RootCADelg-DSA.der"-"c:\System\TOCSP\Certs\newopenssl\RootCADelg-DSA.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\RootCADelg-RSA.der"-"c:\System\TOCSP\Certs\newopenssl\RootCADelg-RSA.der"
+
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\RootCADirect-RSA.der"-"c:\System\TOCSP\Certs\newopenssl\RootCADirect-RSA.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-RSA_Good.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-RSA_Good.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-RSA_Revoked.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-RSA_Revoked.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-RSA_Unknown.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-RSA_Unknown.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\RootCADirect-DSA.der"-"c:\System\TOCSP\Certs\newopenssl\RootCADirect-DSA.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-DSA_Good.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-DSA_Good.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-DSA_Revoked.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-DSA_Revoked.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\CADirect-DSA_Unknown.der"-"c:\System\TOCSP\Certs\newopenssl\CADirect-DSA_Unknown.der"
+
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\ee_with_aia.der"-"c:\System\TOCSP\Certs\newopenssl\ee_with_aia.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\ee_without_aia.der"-"c:\System\TOCSP\Certs\newopenssl\ee_without_aia.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\ee_withaia_19005.der"-"c:\System\TOCSP\Certs\newopenssl\ee_withaia_19005.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\ee_withaia_19006.der"-"c:\System\TOCSP\Certs\newopenssl\ee_withaia_19006.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\newopenssl\ica_cert.der"-"c:\System\TOCSP\Certs\newopenssl\ica_cert.der"
+
+"\epoc32\winscw\c\system\TOCSP\Certs\symbsign\symbsign_int.der"-"c:\System\TOCSP\Certs\symbsign\symbsign_int.der"
+"\epoc32\winscw\c\system\TOCSP\Certs\symbsign\symbsign_ee.der"-"c:\System\TOCSP\Certs\symbsign\symbsign_ee.der"
+
+
+"\epoc32\winscw\c\tpkixcert\scripts\tpkixtest_all.txt"-"c:\tpkixcert\scripts\tpkixtest_all.txt"
+
+"\epoc32\winscw\c\tpkixcert\scripts\tpkixtest_part1.ini"-"c:\tpkixcert\scripts\tpkixtest_part1.ini"
+"\epoc32\winscw\c\tpkixcert\scripts\tpkixtest_part2.ini"-"c:\tpkixcert\scripts\tpkixtest_part2.ini"
+"\epoc32\winscw\c\tpkixcert\scripts\cancel1.ini"-"c:\tpkixcert\scripts\cancel1.ini"
+
+
+"\epoc32\winscw\c\pkixtestdata\build\ca1.crt"-"c:\pkixtestdata\build\ca1.crt"
+"\epoc32\winscw\c\pkixtestdata\build\ca2.crt"-"c:\pkixtestdata\build\ca2.crt"
+"\epoc32\winscw\c\pkixtestdata\build\ca3_root.crt"-"c:\pkixtestdata\build\ca3_root.crt"
+"\epoc32\winscw\c\pkixtestdata\build\ee.crt"-"c:\pkixtestdata\build\ee.crt"
+"\epoc32\winscw\c\pkixtestdata\build\rich1.crt"-"c:\pkixtestdata\build\rich1.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\invalid_sig.der"-"c:\pkixtestdata\validation\invalid_sig.der"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_01\EndCertificateCP_01_01.crt"-"c:\pkixtestdata\validation\cp_01_01\EndCertificateCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_01_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_02\EndCertificateCP_01_02.crt"-"c:\pkixtestdata\validation\cp_01_02\EndCertificateCP_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_02\IntermediateCertificateCP_01_02.crt"-"c:\pkixtestdata\validation\cp_01_02\IntermediateCertificateCP_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_01_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_03\EndCertificateCP_01_03.crt"-"c:\pkixtestdata\validation\cp_01_03\EndCertificateCP_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_03\IntermediateCertificateCP_01_03.crt"-"c:\pkixtestdata\validation\cp_01_03\IntermediateCertificateCP_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_01_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_01_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_01\EndCertificateCP_02_01.crt"-"c:\pkixtestdata\validation\cp_02_01\EndCertificateCP_02_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_01\IntermediateCertificate1CP_02_01.crt"-"c:\pkixtestdata\validation\cp_02_01\IntermediateCertificate1CP_02_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_01\IntermediateCertificate2CP_02_01.crt"-"c:\pkixtestdata\validation\cp_02_01\IntermediateCertificate2CP_02_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_02_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_02\EndCertificateCP_02_02.crt"-"c:\pkixtestdata\validation\cp_02_02\EndCertificateCP_02_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_02\IntermediateCertificateCP_02_02.crt"-"c:\pkixtestdata\validation\cp_02_02\IntermediateCertificateCP_02_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_02_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_03\EndCertificateCP_02_03.crt"-"c:\pkixtestdata\validation\cp_02_03\EndCertificateCP_02_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_03\IntermediateCertificateCP_02_03.crt"-"c:\pkixtestdata\validation\cp_02_03\IntermediateCertificateCP_02_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_02_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_04\EndCertificateCP_02_04.crt"-"c:\pkixtestdata\validation\cp_02_04\EndCertificateCP_02_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_04\IntermediateCertificateCP_02_04.crt"-"c:\pkixtestdata\validation\cp_02_04\IntermediateCertificateCP_02_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_02_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_05\EndCertificateCP_02_05.crt"-"c:\pkixtestdata\validation\cp_02_05\EndCertificateCP_02_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_05\IntermediateCertificateCP_02_05.crt"-"c:\pkixtestdata\validation\cp_02_05\IntermediateCertificateCP_02_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_02_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_02_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_01\EndCertificateCP_03_01.crt"-"c:\pkixtestdata\validation\cp_03_01\EndCertificateCP_03_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_01\IntermediateCertificateCP_03_01.crt"-"c:\pkixtestdata\validation\cp_03_01\IntermediateCertificateCP_03_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_03_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_02\EndCertificateCP_03_02.crt"-"c:\pkixtestdata\validation\cp_03_02\EndCertificateCP_03_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_02\IntermediateCertificateCP_03_02.crt"-"c:\pkixtestdata\validation\cp_03_02\IntermediateCertificateCP_03_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_03_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_03\EndCertificateCP_03_03.crt"-"c:\pkixtestdata\validation\cp_03_03\EndCertificateCP_03_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_03\IntermediateCertificateCP_03_03.crt"-"c:\pkixtestdata\validation\cp_03_03\IntermediateCertificateCP_03_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_03_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_04\EndCertificateCP_03_04.crt"-"c:\pkixtestdata\validation\cp_03_04\EndCertificateCP_03_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_04\IntermediateCertificateCP_03_04.crt"-"c:\pkixtestdata\validation\cp_03_04\IntermediateCertificateCP_03_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_03_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_03_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_01\EndCertificateCP_04_01.crt"-"c:\pkixtestdata\validation\cp_04_01\EndCertificateCP_04_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_01\IntermediateCertificateCP_04_01.crt"-"c:\pkixtestdata\validation\cp_04_01\IntermediateCertificateCP_04_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_02\EndCertificateCP_04_02.crt"-"c:\pkixtestdata\validation\cp_04_02\EndCertificateCP_04_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_02\IntermediateCertificateCP_04_02.crt"-"c:\pkixtestdata\validation\cp_04_02\IntermediateCertificateCP_04_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_03\EndCertificateCP_04_03.crt"-"c:\pkixtestdata\validation\cp_04_03\EndCertificateCP_04_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_03\IntermediateCertificateCP_04_03.crt"-"c:\pkixtestdata\validation\cp_04_03\IntermediateCertificateCP_04_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_04\EndCertificateCP_04_04.crt"-"c:\pkixtestdata\validation\cp_04_04\EndCertificateCP_04_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_04\IntermediateCertificateCP_04_04.crt"-"c:\pkixtestdata\validation\cp_04_04\IntermediateCertificateCP_04_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_05\EndCertificateCP_04_05.crt"-"c:\pkixtestdata\validation\cp_04_05\EndCertificateCP_04_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_05\IntermediateCertificateCP_04_05.crt"-"c:\pkixtestdata\validation\cp_04_05\IntermediateCertificateCP_04_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_06\EndCertificateCP_04_06.crt"-"c:\pkixtestdata\validation\cp_04_06\EndCertificateCP_04_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_06\IntermediateCertificateCP_04_06.crt"-"c:\pkixtestdata\validation\cp_04_06\IntermediateCertificateCP_04_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\cp_04_06\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\cp_04_06\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_01_01\EndCertificateIC_01_01.crt"-"c:\pkixtestdata\validation\ic_01_01\EndCertificateIC_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_01_01\IntermediateCertificateIC_01_01.crt"-"c:\pkixtestdata\validation\ic_01_01\IntermediateCertificateIC_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_01_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_01_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_01\EndCertificateIC_02_01.crt"-"c:\pkixtestdata\validation\ic_02_01\EndCertificateIC_02_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_01\IntermediateCertificateIC_02_01.crt"-"c:\pkixtestdata\validation\ic_02_01\IntermediateCertificateIC_02_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_02_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_02\EndCertificateIC_02_02.crt"-"c:\pkixtestdata\validation\ic_02_02\EndCertificateIC_02_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_02\IntermediateCertificateIC_02_02.crt"-"c:\pkixtestdata\validation\ic_02_02\IntermediateCertificateIC_02_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_02_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_03\EndCertificateIC_02_03.crt"-"c:\pkixtestdata\validation\ic_02_03\EndCertificateIC_02_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_03\IntermediateCertificateIC_02_03.crt"-"c:\pkixtestdata\validation\ic_02_03\IntermediateCertificateIC_02_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_02_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_04\EndCertificateIC_02_04.crt"-"c:\pkixtestdata\validation\ic_02_04\EndCertificateIC_02_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_04\IntermediateCertificateIC_02_04.crt"-"c:\pkixtestdata\validation\ic_02_04\IntermediateCertificateIC_02_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_02_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_02_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_04_01\EndCertificateIC_04_01.crt"-"c:\pkixtestdata\validation\ic_04_01\EndCertificateIC_04_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_04_01\IntermediateCertificateIC_04_01.crt"-"c:\pkixtestdata\validation\ic_04_01\IntermediateCertificateIC_04_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_04_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_04_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_01\EndCertificateIC_05_01.crt"-"c:\pkixtestdata\validation\ic_05_01\EndCertificateIC_05_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_01\IntermediateCertificateIC_05_01.crt"-"c:\pkixtestdata\validation\ic_05_01\IntermediateCertificateIC_05_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_05_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_02\EndCertificateIC_05_02.crt"-"c:\pkixtestdata\validation\ic_05_02\EndCertificateIC_05_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_02\IntermediateCertificateIC_05_02.crt"-"c:\pkixtestdata\validation\ic_05_02\IntermediateCertificateIC_05_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_05_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_03\EndCertificateIC_05_03.crt"-"c:\pkixtestdata\validation\ic_05_03\EndCertificateIC_05_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_03\IntermediateCertificateIC_05_03.crt"-"c:\pkixtestdata\validation\ic_05_03\IntermediateCertificateIC_05_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_05_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_05_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_01\EndCertificateIC_06_01.crt"-"c:\pkixtestdata\validation\ic_06_01\EndCertificateIC_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_01\IntermediateCertificateIC_06_01.crt"-"c:\pkixtestdata\validation\ic_06_01\IntermediateCertificateIC_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_06_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_02\EndCertificateIC_06_02.crt"-"c:\pkixtestdata\validation\ic_06_02\EndCertificateIC_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_02\IntermediateCertificateIC_06_02.crt"-"c:\pkixtestdata\validation\ic_06_02\IntermediateCertificateIC_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_06_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_03\EndCertificateIC_06_03.crt"-"c:\pkixtestdata\validation\ic_06_03\EndCertificateIC_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_03\IntermediateCertificateIC_06_03.crt"-"c:\pkixtestdata\validation\ic_06_03\IntermediateCertificateIC_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\ic_06_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\ic_06_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_01\EndCertificatePL_01_01.crt"-"c:\pkixtestdata\validation\pl_01_01\EndCertificatePL_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_01\IntermediateCertificate1PL_01_01.crt"-"c:\pkixtestdata\validation\pl_01_01\IntermediateCertificate1PL_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_01\IntermediateCertificate2PL_01_01.crt"-"c:\pkixtestdata\validation\pl_01_01\IntermediateCertificate2PL_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_02\EndCertificatePL_01_02.crt"-"c:\pkixtestdata\validation\pl_01_02\EndCertificatePL_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_02\IntermediateCertificate1PL_01_02.crt"-"c:\pkixtestdata\validation\pl_01_02\IntermediateCertificate1PL_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_02\IntermediateCertificate2PL_01_02.crt"-"c:\pkixtestdata\validation\pl_01_02\IntermediateCertificate2PL_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_03\EndCertificatePL_01_03.crt"-"c:\pkixtestdata\validation\pl_01_03\EndCertificatePL_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_03\IntermediateCertificatePL_01_03.crt"-"c:\pkixtestdata\validation\pl_01_03\IntermediateCertificatePL_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_04\EndCertificatePL_01_04.crt"-"c:\pkixtestdata\validation\pl_01_04\EndCertificatePL_01_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_04\IntermediateCertificatePL_01_04.crt"-"c:\pkixtestdata\validation\pl_01_04\IntermediateCertificatePL_01_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_05\EndCertificatePL_01_05.crt"-"c:\pkixtestdata\validation\pl_01_05\EndCertificatePL_01_05.crt attrib=r
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_05\IntermediateCertificate1PL_01_05.crt"-"c:\pkixtestdata\validation\pl_01_05\IntermediateCertificate1PL_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_05\IntermediateCertificate2PL_01_05.crt"-"c:\pkixtestdata\validation\pl_01_05\IntermediateCertificate2PL_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_05\IntermediateCertificate3PL_01_05.crt"-"c:\pkixtestdata\validation\pl_01_05\IntermediateCertificate3PL_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_06\EndCertificatePL_01_06.crt"-"c:\pkixtestdata\validation\pl_01_06\EndCertificatePL_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_06\IntermediateCertificate1PL_01_06.crt"-"c:\pkixtestdata\validation\pl_01_06\IntermediateCertificate1PL_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_06\IntermediateCertificate2PL_01_06.crt"-"c:\pkixtestdata\validation\pl_01_06\IntermediateCertificate2PL_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_06\IntermediateCertificate3PL_01_06.crt"-"c:\pkixtestdata\validation\pl_01_06\IntermediateCertificate3PL_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_06\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_06\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\EndCertificatePL_01_07.crt"-"c:\pkixtestdata\validation\pl_01_07\EndCertificatePL_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\IntermediateCertificate1PL_01_07.crt"-"c:\pkixtestdata\validation\pl_01_07\IntermediateCertificate1PL_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\IntermediateCertificate2PL_01_07.crt"-"c:\pkixtestdata\validation\pl_01_07\IntermediateCertificate2PL_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\IntermediateCertificate3PL_01_07.crt"-"c:\pkixtestdata\validation\pl_01_07\IntermediateCertificate3PL_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\IntermediateCertificate4PL_01_07.crt"-"c:\pkixtestdata\validation\pl_01_07\IntermediateCertificate4PL_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_07\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_07\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\EndCertificatePL_01_08.crt"-"c:\pkixtestdata\validation\pl_01_08\EndCertificatePL_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\IntermediateCertificate1PL_01_08.crt"-"c:\pkixtestdata\validation\pl_01_08\IntermediateCertificate1PL_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\IntermediateCertificate2PL_01_08.crt"-"c:\pkixtestdata\validation\pl_01_08\IntermediateCertificate2PL_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\IntermediateCertificate3PL_01_08.crt"-"c:\pkixtestdata\validation\pl_01_08\IntermediateCertificate3PL_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\IntermediateCertificate4PL_01_08.crt"-"c:\pkixtestdata\validation\pl_01_08\IntermediateCertificate4PL_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_08\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_08\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\EndCertificatePL_01_09.crt"-"c:\pkixtestdata\validation\pl_01_09\EndCertificatePL_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\IntermediateCertificate1PL_01_09.crt"-"c:\pkixtestdata\validation\pl_01_09\IntermediateCertificate1PL_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\IntermediateCertificate2PL_01_09.crt"-"c:\pkixtestdata\validation\pl_01_09\IntermediateCertificate2PL_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\IntermediateCertificate3PL_01_09.crt"-"c:\pkixtestdata\validation\pl_01_09\IntermediateCertificate3PL_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\IntermediateCertificate4PL_01_09.crt"-"c:\pkixtestdata\validation\pl_01_09\IntermediateCertificate4PL_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_09\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_09\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\EndCertificatePL_01_10.crt"-"c:\pkixtestdata\validation\pl_01_10\EndCertificatePL_01_10.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\IntermediateCertificate1PL_01_10.crt"-"c:\pkixtestdata\validation\pl_01_10\IntermediateCertificate1PL_01_10.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\IntermediateCertificate2PL_01_10.crt"-"c:\pkixtestdata\validation\pl_01_10\IntermediateCertificate2PL_01_10.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\IntermediateCertificate3PL_01_10.crt"-"c:\pkixtestdata\validation\pl_01_10\IntermediateCertificate3PL_01_10.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\IntermediateCertificate4PL_01_10.crt"-"c:\pkixtestdata\validation\pl_01_10\IntermediateCertificate4PL_01_10.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pl_01_10\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pl_01_10\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_01\EndCertificatePP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_01\EndCertificatePP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_01\IntermediateCertificatePP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_01\IntermediateCertificatePP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_02\EndCertificatePP_01_02.crt"-"c:\pkixtestdata\validation\pp_01_02\EndCertificatePP_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_02\IntermediateCertificatePP_01_02.crt"-"c:\pkixtestdata\validation\pp_01_02\IntermediateCertificatePP_01_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_03\EndCertificatePP_01_03.crt"-"c:\pkixtestdata\validation\pp_01_03\EndCertificatePP_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_03\IntermediateCertificate1PP_01_03.crt"-"c:\pkixtestdata\validation\pp_01_03\IntermediateCertificate1PP_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_03\IntermediateCertificate2PP_01_03.crt"-"c:\pkixtestdata\validation\pp_01_03\IntermediateCertificate2PP_01_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_04\EndCertificatePP_01_04.crt"-"c:\pkixtestdata\validation\pp_01_04\EndCertificatePP_01_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_04\IntermediateCertificate1PP_01_04.crt"-"c:\pkixtestdata\validation\pp_01_04\IntermediateCertificate1PP_01_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_04\IntermediateCertificate2PP_01_04.crt"-"c:\pkixtestdata\validation\pp_01_04\IntermediateCertificate2PP_01_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_05\EndCertificatePP_01_05.crt"-"c:\pkixtestdata\validation\pp_01_05\EndCertificatePP_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_05\IntermediateCertificate1PP_01_05.crt"-"c:\pkixtestdata\validation\pp_01_05\IntermediateCertificate1PP_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_05\IntermediateCertificate2PP_01_05.crt"-"c:\pkixtestdata\validation\pp_01_05\IntermediateCertificate2PP_01_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_06\EndCertificatePP_01_06.crt"-"c:\pkixtestdata\validation\pp_01_06\EndCertificatePP_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_06\IntermediateCertificate1PP_01_06.crt"-"c:\pkixtestdata\validation\pp_01_06\IntermediateCertificate1PP_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_06\IntermediateCertificate2PP_01_06.crt"-"c:\pkixtestdata\validation\pp_01_06\IntermediateCertificate2PP_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_06\IntermediateCertificate3PP_01_06.crt"-"c:\pkixtestdata\validation\pp_01_06\IntermediateCertificate3PP_01_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_06\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_06\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_07\EndCertificatePP_01_07.crt"-"c:\pkixtestdata\validation\pp_01_07\EndCertificatePP_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_07\IntermediateCertificate1PP_01_07.crt"-"c:\pkixtestdata\validation\pp_01_07\IntermediateCertificate1PP_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_07\IntermediateCertificate2PP_01_07.crt"-"c:\pkixtestdata\validation\pp_01_07\IntermediateCertificate2PP_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_07\IntermediateCertificate3PP_01_07.crt"-"c:\pkixtestdata\validation\pp_01_07\IntermediateCertificate3PP_01_07.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_07\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_07\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_08\EndCertificatePP_01_08.crt"-"c:\pkixtestdata\validation\pp_01_08\EndCertificatePP_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_08\IntermediateCertificate1PP_01_08.crt"-"c:\pkixtestdata\validation\pp_01_08\IntermediateCertificate1PP_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_08\IntermediateCertificate2PP_01_08.crt"-"c:\pkixtestdata\validation\pp_01_08\IntermediateCertificate2PP_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_08\IntermediateCertificate3PP_01_08.crt"-"c:\pkixtestdata\validation\pp_01_08\IntermediateCertificate3PP_01_08.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_08\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_08\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\EndCertificatePP_01_09.crt"-"c:\pkixtestdata\validation\pp_01_09\EndCertificatePP_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\IntermediateCertificate1PP_01_09.crt"-"c:\pkixtestdata\validation\pp_01_09\IntermediateCertificate1PP_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\IntermediateCertificate2PP_01_09.crt"-"c:\pkixtestdata\validation\pp_01_09\IntermediateCertificate2PP_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\IntermediateCertificate3PP_01_09.crt"-"c:\pkixtestdata\validation\pp_01_09\IntermediateCertificate3PP_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\IntermediateCertificate4PP_01_09.crt"-"c:\pkixtestdata\validation\pp_01_09\IntermediateCertificate4PP_01_09.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_01_09\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_01_09\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\EndCertificatePP_06_01.crt"-"c:\pkixtestdata\validation\pp_06_01\EndCertificatePP_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\IntermediateCertificate1PP_06_01.crt"-"c:\pkixtestdata\validation\pp_06_01\IntermediateCertificate1PP_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\IntermediateCertificate2PP_06_01.crt"-"c:\pkixtestdata\validation\pp_06_01\IntermediateCertificate2PP_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\IntermediateCertificate3PP_06_01.crt"-"c:\pkixtestdata\validation\pp_06_01\IntermediateCertificate3PP_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\IntermediateCertificate4PP_06_01.crt"-"c:\pkixtestdata\validation\pp_06_01\IntermediateCertificate4PP_06_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_06_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\EndCertificatePP_06_02.crt"-"c:\pkixtestdata\validation\pp_06_02\EndCertificatePP_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\IntermediateCertificate1PP_06_02.crt"-"c:\pkixtestdata\validation\pp_06_02\IntermediateCertificate1PP_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\IntermediateCertificate2PP_06_02.crt"-"c:\pkixtestdata\validation\pp_06_02\IntermediateCertificate2PP_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\IntermediateCertificate3PP_06_02.crt"-"c:\pkixtestdata\validation\pp_06_02\IntermediateCertificate3PP_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\IntermediateCertificate4PP_06_02.crt"-"c:\pkixtestdata\validation\pp_06_02\IntermediateCertificate4PP_06_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_06_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\EndCertificatePP_06_03.crt"-"c:\pkixtestdata\validation\pp_06_03\EndCertificatePP_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\IntermediateCertificate1PP_06_03.crt"-"c:\pkixtestdata\validation\pp_06_03\IntermediateCertificate1PP_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\IntermediateCertificate2PP_06_03.crt"-"c:\pkixtestdata\validation\pp_06_03\IntermediateCertificate2PP_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\IntermediateCertificate3PP_06_03.crt"-"c:\pkixtestdata\validation\pp_06_03\IntermediateCertificate3PP_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\IntermediateCertificate4PP_06_03.crt"-"c:\pkixtestdata\validation\pp_06_03\IntermediateCertificate4PP_06_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_06_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\EndCertificatePP_06_04.crt"-"c:\pkixtestdata\validation\pp_06_04\EndCertificatePP_06_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\IntermediateCertificate1PP_06_04.crt"-"c:\pkixtestdata\validation\pp_06_04\IntermediateCertificate1PP_06_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\IntermediateCertificate2PP_06_04.crt"-"c:\pkixtestdata\validation\pp_06_04\IntermediateCertificate2PP_06_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\IntermediateCertificate3PP_06_04.crt"-"c:\pkixtestdata\validation\pp_06_04\IntermediateCertificate3PP_06_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\IntermediateCertificate4PP_06_04.crt"-"c:\pkixtestdata\validation\pp_06_04\IntermediateCertificate4PP_06_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_06_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\EndCertificatePP_06_05.crt"-"c:\pkixtestdata\validation\pp_06_05\EndCertificatePP_06_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\IntermediateCertificate1PP_06_05.crt"-"c:\pkixtestdata\validation\pp_06_05\IntermediateCertificate1PP_06_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\IntermediateCertificate2PP_06_05.crt"-"c:\pkixtestdata\validation\pp_06_05\IntermediateCertificate2PP_06_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\IntermediateCertificate3PP_06_05.crt"-"c:\pkixtestdata\validation\pp_06_05\IntermediateCertificate3PP_06_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\IntermediateCertificate4PP_06_05.crt"-"c:\pkixtestdata\validation\pp_06_05\IntermediateCertificate4PP_06_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_06_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_06_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_01\EndCertificatePP_08_01.crt"-"c:\pkixtestdata\validation\pp_08_01\EndCertificatePP_08_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_01\IntermediateCertificatePP_08_01.crt"-"c:\pkixtestdata\validation\pp_08_01\IntermediateCertificatePP_08_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_01\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_01\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_02\EndCertificatePP_08_02.crt"-"c:\pkixtestdata\validation\pp_08_02\EndCertificatePP_08_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_02\IntermediateCertificatePP_08_02.crt"-"c:\pkixtestdata\validation\pp_08_02\IntermediateCertificatePP_08_02.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_02\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_02\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_03\EndCertificatePP_08_03.crt"-"c:\pkixtestdata\validation\pp_08_03\EndCertificatePP_08_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_03\IntermediateCertificatePP_08_03.crt"-"c:\pkixtestdata\validation\pp_08_03\IntermediateCertificatePP_08_03.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_03\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_03\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_04\EndCertificatePP_08_04.crt"-"c:\pkixtestdata\validation\pp_08_04\EndCertificatePP_08_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_04\IntermediateCertificatePP_08_04.crt"-"c:\pkixtestdata\validation\pp_08_04\IntermediateCertificatePP_08_04.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_04\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_04\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_05\EndCertificatePP_08_05.crt"-"c:\pkixtestdata\validation\pp_08_05\EndCertificatePP_08_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_05\IntermediateCertificatePP_08_05.crt"-"c:\pkixtestdata\validation\pp_08_05\IntermediateCertificatePP_08_05.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_05\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_05\TrustAnchorCP_01_01.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_06\EndCertificatePP_08_06.crt"-"c:\pkixtestdata\validation\pp_08_06\EndCertificatePP_08_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_06\IntermediateCertificatePP_08_06.crt"-"c:\pkixtestdata\validation\pp_08_06\IntermediateCertificatePP_08_06.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\pp_08_06\TrustAnchorCP_01_01.crt"-"c:\pkixtestdata\validation\pp_08_06\TrustAnchorCP_01_01.crt"
+
+"\epoc32\winscw\c\pkixtestdata\validation\critical_extns\ee_critical_extns.der"-"c:\pkixtestdata\validation\critical_extns\ee_critical_extns.der"
+"\epoc32\winscw\c\pkixtestdata\validation\critical_extns\intermediate_critical_extns.der"-"c:\pkixtestdata\validation\critical_extns\intermediate_critical_extns.der"
+"\epoc32\winscw\c\pkixtestdata\validation\critical_extns\root.der"-"c:\pkixtestdata\validation\critical_extns\root.der"
+
+"\epoc32\winscw\c\pkixtestdata\validation\forged\entrust_exp3_CA.crt"-"c:\pkixtestdata\validation\forged\entrust_exp3_CA.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\forged\datenzone.cer"-"c:\pkixtestdata\validation\forged\datenzone.cer"
+"\epoc32\winscw\c\pkixtestdata\validation\forged\Hacker.cer"-"c:\pkixtestdata\validation\forged\Hacker.cer"
+
+"\epoc32\winscw\c\pkixtestdata\validation\bmpstring\cacert_bmp.crt"-"c:\pkixtestdata\validation\bmpstring\cacert_bmp.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\bmpstring\eecert_bmp.crt"-"c:\pkixtestdata\validation\bmpstring\eecert_bmp.crt"
+
+"\epoc32\winscw\c\pkixtestdata\validation\invalidaltname\invalidaltname.crt"-"c:\pkixtestdata\validation\invalidaltname\invalidaltname.crt"
+"\epoc32\winscw\c\pkixtestdata\validation\invalidaltname\root.crt"-"c:\pkixtestdata\validation\invalidaltname\root.crt"
+
+
+
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert.ini"-"c:\twtlscert\scripts\twtlscert.ini"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert1.ini"-"c:\twtlscert\scripts\twtlscert1.ini"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert2.ini"-"c:\twtlscert\scripts\twtlscert2.ini"
+"\epoc32\winscw\c\twtlscert\scripts\twtlscert3.ini"-"c:\twtlscert\scripts\twtlscert3.ini"
+
+
+"\epoc32\winscw\c\twtlscert\data\Canadian_Hockey_Teams.crt"-"c:\twtlscert\data\Canadian_Hockey_Teams.crt"
+"\epoc32\winscw\c\twtlscert\data\caSELF_TEST.cer"-"c:\twtlscert\data\caSELF_TEST.cer"
+"\epoc32\winscw\c\twtlscert\data\ecaw.cer"-"c:\twtlscert\data\ecaw.cer"
+"\epoc32\winscw\c\twtlscert\data\EntrustNetWAP.bin"-"c:\twtlscert\data\EntrustNetWAP.bin"
+"\epoc32\winscw\c\twtlscert\data\ent-wtls.cer"-"c:\twtlscert\data\ent-wtls.cer"
+"\epoc32\winscw\c\twtlscert\data\ent-wtls-badsig.cer"-"c:\twtlscert\data\ent-wtls-badsig.cer"
+"\epoc32\winscw\c\twtlscert\data\esw.cer"-"c:\twtlscert\data\esw.cer"
+"\epoc32\winscw\c\twtlscert\data\freecerts-wtls.cer"-"c:\twtlscert\data\freecerts-wtls.cer"
+"\epoc32\winscw\c\twtlscert\data\MobileServiceCA.wap"-"c:\twtlscert\data\MobileServiceCA.wap"
+"\epoc32\winscw\c\twtlscert\data\MobileServiceCA-badsig.wap"-"c:\twtlscert\data\MobileServiceCA-badsig.wap"
+"\epoc32\winscw\c\twtlscert\data\Montreal_Canadiens.crt"-"c:\twtlscert\data\Montreal_Canadiens.crt"
+"\epoc32\winscw\c\twtlscert\data\Montreal_Canadiens_Invalid.crt"-"c:\twtlscert\data\Montreal_Canadiens_Invalid.crt"
+"\epoc32\winscw\c\twtlscert\data\Ottawa_Senators.crt"-"c:\twtlscert\data\Ottawa_Senators.crt"
+"\epoc32\winscw\c\twtlscert\data\SELF_TEST.cer"-"c:\twtlscert\data\SELF_TEST.cer"
+"\epoc32\winscw\c\twtlscert\data\symbian-freecerts-wtls.cer"-"c:\twtlscert\data\symbian-freecerts-wtls.cer"
+"\epoc32\winscw\c\twtlscert\data\Toronto_Maple_Leafs.crt"-"c:\twtlscert\data\Toronto_Maple_Leafs.crt"
+"\epoc32\winscw\c\twtlscert\data\Unknown.001"-"c:\twtlscert\data\Unknown.001"
+"\epoc32\winscw\c\twtlscert\data\Vancouver_Canucks.crt"-"c:\twtlscert\data\Vancouver_Canucks.crt"
+"\epoc32\winscw\c\twtlscert\data\will-ent-wtls.cer"-"c:\twtlscert\data\will-ent-wtls.cer"
+"\epoc32\winscw\c\twtlscert\data\will-ent-wtls-badsig.cer"-"c:\twtlscert\data\will-ent-wtls-badsig.cer"
+"\epoc32\winscw\c\twtlscert\data\will-freecerts-wtls.cer"-"c:\twtlscert\data\will-freecerts-wtls.cer"
+"\epoc32\winscw\c\twtlscert\data\william.bamberg@symbian.com.wap"-"c:\twtlscert\data\william.bamberg@symbian.com.wap"
+"\epoc32\winscw\c\twtlscert\data\william.bamberg@symbian.com-badsig.wap"-"c:\twtlscert\data\william.bamberg@symbian.com-badsig.wap"
+"\epoc32\winscw\c\twtlscert\data\Winnipeg_Jets_Missing_CN.crt"-"c:\twtlscert\data\Winnipeg_Jets_Missing_CN.crt"
+"\epoc32\winscw\c\twtlscert\data\wtls-EE.cer"-"c:\twtlscert\data\wtls-EE.cer"
+"\epoc32\winscw\c\twtlscert\data\wtls-EE-badsig.cer"-"c:\twtlscert\data\wtls-EE-badsig.cer"
+"\epoc32\winscw\c\twtlscert\data\wtls-root.cer"-"c:\twtlscert\data\wtls-root.cer"
+"\epoc32\winscw\c\twtlscert\data\wtls-root-badsig.cer"-"c:\twtlscert\data\wtls-root-badsig.cer"
+
+
+
+
+"\epoc32\winscw\c\tcertstore\scripts\t_certstore_sha2.ini"-"c:\tcertstore\scripts\t_certstore_sha2.ini"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent1.txt"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent1.txt"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent2.txt"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent2.txt"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent3.txt"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent3.txt"
+"\epoc32\winscw\c\tcertstore\scripts\swicertstore1hw.ini"-"c:\tcertstore\scripts\swicertstore1.ini"
+
+
+
+
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore1-conf1.ini"-"c:\tcertstore\scripts\unifiedcertstore1-conf1.ini"
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore2-conf1.ini"-"c:\tcertstore\scripts\unifiedcertstore2-conf1.ini"
+"\epoc32\winscw\c\tcertstore\scripts\unifiedcertstore3-conf1.ini"-"c:\tcertstore\scripts\unifiedcertstore3-conf1.ini"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent1.ini"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent1.ini"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent2.ini"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent2.ini"
+"\epoc32\winscw\c\tcertstoreconcurrent\scripts\certstoreconcurrent3.ini"-"c:\tcertstoreconcurrent\scripts\certstoreconcurrent3.ini"
+"\epoc32\winscw\c\tcertstore\scripts\dsa.ini"-"c:\tcertstore\scripts\dsa.ini"
+"\epoc32\winscw\c\tcertstore\scripts\reload.ini"-"c:\tcertstore\scripts\reload.ini"
+
+"\epoc32\winscw\c\tcertstore\scripts\swicertstore4.ini"-"c:\tcertstore\scripts\swicertstore4.ini"
+"\epoc32\winscw\c\tcertstore\scripts\wri-swicertstorehw.ini"-"c:\tcertstore\scripts\wri-swicertstore1.ini"
+"\epoc32\winscw\c\tcertstore\scripts\apipolicing.ini"-"c:\tcertstore\scripts\apipolicing.ini"
+"\epoc32\winscw\c\tcertstore\scripts\filecertstore_errors.ini"-"c:\tcertstore\scripts\filecertstore_errors.ini"
+
+"\epoc32\winscw\c\tcertstore\data\wri-swicertstore.dat"-"c:\tcertstore\data\wri-swicertstore.dat
+"\epoc32\winscw\c\system\data\test1certstore.dat"-"c:\system\data\test1certstore.dat"
+"\epoc32\winscw\c\system\data\test2certstore.dat"-"c:\system\data\test2certstore.dat"
+
+
+
+"\epoc32\winscw\c\tcertstore\serv-rootCA-sha384.der"-"c:\tcertstore\serv-rootCA-sha384.der"
+"\epoc32\winscw\c\tcertstore\serv-rootCA-sha256.der"-"c:\tcertstore\serv-rootCA-sha256.der"
+"\epoc32\winscw\c\tcertstore\serv-rootCA-sha224.der"-"c:\tcertstore\serv-rootCA-sha224.der"
+"\epoc32\winscw\c\tcertstore\serv-rootCA-sha512.der"-"c:\tcertstore\serv-rootCA-sha512.der"
+"\epoc32\winscw\c\tcertstore\thawteserverca.cer"-"c:\tcertstore\thawteserverca.cer"
+"\epoc32\winscw\c\tcertstore\Dsa-ca.cer"-"c:\tcertstore\Dsa-ca.cer"
+"\epoc32\winscw\c\tcertstore\ent-wtls.cer"-"c:\tcertstore\ent-wtls.cer"
+"\epoc32\winscw\c\tcertstore\ent-wtls1.cer"-"c:\tcertstore\ent-wtls1.cer"
+"\epoc32\winscw\c\tcertstore\ent-wtls2.cer"-"c:\tcertstore\ent-wtls2.cer"
+"\epoc32\winscw\c\tcertstore\ent-wtls3.cer"-"c:\tcertstore\ent-wtls3.cer"
+"\epoc32\winscw\c\tcertstore\VeriSignClass1PrimaryCA.cer"-"c:\tcertstore\VeriSignClass1PrimaryCA.cer"
+"\epoc32\winscw\c\tcertstore\VeriSignClass2PrimaryCA.cer"-"c:\tcertstore\VeriSignClass2PrimaryCA.cer"
+"\epoc32\winscw\c\tcertstore\VeriSignClass3PrimaryCA.cer"-"c:\tcertstore\VeriSignClass3PrimaryCA.cer"
+"\epoc32\winscw\c\tcertstore\willsglobalsign.crt"-"c:\tcertstore\willsglobalsign.crt"
+"\epoc32\winscw\c\certappmanager.txt"-"c:\certappmanager.txt"
+"\epoc32\winscw\c\unifiedcertstore2\CAW1.cer"-"c:\unifiedcertstore2\CAW1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAW2.cer"-"c:\unifiedcertstore2\CAW2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAW3.cer"-"c:\unifiedcertstore2\CAW3.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX1.cer"-"c:\unifiedcertstore2\CAX1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX2.cer"-"c:\unifiedcertstore2\CAX2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX3.cer"-"c:\unifiedcertstore2\CAX3.cer"
+"\epoc32\winscw\c\unifiedcertstore2\U1K1.crt"-"c:\unifiedcertstore2\U1K1.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U2K1.crt"-"c:\unifiedcertstore2\U2K1.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U3K2.cer"-"c:\unifiedcertstore2\U3K2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\U4K3.crt"-"c:\unifiedcertstore2\U4K3.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U5K3.crt"-"c:\unifiedcertstore2\U5K3.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U6K5.crt"-"c:\unifiedcertstore2\U6K5.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U7K6.crt"-"c:\unifiedcertstore2\U7K6.crt"
+"\epoc32\winscw\c\unifiedcertstore2\URL1K1.cer"-"c:\unifiedcertstore2\URL1K1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\URL2K2.cer"-"c:\unifiedcertstore2\URL2K2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\URL3K5.cer"-"c:\unifiedcertstore2\URL3K5.cer"
+
+"\epoc32\winscw\c\unifiedcertstore2\enciphersign.cer"-"c:\unifiedcertstore2\enciphersign.cer"
+"\epoc32\winscw\c\unifiedcertstore2\nrcert.cer"-"c:\unifiedcertstore2\nrcert.cer"
+"\epoc32\winscw\c\unifiedcertstore2\rsacert1.cer"-"c:\unifiedcertstore2\rsacert1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\rsacert2.cer"-"c:\unifiedcertstore2\rsacert2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\rsacert3.cer"-"c:\unifiedcertstore2\rsacert3.cer"
+"\epoc32\winscw\c\unifiedcertstore2\subjectkeycert.der"-"c:\unifiedcertstore2\subjectkeycert.der"
+"\epoc32\winscw\c\unifiedcertstore2\rsasigncer2.cer"-"c:\unifiedcertstore2\rsasigncer2.cer"
+
+;//	30/09/2002 New certificates and RSA key pairs added by JCS for certstore testing
+"\epoc32\winscw\c\tcertstore\data\enciphersigncertkey2.txt"-"c:\tcertstore\data\enciphersigncertkey2.txt"
+"\epoc32\winscw\c\tcertstore\data\nrcertkey.txt"-"c:\tcertstore\data\nrcertkey.txt"
+"\epoc32\winscw\c\tcertstore\data\rsacertkey1.txt"-"c:\tcertstore\data\rsacertkey1.txt"
+"\epoc32\winscw\c\tcertstore\data\rsacertkey2.txt"-"c:\tcertstore\data\rsacertkey2.txt"
+"\epoc32\winscw\c\tcertstore\data\rsacertkey3.txt"-"c:\tcertstore\data\rsacertkey3.txt"
+"\epoc32\winscw\c\tcertstore\data\signcertkey2.txt"-"c:\tcertstore\data\signcertkey2.txt"
+
+;// DSA private key and certificate for certstore tests
+"\epoc32\winscw\c\tcertstore\data\pkcs8dsa1.001"-"c:\tcertstore\data\pkcs8dsa1.001"
+"\epoc32\winscw\c\tcertstore\data\cert_dsa1.der"-"c:\tcertstore\data\cert_dsa1.der"
+
+
+;#ifndef __SECURITY_NORMAL_SWICERTSTORE__
+;	// SWI cert store data file, with Root5CA mandatory
+"\epoc32\data\z\resource\swicertstore.dat"-"c:\resource\swicertstore.dat"
+;#endif
+
+;#ifdef AGGREGATE_CERTSTORE
+;	// Test Composite CertStore code (CR1393)
+;	// swicertstore1.txt and swicertstore4.txt script files are sufficient for swicertstore
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\swicertstore1.dat"-"c:\resource\swicertstore3.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\corrupt.dat"-"c:\resource\swicertstore2.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\swicertstore2.dat"-"c:\resource\swicertstore1.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\cacerts2.dat"-"c:\private\101f72a6\cacerts4.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\corrupt.dat"-"c:\private\101f72a6\cacerts3.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\cacerts1.dat"-"c:\private\101f72a6\cacerts2.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\certclients2.dat"-"c:\private\101f72a6\certclients4.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\corrupt.dat"-"c:\private\101f72a6\certclients3.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\tdata\certclients1.dat"-"c:\private\101f72a6\certclients2.dat"
+	"\epoc32\winscw\c\tcertstore\multiple_certstore\scripts\tfilecertstore14.ini"-"c:\tcertstore\multiple_certstore\scripts\tfilecertstore14.ini"
+;#endif
+
+;//scripts
+"\epoc32\winscw\c\tx509\scripts\tx509-1.txt"-"c:\tx509\scripts\tx509-1.txt"
+"\epoc32\winscw\c\tx509\scripts\tx509-2.txt"-"c:\tx509\scripts\tx509-2.txt"
+"\epoc32\winscw\c\tx509\scripts\tx509-3.txt"-"c:\tx509\scripts\tx509-3.txt"
+
+
+"\epoc32\winscw\c\tx509\scripts\tx509.ini"-"c:\tx509\scripts\tx509.ini"
+"\epoc32\winscw\c\tx509\scripts\tx509_dev_certs.ini"-"c:\tx509\scripts\tx509_dev_certs.ini"
+"\epoc32\winscw\c\tx509\scripts\tx509-dnames.ini"-"c:\tx509\scripts\tx509-dnames.ini"
+
+"\epoc32\winscw\c\tx509\data\00.cer"-"c:\tx509\data\00.cer"
+"\epoc32\winscw\c\tx509\data\00000021.cer"-"c:\tx509\data\00000021.cer"
+"\epoc32\winscw\c\tx509\data\00000024.cer"-"c:\tx509\data\00000024.cer"
+"\epoc32\winscw\c\tx509\data\00000029.cer"-"c:\tx509\data\00000029.cer"
+"\epoc32\winscw\c\tx509\data\001_auth.cer"-"c:\tx509\data\001_auth.cer"
+"\epoc32\winscw\c\tx509\data\001_non_rep.cer"-"c:\tx509\data\001_non_rep.cer"
+"\epoc32\winscw\c\tx509\data\01.cer"-"c:\tx509\data\01.cer"
+"\epoc32\winscw\c\tx509\data\03.cer"-"c:\tx509\data\03.cer"
+"\epoc32\winscw\c\tx509\data\11C5.cer"-"c:\tx509\data\11C5.cer"
+"\epoc32\winscw\c\tx509\data\139F.cer"-"c:\tx509\data\139F.cer"
+"\epoc32\winscw\c\tx509\data\1A.cer"-"c:\tx509\data\1A.cer"
+"\epoc32\winscw\c\tx509\data\1EECERT.cer"-"c:\tx509\data\1EECERT.cer"
+"\epoc32\winscw\c\tx509\data\24.cer"-"c:\tx509\data\24.cer"
+"\epoc32\winscw\c\tx509\data\affiliationChange.crt"-"c:\tx509\data\affiliationChange.crt"
+"\epoc32\winscw\c\tx509\data\asia.crt"-"c:\tx509\data\asia.crt"
+"\epoc32\winscw\c\tx509\data\att1.crt"-"c:\tx509\data\att1.crt"
+"\epoc32\winscw\c\tx509\data\AUTHORITY.cer"-"c:\tx509\data\AUTHORITY.cer"
+"\epoc32\winscw\c\tx509\data\badAltName1.crt"-"c:\tx509\data\badAltName1.crt"
+"\epoc32\winscw\c\tx509\data\badAltName2.crt"-"c:\tx509\data\badAltName2.crt"
+"\epoc32\winscw\c\tx509\data\badAltName3.crt"-"c:\tx509\data\badAltName3.crt"
+"\epoc32\winscw\c\tx509\data\badCA1.crt"-"c:\tx509\data\badCA1.crt"
+"\epoc32\winscw\c\tx509\data\badCA2.crt"-"c:\tx509\data\badCA2.crt"
+"\epoc32\winscw\c\tx509\data\badCA3.crt"-"c:\tx509\data\badCA3.crt"
+"\epoc32\winscw\c\tx509\data\badCA4.crt"-"c:\tx509\data\badCA4.crt"
+"\epoc32\winscw\c\tx509\data\badCA4user.crt"-"c:\tx509\data\badCA4user.crt"
+"\epoc32\winscw\c\tx509\data\badSelfSigned.crt"-"c:\tx509\data\badSelfSigned.crt"
+"\epoc32\winscw\c\tx509\data\badSubjName1.crt"-"c:\tx509\data\badSubjName1.crt"
+"\epoc32\winscw\c\tx509\data\badSubjName2.crt"-"c:\tx509\data\badSubjName2.crt"
+"\epoc32\winscw\c\tx509\data\BALTIMORE_USER.cer"-"c:\tx509\data\BALTIMORE_USER.cer"
+"\epoc32\winscw\c\tx509\data\BANKGATEROOT.cer"-"c:\tx509\data\BANKGATEROOT.cer"
+"\epoc32\winscw\c\tx509\data\bbs.crt"-"c:\tx509\data\bbs.crt"
+"\epoc32\winscw\c\tx509\data\belsign1.crt"-"c:\tx509\data\belsign1.crt"
+"\epoc32\winscw\c\tx509\data\belsign2.crt"-"c:\tx509\data\belsign2.crt"
+"\epoc32\winscw\c\tx509\data\belsign3.crt"-"c:\tx509\data\belsign3.crt"
+"\epoc32\winscw\c\tx509\data\belsignclass12.crt"-"c:\tx509\data\belsignclass12.crt"
+"\epoc32\winscw\c\tx509\data\belsignobj.crt"-"c:\tx509\data\belsignobj.crt"
+"\epoc32\winscw\c\tx509\data\belsignss.crt"-"c:\tx509\data\belsignss.crt"
+"\epoc32\winscw\c\tx509\data\BETSY.cer"-"c:\tx509\data\BETSY.cer"
+"\epoc32\winscw\c\tx509\data\BINARYSURGENSROOT.cer"-"c:\tx509\data\BINARYSURGENSROOT.cer"
+"\epoc32\winscw\c\tx509\data\BULL.cer"-"c:\tx509\data\BULL.cer"
+"\epoc32\winscw\c\tx509\data\CA-CERT.cer"-"c:\tx509\data\CA-CERT.cer"
+"\epoc32\winscw\c\tx509\data\caPost.crt"-"c:\tx509\data\caPost.crt"
+"\epoc32\winscw\c\tx509\data\CARYNETROOT.cer"-"c:\tx509\data\CARYNETROOT.cer"
+"\epoc32\winscw\c\tx509\data\CA_CERT.CRT.cer"-"c:\tx509\data\CA_CERT.CRT.cer"
+"\epoc32\winscw\c\tx509\data\certisign.crt"-"c:\tx509\data\certisign.crt"
+"\epoc32\winscw\c\tx509\data\certisign1.crt"-"c:\tx509\data\certisign1.crt"
+"\epoc32\winscw\c\tx509\data\class1ca.crt"-"c:\tx509\data\class1ca.crt"
+"\epoc32\winscw\c\tx509\data\CLASS1_SUBSCRIBER_CA_V3.cer"-"c:\tx509\data\CLASS1_SUBSCRIBER_CA_V3.cer"
+"\epoc32\winscw\c\tx509\data\COLUMBIACAROOT.cer"-"c:\tx509\data\COLUMBIACAROOT.cer"
+"\epoc32\winscw\c\tx509\data\COMPUSOURCECA.cer"-"c:\tx509\data\COMPUSOURCECA.cer"
+"\epoc32\winscw\c\tx509\data\corrupt_first_byte.der"-"c:\tx509\data\corrupt_first_byte.der"
+"\epoc32\winscw\c\tx509\data\CROSSCERTCERT.cer"-"c:\tx509\data\CROSSCERTCERT.cer"
+"\epoc32\winscw\c\tx509\data\CSCA.cer"-"c:\tx509\data\CSCA.cer"
+"\epoc32\winscw\c\tx509\data\david1.crt"-"c:\tx509\data\david1.crt"
+"\epoc32\winscw\c\tx509\data\david_rsa.crt"-"c:\tx509\data\david_rsa.crt"
+"\epoc32\winscw\c\tx509\data\DH_USER_CERT.cer"-"c:\tx509\data\DH_USER_CERT.cer"
+"\epoc32\winscw\c\tx509\data\dk-ca.cer"-"c:\tx509\data\dk-ca.cer"
+"\epoc32\winscw\c\tx509\data\DoD_SBU_ca2.crt"-"c:\tx509\data\DoD_SBU_ca2.crt"
+"\epoc32\winscw\c\tx509\data\DoD_SBU_pca.crt"-"c:\tx509\data\DoD_SBU_pca.crt"
+"\epoc32\winscw\c\tx509\data\DoD_SBU_rich1.crt"-"c:\tx509\data\DoD_SBU_rich1.crt"
+"\epoc32\winscw\c\tx509\data\DSA-CA.cer"-"c:\tx509\data\DSA-CA.cer"
+"\epoc32\winscw\c\tx509\data\DSA-PCA.cer"-"c:\tx509\data\DSA-PCA.cer"
+"\epoc32\winscw\c\tx509\data\DUKE.cer"-"c:\tx509\data\DUKE.cer"
+"\epoc32\winscw\c\tx509\data\entropia.crt"-"c:\tx509\data\entropia.crt"
+"\epoc32\winscw\c\tx509\data\ENTRUST4.cer"-"c:\tx509\data\ENTRUST4.cer"
+"\epoc32\winscw\c\tx509\data\ENTRUST_CLIENTCGI.cer"-"c:\tx509\data\ENTRUST_CLIENTCGI.cer"
+"\epoc32\winscw\c\tx509\data\equitable.crt"-"c:\tx509\data\equitable.crt"
+"\epoc32\winscw\c\tx509\data\eurosign.crt"-"c:\tx509\data\eurosign.crt"
+"\epoc32\winscw\c\tx509\data\expired.crt"-"c:\tx509\data\expired.crt"
+"\epoc32\winscw\c\tx509\data\FF.cer"-"c:\tx509\data\FF.cer"
+"\epoc32\winscw\c\tx509\data\future.crt"-"c:\tx509\data\future.crt"
+"\epoc32\winscw\c\tx509\data\gbpca.cer"-"c:\tx509\data\gbpca.cer"
+"\epoc32\winscw\c\tx509\data\GLOBALSIGNCLASS1CA.cer"-"c:\tx509\data\GLOBALSIGNCLASS1CA.cer"
+"\epoc32\winscw\c\tx509\data\GLOBALSIGNMIKE.cer"-"c:\tx509\data\GLOBALSIGNMIKE.cer"
+"\epoc32\winscw\c\tx509\data\GLOBALSIGNPRIMARYCLASS1CA.cer"-"c:\tx509\data\GLOBALSIGNPRIMARYCLASS1CA.cer"
+"\epoc32\winscw\c\tx509\data\GLOBALSIGNROOT.cer"-"c:\tx509\data\GLOBALSIGNROOT.cer"
+"\epoc32\winscw\c\tx509\data\GOOFY_CERT.CRT"-"c:\tx509\data\GOOFY_CERT.CRT"
+"\epoc32\winscw\c\tx509\data\GTECyberTrustGlobalRoot.cer"-"c:\tx509\data\GTECyberTrustGlobalRoot.cer"
+"\epoc32\winscw\c\tx509\data\GTECyberTrustRoot.cer"-"c:\tx509\data\GTECyberTrustRoot.cer"
+"\epoc32\winscw\c\tx509\data\GTERoot.crt"-"c:\tx509\data\GTERoot.crt"
+"\epoc32\winscw\c\tx509\data\GTESS.crt"-"c:\tx509\data\GTESS.crt"
+"\epoc32\winscw\c\tx509\data\GTE_FORUM_ROOT.cer"-"c:\tx509\data\GTE_FORUM_ROOT.cer"
+"\epoc32\winscw\c\tx509\data\GTICA.crt"-"c:\tx509\data\GTICA.crt"
+"\epoc32\winscw\c\tx509\data\GTIWeb.crt"-"c:\tx509\data\GTIWeb.crt"
+"\epoc32\winscw\c\tx509\data\hbcica1.der"-"c:\tx509\data\hbcica1.der"
+"\epoc32\winscw\c\tx509\data\IBM.crt"-"c:\tx509\data\IBM.crt"
+"\epoc32\winscw\c\tx509\data\ICATPCA.cer"-"c:\tx509\data\ICATPCA.cer"
+"\epoc32\winscw\c\tx509\data\ice-ca.cer"-"c:\tx509\data\ice-ca.cer"
+"\epoc32\winscw\c\tx509\data\ICE-PCA-X509.cer"-"c:\tx509\data\ICE-PCA-X509.cer"
+"\epoc32\winscw\c\tx509\data\ICE-ROOT.cer"-"c:\tx509\data\ICE-ROOT.cer"
+"\epoc32\winscw\c\tx509\data\ice-tel-it.cer"-"c:\tx509\data\ice-tel-it.cer"
+"\epoc32\winscw\c\tx509\data\ICE-TEL_CODESIGNERSCA.cer"-"c:\tx509\data\ICE-TEL_CODESIGNERSCA.cer"
+"\epoc32\winscw\c\tx509\data\ICE-TEL_INDIVIDUALSCA.cer"-"c:\tx509\data\ICE-TEL_INDIVIDUALSCA.cer"
+"\epoc32\winscw\c\tx509\data\ICE-TEL_SERVERSCA.cer"-"c:\tx509\data\ICE-TEL_SERVERSCA.cer"
+"\epoc32\winscw\c\tx509\data\ICE-USER.cer"-"c:\tx509\data\ICE-USER.cer"
+"\epoc32\winscw\c\tx509\data\integrion.crt"-"c:\tx509\data\integrion.crt"
+"\epoc32\winscw\c\tx509\data\interclear.crt"-"c:\tx509\data\interclear.crt"
+"\epoc32\winscw\c\tx509\data\INTERCLEARROOT.cer"-"c:\tx509\data\INTERCLEARROOT.cer"
+"\epoc32\winscw\c\tx509\data\invalidCAuser1.crt"-"c:\tx509\data\invalidCAuser1.crt"
+"\epoc32\winscw\c\tx509\data\invalidCAuser2.crt"-"c:\tx509\data\invalidCAuser2.crt"
+"\epoc32\winscw\c\tx509\data\invalidConstraints.crt"-"c:\tx509\data\invalidConstraints.crt"
+"\epoc32\winscw\c\tx509\data\invalidSig.crt"-"c:\tx509\data\invalidSig.crt"
+"\epoc32\winscw\c\tx509\data\ipaddrextension.der"-"c:\tx509\data\ipaddrextension.der"
+"\epoc32\winscw\c\tx509\data\IPRA_PCA_1C.cer"-"c:\tx509\data\IPRA_PCA_1C.cer"
+"\epoc32\winscw\c\tx509\data\IPRA_PCA_21.cer"-"c:\tx509\data\IPRA_PCA_21.cer"
+"\epoc32\winscw\c\tx509\data\IPRA_PCA_22.cer"-"c:\tx509\data\IPRA_PCA_22.cer"
+"\epoc32\winscw\c\tx509\data\ipsca.crt"-"c:\tx509\data\ipsca.crt"
+"\epoc32\winscw\c\tx509\data\JOHN_HUGHES_CERT_ROOT_CERT.cer"-"c:\tx509\data\JOHN_HUGHES_CERT_ROOT_CERT.cer"
+"\epoc32\winscw\c\tx509\data\keyCompromise.crt"-"c:\tx509\data\keyCompromise.crt"
+"\epoc32\winscw\c\tx509\data\keyRevoked.crt"-"c:\tx509\data\keyRevoked.crt"
+"\epoc32\winscw\c\tx509\data\keyRevoked2.crt"-"c:\tx509\data\keyRevoked2.crt"
+"\epoc32\winscw\c\tx509\data\keywitness.crt"-"c:\tx509\data\keywitness.crt"
+"\epoc32\winscw\c\tx509\data\KeyWitnessGlobal2048Root.cer"-"c:\tx509\data\KeyWitnessGlobal2048Root.cer"
+"\epoc32\winscw\c\tx509\data\MCI.crt"-"c:\tx509\data\MCI.crt"
+"\epoc32\winscw\c\tx509\data\MICHAELWEDLIN.cer"-"c:\tx509\data\MICHAELWEDLIN.cer"
+"\epoc32\winscw\c\tx509\data\MICHAELWEDLIN2.cer"-"c:\tx509\data\MICHAELWEDLIN2.cer"
+"\epoc32\winscw\c\tx509\data\MicrosoftAuthenticode(tm)Root.cer"-"c:\tx509\data\MicrosoftAuthenticode(tm)Root.cer"
+"\epoc32\winscw\c\tx509\data\MicrosoftRootAuthority.cer"-"c:\tx509\data\MicrosoftRootAuthority.cer"
+"\epoc32\winscw\c\tx509\data\MicrosoftRootSGCAuthority.cer"-"c:\tx509\data\MicrosoftRootSGCAuthority.cer"
+"\epoc32\winscw\c\tx509\data\MicrosoftTimestampRoot.cer"-"c:\tx509\data\MicrosoftTimestampRoot.cer"
+"\epoc32\winscw\c\tx509\data\MicrosoftWindowsHardwareCompatibility.cer"-"c:\tx509\data\MicrosoftWindowsHardwareCompatibility.cer"
+"\epoc32\winscw\c\tx509\data\MIKESENTRUSTFREECERT.cer"-"c:\tx509\data\MIKESENTRUSTFREECERT.cer"
+"\epoc32\winscw\c\tx509\data\MSSGCAuthority.cer"-"c:\tx509\data\MSSGCAuthority.cer"
+"\epoc32\winscw\c\tx509\data\mustermann_1.der"-"c:\tx509\data\mustermann_1.der"
+"\epoc32\winscw\c\tx509\data\nameMismatch.crt"-"c:\tx509\data\nameMismatch.crt"
+"\epoc32\winscw\c\tx509\data\noLongerNeeded.crt"-"c:\tx509\data\noLongerNeeded.crt"
+"\epoc32\winscw\c\tx509\data\noPolicy.crt"-"c:\tx509\data\noPolicy.crt"
+"\epoc32\winscw\c\tx509\data\NORTELCA.cer"-"c:\tx509\data\NORTELCA.cer"
+"\epoc32\winscw\c\tx509\data\Novell.der"-"c:\tx509\data\Novell.der"
+"\epoc32\winscw\c\tx509\data\onHold.crt"-"c:\tx509\data\onHold.crt"
+"\epoc32\winscw\c\tx509\data\onHold2.crttx509\data\onHold2.crt"
+"\epoc32\winscw\c\tx509\data\ORG000.der"-"c:\tx509\data\ORG000.der"
+"\epoc32\winscw\c\tx509\data\pathLen.crt"-"c:\tx509\data\pathLen.crt"
+"\epoc32\winscw\c\tx509\data\PCA-CERT.cer"-"c:\tx509\data\PCA-CERT.cer"
+"\epoc32\winscw\c\tx509\data\PCALOW.cer"-"c:\tx509\data\PCALOW.cer"
+"\epoc32\winscw\c\tx509\data\PCAMID.cer"-"c:\tx509\data\PCAMID.cer"
+"\epoc32\winscw\c\tx509\data\pvt-ca-ica.crt"-"c:\tx509\data\pvt-ca-ica.crt"
+"\epoc32\winscw\c\tx509\data\results.txt"-"c:\tx509\data\results.txt"
+"\epoc32\winscw\c\tx509\data\rich1.crt"-"c:\tx509\data\rich1.crt"
+"\epoc32\winscw\c\tx509\data\rich1or1.crt"-"c:\tx509\data\rich1or1.crt"
+"\epoc32\winscw\c\tx509\data\rich1or2.crt"-"c:\tx509\data\rich1or2.crt"
+"\epoc32\winscw\c\tx509\data\rich1or3.crt"-"c:\tx509\data\rich1or3.crt"
+"\epoc32\winscw\c\tx509\data\rich_rsa.crt"-"c:\tx509\data\rich_rsa.crt"
+"\epoc32\winscw\c\tx509\data\rn_badAltName.crt"-"c:\tx509\data\rn_badAltName.crt"
+"\epoc32\winscw\c\tx509\data\rn_badPolicy.crt"-"c:\tx509\data\rn_badPolicy.crt"
+"\epoc32\winscw\c\tx509\data\rn_ca.crt"-"c:\tx509\data\rn_ca.crt"
+"\epoc32\winscw\c\tx509\data\rn_cross.crt"-"c:\tx509\data\rn_cross.crt"
+"\epoc32\winscw\c\tx509\data\rn_paa.crt"-"c:\tx509\data\rn_paa.crt"
+"\epoc32\winscw\c\tx509\data\rn_pca.crt"-"c:\tx509\data\rn_pca.crt"
+"\epoc32\winscw\c\tx509\data\rn_user1.crt"-"c:\tx509\data\rn_user1.crt"
+"\epoc32\winscw\c\tx509\data\RootAgency.cer"-"c:\tx509\data\RootAgency.cer"
+"\epoc32\winscw\c\tx509\data\RSA-CCA.cer"-"c:\x509\data\RSA-CCA.cer"
+"\epoc32\winscw\c\tx509\data\RSA-SSCA.cer"-"c:\tx509\data\RSA-SSCA.cer"
+"\epoc32\winscw\c\tx509\data\scalaire.crt"-"c:\tx509\data\scalaire.crt"
+"\epoc32\winscw\c\tx509\data\sigAlgMismatch1.crt"-"c:\tx509\data\sigAlgMismatch1.crt"
+"\epoc32\winscw\c\tx509\data\sigAlgMismatch2.crt"-"c:\tx509\data\sigAlgMismatch2.crt"
+"\epoc32\winscw\c\tx509\data\sigAlgMismatch3.crt"-"c:\tx509\data\sigAlgMismatch3.crt"
+"\epoc32\winscw\c\tx509\data\sigAlgMismatch4.crt"-"c:\tx509\data\sigAlgMismatch4.crt"
+"\epoc32\winscw\c\tx509\data\SISCERT.cer"-"c:\tx509\data\SISCERT.cer"
+"\epoc32\winscw\c\tx509\data\superseded.crt"-"c:\tx509\data\superseded.crt"
+"\epoc32\winscw\c\tx509\data\SWISSKEYCORPIDCA.cer"-"c:\tx509\data\SWISSKEYCORPIDCA.cer"
+"\epoc32\winscw\c\tx509\data\SWISSKEYROOT.cer"-"c:\tx509\data\SWISSKEYROOT.cer"
+"\epoc32\winscw\c\tx509\data\T61_1.der"-"c:\tx509\data\T61_1.der"
+"\epoc32\winscw\c\tx509\data\TeleCashSubCA.cer"-"c:\tx509\data\TeleCashSubCA.cer"
+"\epoc32\winscw\c\tx509\data\TeleCashUser.cer"-"c:\tx509\data\TeleCashUser.cer"
+"\epoc32\winscw\c\tx509\data\testca2.crt"-"c:\tx509\data\testca2.crt"
+"\epoc32\winscw\c\tx509\data\testSubCA.crt"-"c:\tx509\data\testSubCA.crt"
+"\epoc32\winscw\c\tx509\data\ThawtePersonalBasicCA.cer"-"c:\tx509\data\ThawtePersonalBasicCA.cer"
+"\epoc32\winscw\c\tx509\data\ThawtePersonalFreemailCA.cer"-"c:\tx509\data\ThawtePersonalFreemailCA.cer"
+"\epoc32\winscw\c\tx509\data\ThawtePersonalPremiumCA.cer"-"c:\tx509\data\ThawtePersonalPremiumCA.cer"
+"\epoc32\winscw\c\tx509\data\ThawtePremiumServerCA.cer"-"c:\tx509\data\ThawtePremiumServerCA.cer"
+"\epoc32\winscw\c\tx509\data\ThawteServerCA.cer"-"c:\tx509\data\ThawteServerCA.cer"
+"\epoc32\winscw\c\tx509\data\ThawteTimestampingCA.cer"-"c:\tx509\data\ThawteTimestampingCA.cer"
+"\epoc32\winscw\c\tx509\data\THAWTE_ROOT.cer"-"c:\tx509\data\THAWTE_ROOT.cer"
+"\epoc32\winscw\c\tx509\data\THAWTE_SUBCA.cer"-"c:\tx509\data\THAWTE_SUBCA.cer"
+"\epoc32\winscw\c\tx509\data\THAWTE_USER.cer"-"c:\tx509\data\THAWTE_USER.cer"
+"\epoc32\winscw\c\tx509\data\TIMCA.cer"-"c:\tx509\data\TIMCA.cer"
+"\epoc32\winscw\c\tx509\data\TJHCA.cer"-"c:\tx509\data\TJHCA.cer"
+"\epoc32\winscw\c\tx509\data\TRUSTFACTORY.cer"-"c:\tx509\data\TRUSTFACTORY.cer"
+"\epoc32\winscw\c\tx509\data\UCLCA.cer"-"c:\tx509\data\UCLCA.cer"
+"\epoc32\winscw\c\tx509\data\uptime1.crt"-"c:\tx509\data\uptime1.crt"
+"\epoc32\winscw\c\tx509\data\uptime2.crt"-"c:\tx509\data\uptime2.crt"
+"\epoc32\winscw\c\tx509\data\uptime3.crt"-"c:\tx509\data\uptime3.crt"
+"\epoc32\winscw\c\tx509\data\uptime4.crt"-"c:\tx509\data\uptime4.crt"
+"\epoc32\winscw\c\tx509\data\us_cross.crt"-"c:\tx509\data\us_cross.crt"
+"\epoc32\winscw\c\tx509\data\US_paa.crt"-"c:\tx509\data\US_paa.crt"
+"\epoc32\winscw\c\tx509\data\v1ca.crt"-"c:\tx509\data\v1ca.crt"
+"\epoc32\winscw\c\tx509\data\v1critic.crt"-"c:\tx509\data\v1critic.crt"
+"\epoc32\winscw\c\tx509\data\v1expired.crt"-"c:\tx509\data\v1expired.crt"
+"\epoc32\winscw\c\tx509\data\v1orgReleaser.crt"-"c:\tx509\data\v1orgReleaser.crt"
+"\epoc32\winscw\c\tx509\data\v1paa.crt"-"c:\tx509\data\v1paa.crt"
+"\epoc32\winscw\c\tx509\data\v1pca.crt"-"c:\tx509\data\v1pca.crt"
+"\epoc32\winscw\c\tx509\data\v1priority.crt"-"c:\tx509\data\v1priority.crt"
+"\epoc32\winscw\c\tx509\data\v1readonly.crt"-"c:\tx509\data\v1readonly.crt"
+"\epoc32\winscw\c\tx509\data\v1revoked.crt"-"c:\tx509\data\v1revoked.crt"
+"\epoc32\winscw\c\tx509\data\v1user1.crt"-"c:\tx509\data\v1user1.crt"
+"\epoc32\winscw\c\tx509\data\v1user2.crt"-"c:\tx509\data\v1user2.crt"
+"\epoc32\winscw\c\tx509\data\v1user3.crt"-"c:\tx509\data\v1user3.crt"
+"\epoc32\winscw\c\tx509\data\v1user4.crt"-"c:\tx509\data\v1user4.crt"
+"\epoc32\winscw\c\tx509\data\v1user5.crt"-"c:\tx509\data\v1user5.crt"
+"\epoc32\winscw\c\tx509\data\v1user6.crt"-"c:\tx509\data\v1user6.crt"
+"\epoc32\winscw\c\tx509\data\v1user7.crt"-"c:\tx509\data\v1user7.crt"
+"\epoc32\winscw\c\tx509\data\v1user8.crt"-"c:\tx509\data\v1user8.crt"
+"\epoc32\winscw\c\tx509\data\VAULT_REGISTRYCA_ROOT_1.cer"-"c:\tx509\data\VAULT_REGISTRYCA_ROOT_1.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass1CAIndividualSubscriberPersonaNotValidated.cer"-"c:\tx509\data\VeriSignClass1CAIndividualSubscriberPersonaNotValidated.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass1PrimaryCA.cer"-"c:\tx509\data\VeriSignClass1PrimaryCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass2CAIndividualSubscriber.cer"-"c:\tx509\data\VeriSignClass2CAIndividualSubscriber.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass2PrimaryCA.cer"-"c:\tx509\data\VeriSignClass2PrimaryCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass3PrimaryCA.cer"-"c:\tx509\data\VeriSignClass3PrimaryCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignClass4PrimaryCA.cer"-"c:\tx509\data\VeriSignClass4PrimaryCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignCommercialSoftwarePublishersCA.cer"-"c:\tx509\data\VeriSignCommercialSoftwarePublishersCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignIndividualSoftwarePublishersCA.cer"-"c:\tx509\data\VeriSignIndividualSoftwarePublishersCA.cer"
+"\epoc32\winscw\c\tx509\data\VeriSignTimeStampingCA.cer"-"c:\tx509\data\VeriSignTimeStampingCA.cer"
+"\epoc32\winscw\c\tx509\data\VSIGNSS.cer"-"c:\tx509\data\VSIGNSS.cer"
+"\epoc32\winscw\c\tx509\data\VSIGNTCA.cer"-"c:\tx509\data\VSIGNTCA.cer"
+"\epoc32\winscw\c\tx509\data\WIDE_MEMBERSONLYCA.cer"-"c:\tx509\data\WIDE_MEMBERSONLYCA.cer"
+"\epoc32\winscw\c\tx509\data\WIDE_MOCA_SSL.cer"-"c:\tx509\data\WIDE_MOCA_SSL.cer"
+"\epoc32\winscw\c\tx509\data\WIDE_ROOT.cer"-"c:\tx509\data\WIDE_ROOT.cer"
+"\epoc32\winscw\c\tx509\data\willsGlobalSign.crt"-"c:\tx509\data\willsGlobalSign.crt"
+"\epoc32\winscw\c\tx509\data\WORLDWIDEWEDLINROOT.cer"-"c:\tx509\data\WORLDWIDEWEDLINROOT.cer"
+"\epoc32\winscw\c\tx509\data\X22ca1.crt"-"c:\tx509\data\X22ca1.crt"
+"\epoc32\winscw\c\tx509\data\X22paa.crt"-"c:\tx509\data\X22paa.crt"
+"\epoc32\winscw\c\tx509\data\X22pca1.crt"-"c:\tx509\data\X22pca1.crt"
+"\epoc32\winscw\c\tx509\data\xbalt0001a.cer"-"c:\tx509\data\xbalt0001a.cer"
+"\epoc32\winscw\c\tx509\data\xbalt0001s.cer"-"c:\tx509\data\xbalt0001s.cer"
+"\epoc32\winscw\c\tx509\data\www.winterthur.be.crt"-"c:\tx509\data\www.winterthur.be.crt"
+"\epoc32\winscw\c\tx509\data\lipponen-encrypt.crt"-"c:\tx509\data\lipponen-encrypt.crt"
+"\epoc32\winscw\c\tx509\data\lipponen-sign.crt"-"c:\tx509\data\lipponen-sign.crt"
+"\epoc32\winscw\c\tx509\data\webmail.utu.fi.cer"-"c:\tx509\data\webmail.utu.fi.cer"
+
+"\epoc32\winscw\c\tx509\data\extensions\certs\absent.der"-"c:\tx509\data\extensions\certs\absent.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\empty.der"-"c:\tx509\data\extensions\certs\empty.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\simple.der"-"c:\tx509\data\extensions\certs\simple.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\multi.der"-"c:\tx509\data\extensions\certs\multi.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\longcaps.der"-"c:\tx509\data\extensions\certs\longcaps.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\empty_fields.der"-"c:\tx509\data\extensions\certs\empty_fields.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\corrupt.der"-"c:\tx509\data\extensions\certs\corrupt.der"
+"\epoc32\winscw\c\tx509\data\extensions\certs\SymbianSigned_T1.der"-"c:\tx509\data\extensions\certs\SymbianSigned_T1.der"
+
+"\epoc32\winscw\c\tx509\data\dnames\dn_email_mixed.der"-"c:\tx509\Data\dnames\dn_email_mixed.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_email_lc.der"-"c:\tx509\Data\dnames\dn_email_lc.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_printable_lc.der"-"c:\tx509\Data\dnames\dn_printable_lc.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_printable_mixed.der"-"c:\tx509\Data\dnames\dn_printable_mixed.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_utf8_lc.der"-"c:\tx509\Data\dnames\dn_utf8_lc.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_utf8_mixed.der"-"c:\tx509\Data\dnames\dn_utf8_mixed.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_unstructuredname_lc.der"-"c:\tx509\Data\dnames\dn_unstructuredname_lc.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_unstructuredname_mixed.der"-"c:\tx509\Data\dnames\dn_unstructuredname_mixed.der"
+"\epoc32\winscw\c\tx509\data\dnames\dn_unstructuredname_lc.der"-"c:\tx509\Data\dn_unstructuredname_lc.der"
+
+
+;These scripts are only included for new version of TASN1
+
+"\epoc32\winscw\c\tasn1\scripts\tasn1.ini"-"c:\tasn1\scripts\tasn1.ini"
+
+
+;tpkcs10 - Uses TEF
+
+
+"\epoc32\winscw\c\tpkcs10\scripts\tpkcs10_v2.ini"-"c:\tpkcs10\scripts\tpkcs10_v2.ini 
+
+"\epoc32\winscw\c\tpkcs10\keys\newrsa512.der"-"c:\tpkcs10\keys\newrsa512.der"
+"\epoc32\winscw\c\tpkcs10\keys\newdsa512.der"-"c:\tpkcs10\keys\newdsa512.der"
+"\epoc32\winscw\c\tpkcs10\keys\newrsa2048.der"-"c:\tpkcs10\keys\newrsa2048.der"
+"\epoc32\winscw\c\tpkcs10\keys\newdsa2048.der"-"c:\tpkcs10\keys\newdsa2048.der"
+
+; Openssl cert requests
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsasha1_512_2attr.der"-"c:\tpkcs10\requests\os_req_rsasha1_512_2attr.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsamd2_512.der"-"c:\tpkcs10\requests\os_req_rsamd2_512.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsamd5_512.der"-"c:\tpkcs10\requests\os_req_rsamd5_512.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsasha1_2048_2attr.der"-"c:\tpkcs10\requests\os_req_rsasha1_2048_2attr.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsasha1_512.der"-"c:\tpkcs10\requests\os_req_rsasha1_512.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_rsasha1_512_1attr.der"-"c:\tpkcs10\requests\os_req_rsasha1_512_1attr.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_ext_rsasha1.der"-"c:\tpkcs10\requests\os_req_ext_rsasha1.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_ext_rsamd2.der"-"c:\tpkcs10\requests\os_req_ext_rsamd2.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_ext_rsamd5.der"-"c:\tpkcs10\requests\os_req_ext_rsamd5.der"
+"\epoc32\winscw\c\tpkcs10\requests\os_req_ext_dsasha1.der"-"c:\tpkcs10\requests\os_req_ext_dsasha1.der"
+
+; Raw data for v3 x509 extensions 
+"\epoc32\winscw\c\tpkcs10\v3extensions\authorityinfoaccess.der"-"c:\tpkcs10\v3extensions\authorityinfoaccess.der"
+"\epoc32\winscw\c\tpkcs10\v3extensions\basicconstrains.der"-"c:\tpkcs10\v3extensions\basicconstrains.der"
+"\epoc32\winscw\c\tpkcs10\v3extensions\extkeyusage.der"-"c:\tpkcs10\v3extensions\extkeyusage.der"
+"\epoc32\winscw\c\tpkcs10\v3extensions\issueraltname.der"-"c:\tpkcs10\v3extensions\issueraltname.der"
+"\epoc32\winscw\c\tpkcs10\v3extensions\keyusage.der"-"c:\tpkcs10\v3extensions\keyusage.der"
+"\epoc32\winscw\c\tpkcs10\v3extensions\subjectaltname.der"-"c:\tpkcs10\v3extensions\subjectaltname.der"
+
+;tpkixcert_tef
+"\epoc32\winscw\c\tpkixcert_tef\scripts\apitests.ini"-"c:\tpkixcert_tef\scripts\apitests.ini"
+"\epoc32\winscw\c\tpkixcert_tef\scripts\validatetests.ini"-"c:\tpkixcert_tef\scripts\validatetests.ini"  
+
+"\epoc32\winscw\c\tpkixcert_tef\data\datetime_0001_endentity.der"-"c:\tpkixcert_tef\data\datetime_0001_endentity.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\datetime_0001_root.der"-"c:\tpkixcert_tef\data\datetime_0001_root.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\001_rc.der"-"c:\tpkixcert_tef\data\001_rc.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\001_im2.der"-"c:\tpkixcert_tef\data\001_im2.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\001_im1.der"-"c:\tpkixcert_tef\data\001_im1.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\001_ee.der"-"c:\tpkixcert_tef\data\001_ee.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\002_rc1.der"-"c:\tpkixcert_tef\data\002_rc1.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\002_rc2.der"-"c:\tpkixcert_tef\data\002_rc2.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\002_im2.der"-"c:\tpkixcert_tef\data\002_im2.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\002_im1.der"-"c:\tpkixcert_tef\data\002_im1.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\002_ee.der"-"c:\tpkixcert_tef\data\002_ee.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\003_rc.der"-"c:\tpkixcert_tef\data\003_rc.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\003_ee.der"-"c:\tpkixcert_tef\data\003_ee.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\004_ee.der"-"c:\tpkixcert_tef\data\004_ee.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\009_rc.der"-"c:\tpkixcert_tef\data\009_rc.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\009_ee.der"-"c:\tpkixcert_tef\data\009_ee.der"
+"\epoc32\winscw\c\tpkixcert_tef\data\fulltrust.der"-"c:\tpkixcert_tef\data\fulltrust.der"
+
+
+"\epoc32\winscw\c\unifiedcertstore2\CAW1.cer"-"c:\test_data\unifiedcertstore2\CAW1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAW2.cer"-"c:\test_data\unifiedcertstore2\CAW2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAW3.cer"-"c:\test_data\unifiedcertstore2\CAW3.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX1.cer"-"c:\test_data\unifiedcertstore2\CAX1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX2.cer"-"c:\test_data\unifiedcertstore2\CAX2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\CAX3.cer"-"c:\test_data\unifiedcertstore2\CAX3.cer"
+"\epoc32\winscw\c\unifiedcertstore2\U1K1.crt"-"c:\test_data\unifiedcertstore2\U1K1.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U2K1.crt"-"c:\test_data\unifiedcertstore2\U2K1.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U3K2.cer"-"c:\test_data\unifiedcertstore2\U3K2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\U4K3.crt"-"c:\test_data\unifiedcertstore2\U4K3.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U5K3.crt"-"c:\test_data\unifiedcertstore2\U5K3.crt"
+"\epoc32\winscw\c\unifiedcertstore2\U6K5.crt"-"c:\test_data\unifiedcertstore2\U6K5.crt"
+"\epoc32\winscw\c\unifiedcertstore2\URL1K1.cer"-"c:\test_data\unifiedcertstore2\URL1K1.cer"
+"\epoc32\winscw\c\unifiedcertstore2\URL2K2.cer"-"c:\test_data\unifiedcertstore2\URL2K2.cer"
+"\epoc32\winscw\c\unifiedcertstore2\URL3K5.cer"-"c:\test_data\unifiedcertstore2\URL3K5.cer"
+
+;"\epoc32\winscw\c\system\data\wapstore\items\wtls\CACertificates\00"-"c:\test_data\wapstore\items\wtls\CACertificates\00"
+;"\epoc32\winscw\c\system\data\wapstore\items\wtls\CACertificates\01"-"c:\test_data\wapstore\items\wtls\CACertificates\01"
+;"\epoc32\winscw\c\system\data\wapstore\items\wtls\CACertificates\02"-"c:\test_data\wapstore\items\wtls\CACertificates\02"
+
+;"\epoc32\winscw\c\system\data\certstores\test1certstore.dat"-"c:\test_data\certstores\test1certstore.dat"
+;"\epoc32\winscw\c\system\data\certstores\test2certstore.dat"-"c:\test_data\certstores\test2certstore.dat"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/crypto.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,273 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"cryptospi Tests"}, (0x101FB3E5), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"cryptospi integration test"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\key64bit.txt"-"c:\testdata\tcryptospi\data\key64bit.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\key128bit.txt"-"c:\testdata\tcryptospi\data\key128bit.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\key192bit.txt"-"c:\testdata\tcryptospi\data\key192bit.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\smallcipher64bit.txt"-"c:\testdata\tcryptospi\data\smallcipher64bit.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\smallcipher128bit.txt"-"c:\testdata\tcryptospi\data\smallcipher128bit.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\largecipher.txt"-"c:\testdata\tcryptospi\data\largecipher.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\SmallHash-SRC.dat"-"c:\testdata\tcryptospi\data\SmallHash-SRC.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\LargeHash-SRC.dat"-"c:\testdata\tcryptospi\data\LargeHash-SRC.dat"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-3bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-3bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-16bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-16bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-20bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-20bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-32bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-32bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-34bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-34bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-1000bytes-src.dat"-"c:\testdata\tcryptospi\data\symmetric-mac-1000bytes-src.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-3bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-3bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-16bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-16bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-20bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-20bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-32bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-32bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-34bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-34bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac96-1000bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-mac96-1000bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-3bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-3bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-16bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-16bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-20bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-20bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-32bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-32bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-34bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-34bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-1000bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-1000bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-key10bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-key10bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-prf128-key18bytes-mac.dat"-"c:\testdata\tcryptospi\data\symmetric-prf128-key18bytes-mac.dat"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-key.txt"-"c:\testdata\tcryptospi\data\symmetric-mac-key.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-key10.txt"-"c:\testdata\tcryptospi\data\symmetric-mac-key10.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetric-mac-key18.txt"-"c:\testdata\tcryptospi\data\symmetric-mac-key18.txt"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\128bitin.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\128bitin.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\128bitkey.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\128bitkey.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\192bitin.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\192bitin.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\192bitiv.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\192bitiv.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\192bitkey.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\192bitkey.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\64bitin.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\64bitin.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\64bitiv.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\64bitiv.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\64bitkey.txt"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\64bitkey.txt"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CBC-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CBC-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CBC-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CBC-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CTR-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-CTR-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-ECB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-ECB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-ECB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-ECB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-OFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-OFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\AES-OFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\AES-OFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CBC-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CBC-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CBC-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CBC-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CTR-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-CTR-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-ECB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-ECB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-ECB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-ECB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-OFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-OFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-OFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES3-OFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CBC-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CBC-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CBC-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CBC-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CTR-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-CTR-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-ECB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-ECB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-ECB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-ECB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-OFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-OFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\DES-OFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\DES-OFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CBC-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CBC-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CBC-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CBC-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CTR-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-CTR-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-ECB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-ECB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-ECB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-ECB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-OFB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-OFB-NOPADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-OFB-PKCS5PADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC2-OFB-PKCS5PADDING.TXT"
+"\epoc32\winscw\c\testdata\tcryptospi\data\symmetricdatacheck0001\RC4-ECB-NOPADDING.TXT"-"c:\testdata\tcryptospi\data\symmetricdatacheck0001\RC4-ECB-NOPADDING.TXT"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes128key.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes128key.ctr"
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aesplaintext.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aesplaintext.ctr"
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aesiv.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aesiv.ctr"
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes128ciphertext.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes128ciphertext.ctr"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes192key.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes192key.ctr"
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes192ciphertext.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes192ciphertext.ctr"
+
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes256key.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes256key.ctr"
+"\epoc32\winscw\c\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes256ciphertext.ctr"-"c:\testdata\tcryptospi\data\nistsp800-38atestvectors\ctr-aes256ciphertext.ctr"
+
+
+"\epoc32\winscw\c\tpbe\strong.dat"-"c:\tpbe\strong.dat"
+"\epoc32\winscw\c\tpbe\weak.dat"-"c:\tpbe\weak.dat"
+"\epoc32\winscw\c\tpbe\pkcs12-first.dat"-"c:\tpbe\pkcs12-first.dat"
+"\epoc32\winscw\c\tpbe\pkcs5-orig.dat"-"c:\tpbe\pkcs5-orig.dat"
+
+"\epoc32\winscw\c\thash\hmacmd2.dat"-"c:\thash\hmacmd2.dat"
+"\epoc32\winscw\c\thash\hmacmd5.dat"-"c:\thash\hmacmd5.dat"
+"\epoc32\winscw\c\thash\hmacmd4.dat"-"c:\thash\hmacmd4.dat"
+"\epoc32\winscw\c\thash\hmacsha1.dat"-"c:\thash\hmacsha1.dat"
+"\epoc32\winscw\c\thash\hmacsha224.dat"-"c:\thash\hmacsha224.dat"
+"\epoc32\winscw\c\thash\hmacsha256.dat"-"c:\thash\hmacsha256.dat"
+"\epoc32\winscw\c\thash\hmacsha384.dat"-"c:\thash\hmacsha384.dat"
+"\epoc32\winscw\c\thash\hmacsha512.dat"-"c:\thash\hmacsha512.dat"
+"\epoc32\winscw\c\thash\md2.dat"-"c:\thash\md2.dat"
+"\epoc32\winscw\c\thash\md5.dat"-"c:\thash\md5.dat"
+"\epoc32\winscw\c\thash\md4.dat"-"c:\thash\md4.dat"
+"\epoc32\winscw\c\thash\sha1.dat"-"c:\thash\sha1.dat"
+"\epoc32\winscw\c\thash\md4_largedata1.txt"-"c:\thash\md4_largedata1.txt"
+"\epoc32\winscw\c\thash\md4_largedata2.txt"-"c:\thash\md4_largedata2.txt"
+"\epoc32\winscw\c\thash\md4_largedata3.txt"-"c:\thash\md4_largedata3.txt"
+"\epoc32\winscw\c\thash\448bit_data.txt"-"c:\thash\448bit_data.txt"
+"\epoc32\winscw\c\thash\512bit_data.txt"-"c:\thash\512bit_data.txt"
+"\epoc32\winscw\c\thash\512bitdata_largerkey.txt"-"c:\thash\512bitdata_largerkey.txt"
+"\epoc32\winscw\c\thash\largerthanblocksizedata_key.txt"-"c:\thash\largerthanblocksizedata_key.txt"
+"\epoc32\winscw\c\thash\sha224.dat"-"c:\thash\sha224.dat"
+"\epoc32\winscw\c\thash\sha256.dat"-"c:\thash\sha256.dat"
+"\epoc32\winscw\c\thash\sha384.dat"-"c:\thash\sha384.dat"
+"\epoc32\winscw\c\thash\sha512.dat"-"c:\thash\sha512.dat"
+
+; cryptospi test scripts
+
+"\epoc32\winscw\c\tasymmetric\tasymmetrictests.script"-"c:\tasymmetric\tasymmetrictests.script1"
+"\epoc32\winscw\c\tsymmetric\tsymmetrictests.script"-"c:\tsymmetric\tsymmetrictests.script1"
+"\epoc32\winscw\c\tsymmetric\symmetricOOMtests.script"-"c:\tsymmetric\symmetricOOMtests.script1"
+"\epoc32\winscw\c\tsymmetric\AESECBVectorsScript.script"-"c:\tsymmetric\AESECBVectorsScript.script1"
+"\epoc32\winscw\c\tsymmetric\AESECB_KAT_VT.script"-"c:\tsymmetric\AESECB_KAT_VT.script1"
+"\epoc32\winscw\c\tsymmetric\AESECB_KAT_VK.script"-"c:\tsymmetric\AESECB_KAT_VK.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB128.script"-"c:\tsymmetric\AESMonteCarloEncryptECB128.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB192.script"-"c:\tsymmetric\AESMonteCarloEncryptECB192.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB256.script"-"c:\tsymmetric\AESMonteCarloEncryptECB256.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB128.script"-"c:\tsymmetric\AESMonteCarloDecryptECB128.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB192.script"-"c:\tsymmetric\AESMonteCarloDecryptECB192.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB256.script"-"c:\tsymmetric\AESMonteCarloDecryptECB256.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC128.script"-"c:\tsymmetric\AESMonteCarloEncryptCBC128.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC192A.script"-"c:\tsymmetric\AESMonteCarloEncryptCBC192A.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC192B.script"-"c:\tsymmetric\AESMonteCarloEncryptCBC192B.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC256.script"-"c:\tsymmetric\AESMonteCarloEncryptCBC256.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC128.script"-"c:\tsymmetric\AESMonteCarloDecryptCBC128.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC192.script"-"c:\tsymmetric\AESMonteCarloDecryptCBC192.script1"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC256.script"-"c:\tsymmetric\AESMonteCarloDecryptCBC256.script1"
+"\epoc32\winscw\c\tbigint\tbasicmathstests.script"-"c:\tbigint\tbasicmathstests.script1"
+"\epoc32\winscw\c\tbigint\tconstructiontests.script"-"c:\tbigint\tconstructiontests.script1"
+"\epoc32\winscw\c\tbigint\tmontgomerytests.script"-"c:\tbigint\tmontgomerytests.script1"
+"\epoc32\winscw\c\tbigint\tprimetests.script"-"c:\tbigint\tprimetests.script1"
+"\epoc32\winscw\c\tbigint\tprimetests2.script"-"c:\tbigint\tprimetests2.script1"
+"\epoc32\winscw\c\tbigint\tprimefailuretests.script"-"c:\tbigint\tprimefailuretests.script1"
+"\epoc32\winscw\c\tbigint\tprimegen.script"-"c:\tbigint\tprimegen.script1"
+"\epoc32\winscw\c\tpadding\tpadding.script"-"c:\tpadding\tpadding.script1"
+"\epoc32\winscw\c\tpbe\tpbetests_v2.script"-"c:\tpbe\tpbetests_v2.script1"
+"\epoc32\winscw\c\tpkcs5kdf\tpkcs12kdftests.script"-"c:\tpkcs12kdftests.script1"
+"\epoc32\winscw\c\testdata\tcryptospi\scripts\tcryptospi.script"-"c:\testdata\tcryptospi\scripts\tcryptospi.script"
+
+"\epoc32\winscw\c\tasymmetric\tasymmetrictests.ini"-"c:\tasymmetric\tasymmetrictests.ini"
+"\epoc32\winscw\c\tsymmetric\tsymmetrictests.ini"-"c:\tsymmetric\tsymmetrictests.ini"
+"\epoc32\winscw\c\tsymmetric\symmetricOOMtests.ini"-"c:\tsymmetric\symmetricOOMtests.ini"
+
+"\epoc32\winscw\c\tsymmetric\AESECBVectorsScript.ini"-"c:\tsymmetric\AESECBVectorsScript.ini"
+"\epoc32\winscw\c\tsymmetric\AESECB_KAT_VT.ini"-"c:\tsymmetric\AESECB_KAT_VT.ini"
+"\epoc32\winscw\c\tsymmetric\AESECB_KAT_VK.ini"-"c:\tsymmetric\AESECB_KAT_VK.ini"
+
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB128.ini"-"c:\tsymmetric\AESMonteCarloEncryptECB128.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB192.ini"-"c:\tsymmetric\AESMonteCarloEncryptECB192.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptECB256.ini"-"c:\tsymmetric\AESMonteCarloEncryptECB256.ini"
+
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB128.ini"-"c:\tsymmetric\AESMonteCarloDecryptECB128.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB192.ini"-"c:\tsymmetric\AESMonteCarloDecryptECB192.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptECB256.ini"-"c:\tsymmetric\AESMonteCarloDecryptECB256.ini"
+
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC128.ini"-"c:\tsymmetric\AESMonteCarloEncryptCBC128.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC192.ini"-"c:\tsymmetric\AESMonteCarloEncryptCBC192.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloEncryptCBC256.ini"-"c:\tsymmetric\AESMonteCarloEncryptCBC256.ini"
+
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC128.ini"-"c:\tsymmetric\AESMonteCarloDecryptCBC128.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC192.ini"-"c:\tsymmetric\AESMonteCarloDecryptCBC192.ini"
+"\epoc32\winscw\c\tsymmetric\AESMonteCarloDecryptCBC256.ini"-"c:\tsymmetric\AESMonteCarloDecryptCBC256.ini"
+"\epoc32\winscw\c\tbigint\tbasicmathstests.ini"-"c:\tbigint\tbasicmathstests.ini"
+"\epoc32\winscw\c\tbigint\tconstructiontests.ini"-"c:\tbigint\tconstructiontests.ini"
+"\epoc32\winscw\c\tbigint\tmontgomerytests.ini"-"c:\tbigint\tmontgomerytests.ini"
+"\epoc32\winscw\c\tbigint\tprimetests.ini"-"c:\tbigint\tprimetests.ini"
+"\epoc32\winscw\c\tbigint\tprimetests2.ini"-"c:\tbigint\tprimetests2.ini"
+"\epoc32\winscw\c\tbigint\tprimefailuretests.ini"-"c:\tbigint\tprimefailuretests.ini"
+"\epoc32\winscw\c\tbigint\tprimegen.ini"-"c:\tbigint\tprimegen.ini"
+"\epoc32\winscw\c\tpadding\tpadSSLv3.ini"-"c:\tpadding\tpadSSLv3.ini"
+"\epoc32\winscw\c\tpadding\tpadpkcs7.ini"-"c:\tpadding\tpadpkcs7.ini"
+"\epoc32\winscw\c\tpadding\tpaddingnone.ini"-"c:\tpadding\tpaddingnone.ini"
+"\epoc32\winscw\c\tpbe\tpbetests_v2.ini"-"c:\tpbe\tpbetests_v2.ini"
+"\epoc32\winscw\c\tpkcs5kdf\tpkcs12kdftests.ini"-"c:\tpkcs12kdftests.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherPositiveObjectLoad.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherPositiveObjectLoad.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherEncryptedDataCheck.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherEncryptedDataCheck.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherEncryptDecrypt.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherEncryptDecrypt.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecrypt.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecrypt.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptMinus1Byte.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptMinus1Byte.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptMinus3Bytes.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptMinus3Bytes.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptPlus1Byte.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptPlus1Byte.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptPlus3Bytes.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherIncrementalEncryptDecryptPlus3Bytes.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\SymmetricCipherObjectReuse.ini"-"c:\testdata\tcryptospi\configs\SymmetricCipherObjectReuse.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\symmetriccipherprocessbeforeivset.ini"-"c:\testdata\tcryptospi\configs\symmetriccipherprocessbeforeivset.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\symmetriccipherbadivlength.ini"-"c:\testdata\tcryptospi\configs\symmetriccipherbadivlength.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\symmetriccipherctrmodeoutoforder.ini"-"c:\testdata\tcryptospi\configs\symmetriccipherctrmodeoutoforder.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ASymmetricCipherPositiveObjectLoad.ini"-"c:\testdata\tcryptospi\configs\ASymmetricCipherPositiveObjectLoad.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ASymmetricCipherEncryptedDataCheck.ini"-"c:\testdata\tcryptospi\configs\ASymmetricCipherEncryptedDataCheck.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ASymmetricCipherEncryptDecrypt.ini"-"c:\testdata\tcryptospi\configs\ASymmetricCipherEncryptDecrypt.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashPositiveObjectLoad.ini"-"c:\testdata\tcryptospi\configs\HashPositiveObjectLoad.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashBasicHashOfData.ini"-"c:\testdata\tcryptospi\configs\HashBasicHashOfData.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashIncrementalHash.ini"-"c:\testdata\tcryptospi\configs\HashIncrementalHash.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashIncrementalHashWithCopy.ini"-"c:\testdata\tcryptospi\configs\HashIncrementalHashWithCopy.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashIncrementalHashWithReplicate.ini"-"c:\testdata\tcryptospi\configs\HashIncrementalHashWithReplicate.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HashIncrementalHashWithReset.ini"-"c:\testdata\tcryptospi\configs\HashIncrementalHashWithReset.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacPositiveObjectLoad.ini"-"c:\testdata\tcryptospi\configs\HmacPositiveObjectLoad.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacBasicHashOfData.ini"-"c:\testdata\tcryptospi\configs\HmacBasicHashOfData.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacIncrementalHash.ini"-"c:\testdata\tcryptospi\configs\HmacIncrementalHash.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacIncrementalHashWithCopy.ini"-"c:\testdata\tcryptospi\configs\HmacIncrementalHashWithCopy.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacIncrementalHashWithReplicate.ini"-"c:\testdata\tcryptospi\configs\HmacIncrementalHashWithReplicate.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacIncrementalHashWithReset.ini"-"c:\testdata\tcryptospi\configs\HmacIncrementalHashWithReset.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacSetKeyChecking.ini"-"c:\testdata\tcryptospi\configs\HmacSetKeyChecking.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\HmacSetOperationModeChecking.ini"-"c:\testdata\tcryptospi\configs\HmacSetOperationModeChecking.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\RandomNumberGeneratorGeneralUsage.ini"-"c:\testdata\tcryptospi\configs\RandomNumberGeneratorGeneralUsage.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\Miscellaneous.ini"-"c:\testdata\tcryptospi\configs\Miscellaneous.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\pluginload.ini"-"c:\testdata\tcryptospi\configs\pluginload.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharscommon.ini"-"c:\testdata\tcryptospi\configs\plugincharscommon.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharssymmetriccipher.ini"-"c:\testdata\tcryptospi\configs\plugincharssymmetriccipher.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsasymmetriccipher.ini"-"c:\testdata\tcryptospi\configs\plugincharsasymmetriccipher.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharshash.ini"-"c:\testdata\tcryptospi\configs\plugincharshash.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsrandom.ini"-"c:\testdata\tcryptospi\configs\plugincharsrandom.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsasymsign.ini"-"c:\testdata\tcryptospi\configs\plugincharsasymsign.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharskeyagree.ini"-"c:\testdata\tcryptospi\configs\plugincharskeyagree.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsasymkeypair.ini"-"c:\testdata\tcryptospi\configs\plugincharsasymkeypair.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsextended.ini"-"c:\testdata\tcryptospi\configs\plugincharsextended.ini"
+
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_allchars.ini"-"c:\testdata\tcryptospi\configs\ruleselection_allchars.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_interface.ini"-"c:\testdata\tcryptospi\configs\ruleselection_interface.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_ascend.ini"-"c:\testdata\tcryptospi\configs\ruleselection_ascend.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_descend.ini"-"c:\testdata\tcryptospi\configs\ruleselection_descend.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_matrix.ini"-"c:\testdata\tcryptospi\configs\ruleselection_matrix.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\ruleselection_extended.ini"-"c:\testdata\tcryptospi\configs\ruleselection_extended.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\hash_test_cases.ini"-"c:\testdata\tcryptospi\configs\hash_test_cases.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\mac_test_cases.ini"-"c:\testdata\tcryptospi\configs\mac_test_cases.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugin_chars_new_hash.ini"-"c:\testdata\tcryptospi\configs\plugin_chars_new_hash.ini"
+"\epoc32\winscw\c\testdata\tcryptospi\configs\plugincharsmac.ini"-"c:\testdata\tcryptospi\configs\plugincharsmac.ini"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/custom/postrun_custom.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,700 @@
+	<task>
+		<type>TEFTask</type>
+		<parameters>
+			<parameter name="file" value="testexecute.exe"/>
+			<parameter name="parameters" value="c:\test\tcaf\tscaf\tscaf.script1"/>
+			<parameter name="timeout" value="1000"/>
+			<parameter name="result-file" value="c:\logs\testexecute\tscaf.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+        <parameters>
+			<parameter value="tmsgapp.exe" name="file"/>
+			<parameter value="600" name="timeout"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\tmsgapp.log"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+        <parameters>
+			<parameter value="t_random.exe" name="file"/>
+			<parameter value="600" name="timeout"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\t_random.log"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tasymmetric.exe"/>
+			<parameter name="parameters" value="c:\tasymmetric\tasymmetrictests.script1 c:\logs\testexecute\tasymmetrictests.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tasymmetrictests.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\tsymmetrictests.script1 c:\logs\testexecute\tsymmetrictests.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tsymmetrictests.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESECBVectorsScript.script1 c:\logs\testexecute\AESECBVectorsScript.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESECBVectorsScript.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESECB_KAT_VT.script1 c:\logs\testexecute\AESECB_KAT_VT.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESECB_KAT_VT.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESECB_KAT_VK.script1 c:\logs\testexecute\AESECB_KAT_VK.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESECB_KAT_VK.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptECB128.script1 c:\logs\testexecute\AESMonteCarloEncryptECB128.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptECB128.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptECB192.script1 c:\logs\testexecute\AESMonteCarloEncryptECB192.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptECB192.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptECB256.script1 c:\logs\testexecute\AESMonteCarloEncryptECB256.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptECB256.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptECB128.script1 c:\logs\testexecute\AESMonteCarloDecryptECB128.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptECB128.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptECB192.script1 c:\logs\testexecute\AESMonteCarloDecryptECB192.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptECB192.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptECB256.script1 c:\logs\testexecute\AESMonteCarloDecryptECB256.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptECB256.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptCBC128.script1 c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptCBC128.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptCBC192A.script1 c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptCBC192A.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptCBC192B.script1 c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptCBC192B.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloEncryptCBC256.script1 c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloEncryptCBC256.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptCBC128.script1 c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptCBC128.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptCBC192.script1 c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptCBC192.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tsymmetric.exe"/>
+			<parameter name="parameters" value="c:\tsymmetric\AESMonteCarloDecryptCBC256.script1 c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\AESMonteCarloDecryptCBC256.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tconstructiontests.script1 c:\logs\testexecute\tconstruction.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tconstruction.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tbasicmathstests.script1 c:\logs\testexecute\tbasicmaths.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tbasicmaths.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tmontgomerytests.script1 c:\logs\testexecute\tmontgomery.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tmontgomery.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tprimetests.script1 c:\logs\testexecute\tprime.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tprime.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tprimefailuretests.script1 c:\logs\testexecute\tprimefailure.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tprimefailure.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tbigint.exe"/>
+			<parameter name="parameters" value="c:\tbigint\tprimegen.script1 c:\logs\testexecute\tprimegen.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tprimegen.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tpkcs5kdf.exe"/>
+			<parameter name="parameters" value="c:\tpkcs12kdftests.script1 c:\logs\testexecute\tpkcs12kdftests.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tpkcs12kdftests.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tpbe.exe"/>
+			<parameter name="parameters" value="c:\tpbe\tpbetests_v2.script1 c:\logs\testexecute\tpbetestsv2.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tpbetestsv2.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certapps.exe"/>
+			<parameter name="parameters" value="c:\tcertapps\scripts\script1.script1 c:\logs\testexecute\tcertapps.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertapps.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certapps.exe"/>
+			<parameter name="parameters" value="c:\tcertapps\scripts\apipolicing.script1 c:\logs\testexecute\tcertapps-apipolicing.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertapps-apipolicing.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\tkeystore.script1 c:\logs\testexecute\tkeystore.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tkeystore.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\authobjects.script1 c:\logs\testexecute\tkeystore_authobjects.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tkeystore_authobjects.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\exportscript.script1 c:\logs\testexecute\tkeystore_export.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tkeystore_export.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\reload.script1 c:\logs\testexecute\tkeystore_reload.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tkeystore_reload.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\oldserver_newfeature.script1 c:\logs\testexecute\oldserver_newfeature.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\oldserver_newfeature.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_keystore.exe"/>
+			<parameter name="parameters" value="c:\tkeystore\scripts\thwkeystore.script1 c:\logs\testexecute\thwkeystore.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\thwkeystore.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tasnpkcs.exe"/>
+			<parameter name="parameters" value="c:\tasnpkcstests.script1 c:\logs\testexecute\tasnpkcstests.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tasnpkcstests.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+        <parameters>
+			<parameter value="t_ctframework.exe" name="file"/>
+			<parameter value="600" name="timeout"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\T_CTFrameworkLog.txt"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\t_certstore_sha2.script1 c:\logs\testexecute\t_certstore_sha2.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\t_certstore_sha2.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\unifiedcertstore1-conf1.script1 c:\logs\testexecute\unifiedcertstore1-conf1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\unifiedcertstore1-conf1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\unifiedcertstore2-conf1.script1 c:\logs\testexecute\unifiedcertstore2-conf1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\unifiedcertstore2-conf1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\unifiedcertstore3-conf1.script1 c:\logs\testexecute\unifiedcertstore3-conf1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\unifiedcertstore3-conf1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\dsa.script1 c:\logs\testexecute\tcertstore-dsa.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertstore-dsa.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\reload.script1 c:\logs\testexecute\tcertstore-reload.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertstore-reload.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\apipolicing.script1 c:\logs\testexecute\tcertstore-apipolicing.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertstore-apipolicing.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\filecertstore_errors.script1 c:\logs\testexecute\tcertstore-errors.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tcertstore-errors.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\swicertstore1.script1 c:\logs\testexecute\swicertstore1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\swicertstore1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\swicertstore4.script1 c:\logs\testexecute\swicertstore4.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\swicertstore4.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\scripts\wri-swicertstore1.script1 c:\logs\testexecute\wri-swicertstore1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\wri-swicertstore1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="t_certstore.exe"/>
+			<parameter name="parameters" value="c:\tcertstore\multiple_certstore\scripts\tfilecertstore14.script1 c:\logs\testexecute\tfilecertstore14.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tfilecertstore14.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tx509.exe"/>
+			<parameter name="parameters" value="c:\TX509\SCRIPTS\TX509.script1 c:\logs\testexecute\tx509.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tx509.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tx509.exe"/>
+			<parameter name="parameters" value="c:\TX509\SCRIPTS\tx509-dnames.script1 c:\logs\testexecute\tx509-dnames.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tx509-dnames.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tx509.exe"/>
+			<parameter name="parameters" value="c:\TX509\SCRIPTS\TX509_DEV_CERTS.script1 c:\logs\testexecute\TX509_DEV_CERTS.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\TX509_DEV_CERTS.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tasn1.exe"/>
+			<parameter name="parameters" value="c:\tasn1\scripts\tasn1.script1 c:\logs\testexecute\tasn1_log.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tasn1_log.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="twtlscert.exe"/>
+			<parameter name="parameters" value="c:\twtlscert\scripts\twtlscert.script1 c:\logs\testexecute\twtlscert.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\twtlscert.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="twtlscert.exe"/>
+			<parameter name="parameters" value="c:\twtlscert\scripts\twtlscert1.script1 c:\logs\testexecute\twtlscert1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\twtlscert1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="twtlscert.exe"/>
+			<parameter name="parameters" value="c:\twtlscert\scripts\twtlscert2.script1 c:\logs\testexecute\twtlscert2.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\twtlscert2.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="twtlscert.exe"/>
+			<parameter name="parameters" value="c:\twtlscert\scripts\twtlscert3.script1 c:\logs\testexecute\twtlscert3.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\twtlscert3.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tpkixcert.exe"/>
+			<parameter name="parameters" value="c:\tpkixcert\scripts\tpkixtest_part1.script1 c:\logs\testexecute\tpkixtest1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tpkixtest1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tpkixcert.exe"/>
+			<parameter name="parameters" value="c:\tpkixcert\scripts\tpkixtest_part2.script1 c:\logs\testexecute\tpkixtest2.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\tpkixtest2.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tpkixcert.exe"/>
+			<parameter name="parameters" value="c:\tpkixcert\scripts\cancel1.script1 c:\logs\testexecute\cancel1.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\cancel1.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tocsp.exe"/>
+			<parameter name="parameters" value="c:\system\tocsp\scripts\OPENSSL.script1 c:\logs\testexecute\TOCSP_openssl.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\TOCSP_openssl.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tocsp.exe"/>
+			<parameter name="parameters" value="c:\system\tocsp\scripts\XCERT-LOCAL.script1 c:\logs\testexecute\xcert_local.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\xcert_local.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tocsp.exe"/>
+			<parameter name="parameters" value="c:\system\tocsp\scripts\OPENSSL-LOCAL.script1 c:\logs\testexecute\xcert_openssl_local.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\xcert_openssl_local.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tocsp.exe"/>
+			<parameter name="parameters" value="c:\system\tocsp\scripts\error.script1 c:\logs\testexecute\ocsp_error.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\ocsp_error.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+		<parameters>
+			<parameter name="file" value="tocsp.exe"/>
+			<parameter name="parameters" value="c:\SYSTEM\TOCSP\SCRIPTS\DefaultPolicy.script1 c:\logs\testexecute\TOCSP_DefaultPolicy.htm"/>
+			<parameter name="timeout" value="600"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\logs\testexecute\TOCSP_DefaultPolicy.htm"/>
+		</parameters>
+	</task>
+	<task>
+		<type>ExecutableTestCaseTask</type>
+        <parameters>
+			<parameter value="thash.exe" name="file"/>
+			<parameter value="2000" name="timeout"/>
+			<parameter name="parser" value="RTestResultParser" />
+			<parameter name="result-file" value="c:\hashlog.txt"/>
+		</parameters>
+	</task>
+	<task>
+		<type>FileDownloadTask</type>
+		<parameters>
+			<parameter name="src" value="c:\hashlog.txt"/>
+		</parameters>
+	</task>
+	<task>
+		<type>FileDownloadTask</type>
+		<parameters>
+			<parameter name="src" value="c:\t_random.log"/>
+		</parameters>
+	</task>
+	<task>
+		<type>FileDownloadTask</type>
+		<parameters>
+			<parameter name="src" value="c:\T_CTFrameworkLog.txt"/>
+		</parameters>
+	</task>
+	<task>
+		<type>FileDownloadTask</type>
+		<parameters>
+			<parameter name="src" value="c:\tmsgapp.log"/>
+		</parameters>
+	</task>
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/custom/prerun_custom.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,27 @@
+	<task>
+		<type>NonTestExecuteTask</type>
+        <parameters>
+			<parameter value="ced.exe" name="file"/>
+			<parameter value="-i c:\auto.cfg" name="parameters"/>
+			<parameter value="300" name="timeout"/>
+			<parameter value="true" name="ignore-exitcode"/>
+		</parameters>
+	</task>
+	<task>
+		<type>NonTestExecuteTask</type>
+        <parameters>
+			<parameter value="sntpclient.exe" name="file"/>
+			<parameter value="-savings cbtime01.symbian.intra bantime01.symbian.intra" name="parameters"/>
+			<parameter value="600" name="timeout"/>
+			<parameter value="true" name="ignore-exitcode"/>
+		</parameters>
+	</task>
+	<task>
+		<type>CreateDirTask</type>
+		<parameters>                
+			<parameter name="dir" value="c:\tswi\tbackuprestore"/>
+		</parameters>
+	</task>
+
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/filetokesn.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,787 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"Filetokens Tests"}, (0x101FB3E4), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"Filetokens integration test"
+
+
+
+"\epoc32\winscw\c\tkeystore\scripts\tkeystore.script"-"c:\tkeystore\scripts\tkeystore.script1"
+"\epoc32\winscw\c\tkeystore\scripts\cancel.script"-"c:\tkeystore\scripts\cancel.script1"
+"\epoc32\winscw\c\tkeystore\scripts\oom.script"-"c:\tkeystore\scripts\oom.script1"
+"\epoc32\winscw\c\tkeystore\scripts\servoom.script"-"c:\tkeystore\scripts\servoom.script1"
+"\epoc32\winscw\c\tkeystore\scripts\exportscript.script"-"c:\tkeystore\scripts\exportscript.script1"
+"\epoc32\winscw\c\tkeystore\scripts\authobjects.script"-"c:\tkeystore\scripts\authobjects.script1"
+"\epoc32\winscw\c\tkeystore\scripts\reload.script"-"c:\tkeystore\scripts\reload.script1"
+"\epoc32\winscw\c\tcertapps\scripts\script1.script"-"c:\tcertapps\scripts\script1.script1"
+"\epoc32\winscw\c\tcertapps\scripts\apipolicing.script"-"c:\tcertapps\scripts\apipolicing.script1"
+
+"\epoc32\winscw\c\tkeystore\scripts\tkeystore.ini"-"c:\tkeystore\scripts\tkeystore.ini"
+"\epoc32\winscw\c\tkeystore\scripts\tkeystore2.ini"-"c:\tkeystore\scripts\tkeystore2.ini"
+"\epoc32\winscw\c\tkeystore\scripts\cancel.ini"-"c:\tkeystore\scripts\cancel.ini"
+"\epoc32\winscw\c\tkeystore\scripts\oom.ini"-"c:\tkeystore\scripts\oom.ini"
+"\epoc32\winscw\c\tkeystore\scripts\servoom.ini"-"c:\tkeystore\scripts\servoom.ini"
+"\epoc32\winscw\c\tkeystore\scripts\exportscript.ini"-"c:\tkeystore\scripts\exportscript.ini"
+"\epoc32\winscw\c\tkeystore\scripts\authobjects.ini"-"c:\tkeystore\scripts\authobjects.ini"
+"\epoc32\winscw\c\tkeystore\scripts\reload.ini"-"c:\tkeystore\scripts\reload.ini"
+
+"\epoc32\winscw\c\tkeystore\data\pkcs8dh.001"-"c:\tkeystore\data\pkcs8dh.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa.001"-"c:\tkeystore\data\pkcs8rsa.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa1.001"-"c:\tkeystore\data\pkcs8rsa1.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa2.001"-"c:\tkeystore\data\pkcs8rsa2.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa3.001"-"c:\tkeystore\data\pkcs8rsa3.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa4.001"-"c:\tkeystore\data\pkcs8rsa4.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8invalidrsa.001"-"c:\tkeystore\data\pkcs8invalidrsa.001"
+
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa.001"-"c:\tkeystore\data\pkcs8dsa.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa1.001"-"c:\tkeystore\data\pkcs8dsa1.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa2.001"-"c:\tkeystore\data\pkcs8dsa2.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa3.001"-"c:\tkeystore\data\pkcs8dsa3.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa4.001"-"c:\tkeystore\data\pkcs8dsa4.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8invaliddsa.001"-"c:\tkeystore\data\pkcs8invaliddsa.001"
+
+;	PKCS8 RSA keys for ImportEncryptedKeys test
+"\epoc32\winscw\c\tkeystore\data\encryptPK8rsaDER.txt"-"c:\tkeystore\data\encryptPK8rsaDER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8rsa1DER.txt"-"c:\tkeystore\data\encryptPK8rsa1DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8rsa2DER.txt"-"c:\tkeystore\data\encryptPK8rsa2DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8rsa3DER.txt"-"c:\tkeystore\data\encryptPK8rsa3DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8rsa4DER.txt"-"c:\tkeystore\data\encryptPK8rsa4DER.txt"
+
+;	PKCS8 DSA keys for ImportEncryptedKeys test
+"\epoc32\winscw\c\tkeystore\data\encryptPK8dsaDER.txt"-"c:\tkeystore\data\encryptPK8dsaDER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8dsa1DER.txt"-"c:\tkeystore\data\encryptPK8dsa1DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8dsa2DER.txt"-"c:\tkeystore\data\encryptPK8dsa2DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8dsa3DER.txt"-"c:\tkeystore\data\encryptPK8dsa3DER.txt"
+"\epoc32\winscw\c\tkeystore\data\encryptPK8dsa4DER.txt"-"c:\tkeystore\data\encryptPK8dsa4DER.txt"
+"\epoc32\winscw\c\tkeystore\data\testvector1.bin"-"c:\tkeystore\data\testvector1.bin"
+"\epoc32\winscw\c\tkeystore\data\binarygarbage.bin"-"c:\tkeystore\data\binarygarbage.bin"
+
+; Strange Pkcs8 Encrypted keys with variou ciphers
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa1_3des.der"-"c:\tkeystore\data\pkcs8rsa1_3des.der"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa1_rc2.der"-"c:\tkeystore\data\pkcs8rsa1_rc2.der"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa1_rc4.der"-"c:\tkeystore\data\pkcs8rsa1_rc4.der"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa1_des3_nsdh.der"-"c:\tkeystore\data\pkcs8dsa1_des3_nsdh.der"
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa1_des3_nooctet.der"-"c:\tkeystore\data\pkcs8rsa1_des3_nooctet.der"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa1_des3_embed.der"-"c:\tkeystore\data\pkcs8dsa1_des3_embed.der"
+
+; PKCS8 keys with optional PKCS8 attributes
+"\epoc32\winscw\c\tkeystore\data\pkcs8rsa_attr.001"-"c:\tkeystore\data\pkcs8rsa_attr.001"
+"\epoc32\winscw\c\tkeystore\data\pkcs8dsa_attr.001"-"c:\tkeystore\data\pkcs8dsa_attr.001"
+
+;	RSA key pairs from which to build PKCS8 data
+"\epoc32\winscw\c\tkeystore\data\rsa1certkey.001"-"c:\tkeystore\data\rsa1certkey.001"
+"\epoc32\winscw\c\tkeystore\data\rsa2certkey.001"-"c:\tkeystore\data\rsa2certkey.001"
+"\epoc32\winscw\c\tkeystore\data\rsa3certkey.001"-"c:\tkeystore\data\rsa3certkey.001"
+"\epoc32\winscw\c\tkeystore\data\nrkey.001"-"c:\tkeystore\data\nrkey.001"
+"\epoc32\winscw\c\tkeystore\data\signkey2.001"-"c:\tkeystore\data\signkey2.001"
+"\epoc32\winscw\c\tkeystore\data\enciphersignkey2.001"-"c:\tkeystore\data\enciphersignkey2.001"
+
+; RSA & DSA public key to test public key export
+"\epoc32\winscw\c\tkeystore\data\rsapub.txt"-"c:\tkeystore\data\rsapub.txt"
+"\epoc32\winscw\c\tkeystore\data\rsapub1.txt"-"c:\tkeystore\data\rsapub1.txt"
+"\epoc32\winscw\c\tkeystore\data\rsapub2.txt"-"c:\tkeystore\data\rsapub2.txt"
+"\epoc32\winscw\c\tkeystore\data\rsapub3.txt"-"c:\tkeystore\data\rsapub3.txt"
+"\epoc32\winscw\c\tkeystore\data\rsapub4.txt"-"c:\tkeystore\data\rsapub4.txt"
+"\epoc32\winscw\c\tkeystore\data\dsapub.txt"-"c:\tkeystore\data\dsapub.txt"
+"\epoc32\winscw\c\tkeystore\data\dsapub1.txt"-"c:\tkeystore\data\dsapub1.txt"
+"\epoc32\winscw\c\tkeystore\data\dsapub2.txt"-"c:\tkeystore\data\dsapub2.txt"
+"\epoc32\winscw\c\tkeystore\data\dsapub3.txt"-"c:\tkeystore\data\dsapub3.txt"
+"\epoc32\winscw\c\tkeystore\data\dsapub4.txt"-"c:\tkeystore\data\dsapub4.txt"
+
+; ttesttools data
+
+"\epoc32\winscw\c\ttesttools\data\cert_addapps.txt"-"c:\ttesttools\data\cert_addapps.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_addapps1.txt"-"c:\ttesttools\data\cert_addapps1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_addappsfail1.txt"-"c:\ttesttools\data\cert_addappsfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_addappsfail2.txt"-"c:\ttesttools\data\cert_addappsfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_helpfail1.txt"-"c:\ttesttools\data\cert_helpfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_helpfail2.txt"-"c:\ttesttools\data\cert_helpfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_helpls.txt"-"c:\ttesttools\data\cert_helpls.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_import.txt"-"c:\ttesttools\data\cert_import.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_import1.txt"-"c:\ttesttools\data\cert_import1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_import2.txt"-"c:\ttesttools\data\cert_import2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_import3.txt"-"c:\ttesttools\data\cert_import3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_import4.txt"-"c:\ttesttools\data\cert_import4.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importfail1.txt"-"c:\ttesttools\data\cert_importfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importfail2.txt"-"c:\ttesttools\data\cert_importfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importfail3.txt"-"c:\ttesttools\data\cert_importfail3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importfail4.txt"-"c:\ttesttools\data\cert_importfail4.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importfail5.txt"-"c:\ttesttools\data\cert_importfail5.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_list1.txt"-"c:\ttesttools\data\cert_list1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_list2.txt"-"c:\ttesttools\data\cert_list2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_list3.txt"-"c:\ttesttools\data\cert_list3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_list4.txt"-"c:\ttesttools\data\cert_list4.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_listfail1.txt"-"c:\ttesttools\data\cert_listfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_listfail2.txt"-"c:\ttesttools\data\cert_listfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_listfail3.txt"-"c:\ttesttools\data\cert_listfail3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_ls.txt"-"c:\ttesttools\data\cert_ls.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_lsfail.txt"-"c:\ttesttools\data\cert_lsfail.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_remove1.txt"-"c:\ttesttools\data\cert_remove1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_remove2.txt"-"c:\ttesttools\data\cert_remove2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_remove3.txt"-"c:\ttesttools\data\cert_remove3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removeapps.txt"-"c:\ttesttools\data\cert_removeapps.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removeappsfail1.txt"-"c:\ttesttools\data\cert_removeappsfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removeappsfail2.txt"-"c:\ttesttools\data\cert_removeappsfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removefail.txt"-"c:\ttesttools\data\cert_removefail.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_setapps.txt"-"c:\ttesttools\data\cert_setapps.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_setapps1.txt"-"c:\ttesttools\data\cert_setapps1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_setappsfail1.txt"-"c:\ttesttools\data\cert_setappsfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_setappsfail2.txt"-"c:\ttesttools\data\cert_setappsfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\certfail.txt"-"c:\ttesttools\data\certfail.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importdeletable1.txt"-"c:\ttesttools\data\cert_importdeletable1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importdeletable2.txt"-"c:\ttesttools\data\cert_importdeletable2.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_importdeletable3.txt"-"c:\ttesttools\data\cert_importdeletable3.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removedeletable1.txt"-"c:\ttesttools\data\cert_removedeletable1.txt"
+"\epoc32\winscw\c\ttesttools\data\cert_removedeletable2.txt"-"c:\ttesttools\data\cert_removedeletable2.txt"
+"\epoc32\winscw\c\ttesttools\data\certhelp.txt"-"c:\ttesttools\data\certhelp.txt"
+
+"\epoc32\winscw\c\tkeystore\data\corrupt.001"-"c:\tkeystore\data\corrupt.001"
+"\epoc32\winscw\c\tkeystore\data\empty.001"-"c:\tkeystore\data\empty.001"
+"\epoc32\winscw\c\tcertstore\empty.cer"-"c:\tcertstore\empty.cer"
+"\epoc32\winscw\c\tcertstore\corrupt.cer"-"c:\tcertstore\corrupt.cer"
+
+"\epoc32\winscw\c\ttesttools\data\key_helpfail1.txt"-"c:\ttesttools\data\key_helpfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_helpfail2.txt"-"c:\ttesttools\data\key_helpfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_import1.txt"-"c:\ttesttools\data\key_import1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_import2.txt"-"c:\ttesttools\data\key_import2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_import3.txt"-"c:\ttesttools\data\key_import3.txt"
+"\epoc32\winscw\c\ttesttools\data\key_import4.txt"-"c:\ttesttools\data\key_import4.txt"
+"\epoc32\winscw\c\ttesttools\data\key_importfail1.txt"-"c:\ttesttools\data\key_importfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_importfail2.txt"-"c:\ttesttools\data\key_importfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_importfail3.txt"-"c:\ttesttools\data\key_importfail3.txt"
+"\epoc32\winscw\c\ttesttools\data\key_importfail4.txt"-"c:\ttesttools\data\key_importfail4.txt"
+"\epoc32\winscw\c\ttesttools\data\key_importfail5.txt"-"c:\ttesttools\data\key_importfail5.txt"
+"\epoc32\winscw\c\ttesttools\data\key_list1.txt"-"c:\ttesttools\data\key_list1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_list2.txt"-"c:\ttesttools\data\key_list2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_list3.txt"-"c:\ttesttools\data\key_list3.txt"
+"\epoc32\winscw\c\ttesttools\data\key_listfail1.txt"-"c:\ttesttools\data\key_listfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_listfail2.txt"-"c:\ttesttools\data\key_listfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_ls.txt"-"c:\ttesttools\data\key_ls.txt"
+"\epoc32\winscw\c\ttesttools\data\key_remove.txt"-"c:\ttesttools\data\key_remove.txt"
+"\epoc32\winscw\c\ttesttools\data\key_remove1.txt"-"c:\ttesttools\data\key_remove1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_removefail.txt"-"c:\ttesttools\data\key_removefail.txt"
+"\epoc32\winscw\c\ttesttools\data\key_removeuser.txt"-"c:\ttesttools\data\key_removeuser.txt"
+"\epoc32\winscw\c\ttesttools\data\key_removeuserfail1.txt"-"c:\ttesttools\data\key_removeuserfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_removeuserfail2.txt"-"c:\ttesttools\data\key_removeuserfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setalluser.txt"-"c:\ttesttools\data\key_setalluser.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setalluserfail1.txt"-"c:\ttesttools\data\key_setalluserfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setalluserfail2.txt"-"c:\ttesttools\data\key_setalluserfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setmanager.txt"-"c:\ttesttools\data\key_setmanager.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setmanagerfail1.txt"-"c:\ttesttools\data\key_setmanagerfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setmanagerfail2.txt"-"c:\ttesttools\data\key_setmanagerfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setuser.txt"-"c:\ttesttools\data\key_setuser.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setuserfail1.txt"-"c:\ttesttools\data\key_setuserfail1.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setuserfail2.txt"-"c:\ttesttools\data\key_setuserfail2.txt"
+"\epoc32\winscw\c\ttesttools\data\key_setuserhelp.txt"-"c:\ttesttools\data\key_setuserhelp.txt"
+"\epoc32\winscw\c\ttesttools\data\keyfail.txt"-"c:\ttesttools\data\keyfail.txt"
+"\epoc32\winscw\c\ttesttools\data\keyhelp.txt"-"c:\ttesttools\data\keyhelp.txt"
+"\epoc32\winscw\c\ttesttools\data\certclients.dat"-"c:\ttesttools\data\certclients.dat"
+
+"\epoc32\winscw\c\ttesttools\scripts\sec-filetokens-tools.script"-"c:\ttesttools\scripts\sec-filetokens-tools.script"
+"\epoc32\winscw\c\ttesttools\scripts\sec-filetokens-tools.ini"-"c:\ttesttools\scripts\sec-filetokens-tools.ini"
+"\epoc32\winscw\c\tcertapps\scripts\script1.ini"-"c:\tcertapps\scripts\script1.ini"
+"\epoc32\winscw\c\tcertapps\scripts\apipolicing.ini"-"c:\tcertapps\scripts\apipolicing.ini"
+
+;#if defined SDP_ROM1
+;//Nothing is included
+;#else
+ 
+;// The below test data needed for sec-filetokens-tools.script which will run only in normal image(testsecurity_sdp.bat)
+;"\epoc32\winscw\c\tcertstore\ent-wtls.cer"-"c:\tcertstore\ent-wtls.cer"
+;"\epoc32\winscw\c\tcertstore\ent-wtls1.cer"-"c:\tcertstore\ent-wtls1.cer"
+;"\epoc32\winscw\c\tcertstore\ent-wtls2.cer"-"c:\tcertstore\ent-wtls2.cer"
+;"\epoc32\winscw\c\tcertstore\thawteserverca.cer"-"c:\tcertstore\thawteserverca.cer"
+;"\epoc32\winscw\c\tcertstore\veriSignclass1primaryca.cer"-"c:\tcertstore\veriSignclass1primaryca.cer"
+
+;// DSA private key and certificate for certstore tests
+;"\epoc32\winscw\c\tcertstore\data\pkcs8dsa1.001"-"c:\tcertstore\data\pkcs8dsa1.001"
+;"\epoc32\winscw\c\tcertstore\data\cert_dsa1.der"-"c:\tcertstore\data\cert_dsa1.der"
+;"\epoc32\winscw\c\system\data\test1certstore.dat"-"c:\system\data\test1certstore.dat"
+;"\epoc32\winscw\c\system\data\test2certstore.dat"-"c:\system\data\test2certstore.dat"
+
+// Test keystore. Contains two keys, a DSA key (label gm0) and a RSA key (label gm1)
+// The passphrase timeout is set to 30
+"\epoc32\data\z\private\101F72A6\keys.dat"-"c:\private\101F72A6\keys.dat"
+;#endif // SDP_ROM1
+
+
+"\epoc32\winscw\c\tpkcs7\tpkcs7_v2.script"-"c:\tpkcs7\tpkcs7_v2.script"
+"\epoc32\winscw\c\tpkcs7\tpkcs7_v2.ini"-"c:\tpkcs7\tpkcs7_v2.ini"
+
+
+"\epoc32\winscw\c\tpkcs7\tcms.script"-"c:\tpkcs7\tcms.script"              
+"\epoc32\winscw\c\tpkcs7\tcms.ini"-"c:\tpkcs7\tcms.ini"
+"\epoc32\winscw\c\tpkcs7\tinteg_cms.script"-"c:\tpkcs7\tinteg_cms.script"            
+"\epoc32\winscw\c\tpkcs7\tinteg_cms.ini"-"c:\tpkcs7\tinteg_cms.ini"
+
+
+"\epoc32\winscw\c\tpkcs7\data\corrupt1"-"c:\tpkcs7\data\corrupt1"
+"\epoc32\winscw\c\tpkcs7\data\corrupt2"-"c:\tpkcs7\data\corrupt2"
+"\epoc32\winscw\c\tpkcs7\data\corrupt3"-"c:\tpkcs7\data\corrupt3"
+"\epoc32\winscw\c\tpkcs7\data\corrupt4"-"c:\tpkcs7\data\corrupt4"
+"\epoc32\winscw\c\tpkcs7\data\expired1"-"c:\tpkcs7\data\expired1"
+"\epoc32\winscw\c\tpkcs7\data\noroot1"-"c:\tpkcs7\data\noroot1"
+"\epoc32\winscw\c\tpkcs7\data\valid1"-"c:\tpkcs7\data\valid1"
+"\epoc32\winscw\c\tpkcs7\data\valid2"-"c:\tpkcs7\data\valid2"
+"\epoc32\winscw\c\tpkcs7\data\valid3"-"c:\tpkcs7\data\valid3"
+"\epoc32\winscw\c\tpkcs7\data\rootcertificate"-"c:\tpkcs7\data\rootcertificate"
+
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_encrypteddata_corrupt2"-"c:\tpkcs7\data\pkcs7_encrypteddata_corrupt2"         
+"\epoc32\winscw\c\tpkcs7\data\empty"-"c:\tpkcs7\data\empty"
+"\epoc32\winscw\c\tpkcs7\data\sha1anddes-cbc"-"c:\tpkcs7\data\sha1anddes-cbc"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc4.der"-"c:\tpkcs7\data\sha1and128bitrc4.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc4_encryptedcontent.der"-"c:\tpkcs7\data\sha1and128bitrc4_encryptedcontent.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc4_salt.der"-"c:\tpkcs7\data\sha1and128bitrc4_salt.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc4.der"-"c:\tpkcs7\data\sha1and40bitrc4.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc4_encryptedcontent.der"-"c:\tpkcs7\data\sha1and40bitrc4_encryptedcontent.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc4_salt.der"-"c:\tpkcs7\data\sha1and40bitrc4_salt.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc2.der"-"c:\tpkcs7\data\sha1and128bitrc2.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc2_encryptedcontent.der"-"c:\tpkcs7\data\sha1and128bitrc2_encryptedcontent.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and128bitrc2_salt.der"-"c:\tpkcs7\data\sha1and128bitrc2_salt.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and3_keytripledes_cbc.der"-"c:\tpkcs7\data\sha1and3_keytripledes_cbc.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and3_keytripledes_cbc_encryptedcontent.der"-"c:\tpkcs7\data\sha1and3_keytripledes_cbc_encryptedcontent.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and3_keytripledes_cbc_salt.der"-"c:\tpkcs7\data\sha1and3_keytripledes_cbc_salt.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc2_cbc.der"-"c:\tpkcs7\data\sha1and40bitrc2_cbc.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc2_cbc_encryptedcontent.der"-"c:\tpkcs7\data\sha1and40bitrc2_cbc_encryptedcontent.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and40bitrc2_cbc_salt.der"-"c:\tpkcs7\data\sha1and40bitrc2_cbc_salt.der"
+"\epoc32\winscw\c\tpkcs7\data\notencrypteddata.der"-"c:\tpkcs7\data\notencrypteddata.der"
+"\epoc32\winscw\c\tpkcs7\data\sha1and2_keytripledes.der"-"c:\tpkcs7\data\sha1and2_keytripledes.der"	                        
+"\epoc32\winscw\c\tpkcs7\data\sha1and2_keytripledes_encryptedcontent.der"-"c:\tpkcs7\data\sha1and2_keytripledes_encryptedcontent.der"            
+"\epoc32\winscw\c\tpkcs7\data\sha1and2_keytripledes_salt.der"-"c:\tpkcs7\data\sha1and2_keytripledes_salt.der"	            
+"\epoc32\winscw\c\tpkcs7\data\encrypteddata_withoutsalt.der"-"c:\tpkcs7\data\encrypteddata_withoutsalt.der"
+"\epoc32\winscw\c\tpkcs7\data\encrypteddata_withoutsalt_content.der"-"c:\tpkcs7\data\encrypteddata_withoutsalt_content.der"
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_encryptedneg_version.der"-"c:\tpkcs7\data\pkcs7_encryptedneg_version.der"
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_encryptedneg_contentType.der"-"c:\tpkcs7\data\pkcs7_encryptedneg_contentType.der"
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_encryptedneg_nocontsalt.der"-"c:\tpkcs7\data\pkcs7_encryptedneg_nocontsalt.der"
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_encryptedneg_noencryptedcon.der"-"c:\tpkcs7\data\pkcs7_encryptedneg_noencryptedcon.der"
+"\epoc32\winscw\c\tpkcs7\data\encrypteddata_versiontag.der"-"c:\tpkcs7\data\encrypteddata_versiontag.der"
+
+
+"\epoc32\winscw\c\tpkcs7\data\digest_sha1.der"-"c:\tpkcs7\data\digest_sha1.der"
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_sha1.der"-"c:\tpkcs7\data\digestinfo_sha1.der"                     
+"\epoc32\winscw\c\tpkcs7\data\pkcs7_digest_md5alg.der"-"c:\tpkcs7\data\pkcs7_digest_md5alg.der"
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_md5alg.der"-"c:\tpkcs7\data\digestinfo_md5alg.der"
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_negalgtag.der"-"c:\tpkcs7\data\digestinfo_negalgtag.der"	
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_digest_notoctetstring.der"-"c:\tpkcs7\data\digestinfo_digest_notoctetstring.der"
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_nodigest.der"-"c:\tpkcs7\data\digestinfo_nodigest.der"              
+"\epoc32\winscw\c\tpkcs7\data\digestinfo_unsupportedalg.der"-"c:\tpkcs7\data\digestinfo_unsupportedalg.der"
+
+
+
+;CMS test;
+"\epoc32\winscw\c\tpkcs7\cms\data\datacontent.txt"-"c:\tpkcs7\cms\data\datacontent.txt"
+"\epoc32\winscw\c\tpkcs7\cms\data\ca.der"-"c:\tpkcs7\cms\data\ca.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_add_rsa_cert_is.der"-"c:\tpkcs7\cms\data\cms_add_rsa_cert_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\attributecert.der"-"c:\tpkcs7\cms\data\attributecert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\corruptattributecert.der"-"c:\tpkcs7\cms\data\corruptattributecert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\corruptattributecert_noseq.der"-"c:\tpkcs7\cms\data\corruptattributecert_noseq.der"
+
+;CMS test by integration test
+"\epoc32\winscw\c\tpkcs7\cms\data\int_ca.der"-"c:\tpkcs7\cms\data\int_ca.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_1_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_1_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_2_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_2_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_2_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_2_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_3_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_3_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_cert_3_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_cert_3_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_1_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_1_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_2_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_2_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_2_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_2_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_3_is.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_3_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_dsa_key_3_ki.der"-"c:\tpkcs7\cms\data\int_cms_dsa_key_3_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_1_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_1_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_2_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_2_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_2_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_2_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_3_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_3_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_cert_3_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_cert_3_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_1_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_1_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_2_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_2_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_2_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_2_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_3_is.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_3_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_cms_rsa_key_3_ki.der"-"c:\tpkcs7\cms\data\int_cms_rsa_key_3_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_datacontent.txt"-"c:\tpkcs7\cms\data\int_datacontent.txt"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_dsa_2_attributeCert.der"-"c:\tpkcs7\cms\data\int_dsa_2_attributeCert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_dsa_3_attributeCert.der"-"c:\tpkcs7\cms\data\int_dsa_3_attributeCert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_dsa_attributeCert.der"-"c:\tpkcs7\cms\data\int_dsa_attributeCert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_large_data.txt"-"c:\tpkcs7\cms\data\int_large_data.txt"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_rsa_2_attributeCert.der"-"c:\tpkcs7\cms\data\int_rsa_2_attributeCert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_rsa_3_attributecert.der"-"c:\tpkcs7\cms\data\int_rsa_3_attributecert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_rsa_attributeCert.der"-"c:\tpkcs7\cms\data\int_rsa_attributeCert.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\int_small_data.txt"-"c:\tpkcs7\cms\data\int_small_data.txt"
+
+
+
+;CMS Test Certificates and key					
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_rsa_cert_1_ki.der"-"c:\tpkcs7\cms\data\cms_rsa_cert_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_rsa_key_1_ki.der"-"c:\tpkcs7\cms\data\cms_rsa_key_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_rsa_cert_1_is.der"-"c:\tpkcs7\cms\data\cms_rsa_cert_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_rsa_key_1_is.der"-"c:\tpkcs7\cms\data\cms_rsa_key_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_dsa_cert_1_ki.der"-"c:\tpkcs7\cms\data\cms_dsa_cert_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_dsa_key_1_ki.der"-"c:\tpkcs7\cms\data\cms_dsa_key_1_ki.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_dsa_cert_1_is.der"-"c:\tpkcs7\cms\data\cms_dsa_cert_1_is.der"
+"\epoc32\winscw\c\tpkcs7\cms\data\cms_dsa_key_1_is.der"-"c:\tpkcs7\cms\data\cms_dsa_key_1_is.der"
+
+;CMS expected signed data result
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_is.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_sha1_ki.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_sha1_is.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_md2_ki.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_md2_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_md2_ki.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_md2_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_md2_is.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_md2_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_md2_is.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_md2_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_md5_is.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_md5_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_md5_is.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_md5_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_md5_ki.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_md5_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_rsa_md5_ki.der"-"c:\tpkcs7\cms\results\cms_1_detached_rsa_md5_ki.der"
+
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_dsa_ki.der"-"c:\tpkcs7\cms\results\cms_1_attached_dsa_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_dsa_ki.der"-"c:\tpkcs7\cms\results\cms_1_detached_dsa_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_dsa_is.der"-"c:\tpkcs7\cms\results\cms_1_attached_dsa_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_detached_dsa_is.der"-"c:\tpkcs7\cms\results\cms_1_detached_dsa_is.der"
+
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_multi_2_attached_rsaki_dsais.der"-"c:\tpkcs7\cms\results\cms_multi_2_attached_rsaki_dsais.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_multi_2_attached_dsais_rsaki.der"-"c:\tpkcs7\cms\results\cms_multi_2_attached_dsais_rsaki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_multi_2_attached_rsakimd5_dsais.der"-"c:\tpkcs7\cms\results\cms_multi_2_attached_rsakimd5_dsais.der"
+
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_nocert.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_nocert.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_nosignerinfo.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_nosignerinfo.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_multi_2_attached_rsakimd5_dsais_addcert.der"-"c:\tpkcs7\cms\results\cms_multi_2_attached_rsakimd5_dsais_addcert.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_signature.der"-"c:\tpkcs7\cms\results\cms_corrupt_signature.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_excerttag.der"-"c:\tpkcs7\cms\results\cms_corrupt_excerttag.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_certsettag.der"-"c:\tpkcs7\cms\results\cms_corrupt_certsettag.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_signinfoversion.der"-"c:\tpkcs7\cms\results\cms_corrupt_signinfoversion.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_signdataversion.der"-"c:\tpkcs7\cms\results\cms_corrupt_signdataversion.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_datacontent.der"-"c:\tpkcs7\cms\results\cms_corrupt_datacontent.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_encapcontentoid.der"-"c:\tpkcs7\cms\results\cms_corrupt_encapcontentoid.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_encapcontent_tag_1.der"-"c:\tpkcs7\cms\results\cms_corrupt_encapcontent_tag_1.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_encapcontent_tag_2.der"-"c:\tpkcs7\cms\results\cms_corrupt_encapcontent_tag_2.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_contentoid.der"-"c:\tpkcs7\cms\results\cms_corrupt_contentoid.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_content_tag_1.der"-"c:\tpkcs7\cms\results\cms_corrupt_content_tag_1.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_algorithmoid.der"-"c:\tpkcs7\cms\results\cms_corrupt_algorithmoid.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_KI_attributecert.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_KI_attributecert.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_block.der"-"c:\tpkcs7\cms\results\cms_corrupt_block.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_unsignedattributes.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_unsignedattributes.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_attributes.der"-"c:\tpkcs7\cms\results\cms_1_attached_rsa_sha1_ki_attributes.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_corrupt_length.der"-"c:\tpkcs7\cms\results\cms_corrupt_length.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_data.der"-"c:\tpkcs7\cms\results\cms_data.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_data_corrupt_tag.der"-"c:\tpkcs7\cms\results\cms_data_corrupt_tag.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cms_data_corrupt_class.der"-"c:\tpkcs7\cms\results\cms_data_corrupt_class.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cmsdigestdata.der"-"c:\tpkcs7\cms\results\cmsdigestdata.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cmsenvelopeddata.der"-"c:\tpkcs7\cms\results\cmsenvelopeddata.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cmsencryteddata.der"-"c:\tpkcs7\cms\results\cmsencryteddata.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\cmsauthdata.der"-"c:\tpkcs7\cms\results\cmsauthdata.der"
+
+
+
+;CMS Integ expected signed data result
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md2_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md2_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md2md5sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md2md5sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_12rsa_3dsa_certdetach_md2md5sha1_1ki_23is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_12rsa_3dsa_certdetach_md2md5sha1_1ki_23is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md5_13ki_2is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certattach_md5_13ki_2is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1_is_x509.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1_is_x509.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1md2md5_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_3rsa_certdetach_sha1md2md5_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certattach_rsa_md5_is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certattach_rsa_md5_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certattach_rsa_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certattach_rsa_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_dsa_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_rsa_md2_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_rsa_md2_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_rsa_sha1_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_dataattached_certdetach_rsa_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_12rsa_3_dsa_certdetach_sha1_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_12rsa_3_dsa_certdetach_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_12rsa_3dsa_certdetach_1md2_2md5_3sha1_1ki_23is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_12rsa_3dsa_certdetach_1md2_2md5_3sha1_1ki_23is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3dsa_certattach_3sha1_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3dsa_certattach_3sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3dsa_certdetach_sha1_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3dsa_certdetach_sha1_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_12sha1_3md5_1ki_23is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_12sha1_3md5_1ki_23is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_3md2_12ki_3is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_3md2_12ki_3is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_sha1_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certattach_sha1_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certdattach_md5_13ki_2is_.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certdattach_md5_13ki_2is_.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certdetach_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_3rsa_certdetach_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_certattach_rsa_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_certattach_rsa_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_certdetach_rsa_md2_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_certdetach_rsa_md2_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certattach_sha1_is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certattach_sha1_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certattach_sha1_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certattach_sha1_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certdetach_sha1_ki.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certdetach_sha1_ki.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certdetach_sha1_ki_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_dsa_certdetach_sha1_ki_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_rsa_certattach_md5_is.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_rsa_certattach_md5_is.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_datadetached_rsa_certdetach_sha1_is_attribute.der"-"c:\tpkcs7\cms\results\int_cms_1_datadetached_rsa_certdetach_sha1_is_attribute.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_digested.der"-"c:\tpkcs7\cms\results\int_cms_1_digested.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_enveloped.der"-"c:\tpkcs7\cms\results\int_cms_1_enveloped.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_plain_data.der"-"c:\tpkcs7\cms\results\int_cms_1_plain_data.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_signed_and_enveloped_data.der"-"c:\tpkcs7\cms\results\int_cms_1_signed_and_enveloped_data.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_invalid_attr_cert_value_2.der"-"c:\tpkcs7\cms\results\int_cms_invalid_attr_cert_value_2.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_small_data.der"-"c:\tpkcs7\cms\results\int_small_data.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_large_data.der"-"c:\tpkcs7\cms\results\int_large_data.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_encrypted.der"-"c:\tpkcs7\cms\results\int_cms_1_encrypted.der"
+"\epoc32\WINSCW\C\tpkcs7\cms\results\int_cms_1_authenticated_data.der"-"c:\tpkcs7\cms\results\int_cms_1_authenticated_data.der"
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\tpkcs12lib.script"-"c:\tpkcs12intg\data\tpkcs12lib.script"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\im001.ini"-"c:\tpkcs12intg\data\ini\im001.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\im002.ini"-"c:\tpkcs12intg\data\ini\im002.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm001.ini"-"c:\tpkcs12intg\data\ini\pm001.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm002.ini"-"c:\tpkcs12intg\data\ini\pm002.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm003.ini"-"c:\tpkcs12intg\data\ini\pm003.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm004.ini"-"c:\tpkcs12intg\data\ini\pm004.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm005.ini"-"c:\tpkcs12intg\data\ini\pm005.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm006.ini"-"c:\tpkcs12intg\data\ini\pm006.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm007.ini"-"c:\tpkcs12intg\data\ini\pm007.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm008.ini"-"c:\tpkcs12intg\data\ini\pm008.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm009.ini"-"c:\tpkcs12intg\data\ini\pm009.ini" 
+
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pm010.ini"-"c:\tpkcs12intg\data\ini\pm010.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\ci001.ini"-"c:\tpkcs12intg\data\ini\ci001.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\ci002.ini"-"c:\tpkcs12intg\data\ini\ci002.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\sb001.ini"-"c:\tpkcs12intg\data\ini\sb001.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\sb002.ini"-"c:\tpkcs12intg\data\ini\sb002.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\sb003.ini"-"c:\tpkcs12intg\data\ini\sb003.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb001.ini"-"c:\tpkcs12intg\data\ini\cb001.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb002.ini"-"c:\tpkcs12intg\data\ini\cb002.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb003.ini"-"c:\tpkcs12intg\data\ini\cb003.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb004.ini"-"c:\tpkcs12intg\data\ini\cb004.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb005.ini"-"c:\tpkcs12intg\data\ini\cb005.ini" 
+"\epoc32\winscw\c\tpkcs12intg\data\ini\cb006.ini"-"c:\tpkcs12intg\data\ini\cb006.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\ct001.ini"-"c:\tpkcs12intg\data\ini\ct001.ini"
+
+
+
+; Negative Tests
+"\epoc32\winscw\c\tpkcs12intg\data\ini\iv001.ini"-"c:\tpkcs12intg\data\ini\iv001.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\changetag.ini"-"c:\tpkcs12intg\data\ini\changetag.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\attributevaluechanged.ini"-"c:\tpkcs12intg\data\ini\attributevaluechanged.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptbagalgid.ini"-"c:\tpkcs12intg\data\ini\corruptbagalgid.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptdigestalg_case1.ini"-"c:\tpkcs12intg\data\ini\corruptdigestalg_case1.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptdigestalg_case2.ini"-"c:\tpkcs12intg\data\ini\corruptdigestalg_case2.ini"
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedalgid.ini"-"c:\tpkcs12intg\data\ini\corruptedalgid.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedshroudedval.ini"-"c:\tpkcs12intg\data\ini\corruptedshroudedval.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedversion.ini"-"c:\tpkcs12intg\data\ini\corruptedversion.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\digestcorrupted.ini"-"c:\tpkcs12intg\data\ini\digestcorrupted.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\emptycontentinfo.ini"-"c:\tpkcs12intg\data\ini\emptycontentinfo.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\emptydigest.ini"-"c:\tpkcs12intg\data\ini\emptydigest.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\encryptedcontentabsent.ini"-"c:\tpkcs12intg\data\ini\encryptedcontentabsent.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\encrypteddataabsent.ini"-"c:\tpkcs12intg\data\ini\encrypteddataabsent.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\contentinfotypeunsupported.ini"-"c:\tpkcs12intg\data\ini\contentinfotypeunsupported.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedencryptedconiteration_case1.ini"-"c:\tpkcs12intg\data\ini\corruptedencryptedconiteration_case1.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedencryptedconiteration_case2.ini"-"c:\tpkcs12intg\data\ini\corruptedencryptedconiteration_case2.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedencryptedcontent.ini"-"c:\tpkcs12intg\data\ini\corruptedencryptedcontent.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedencryptedconversion.ini"-"c:\tpkcs12intg\data\ini\corruptedencryptedconversion.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedshroudediteration_case1.ini"-"c:\tpkcs12intg\data\ini\corruptedshroudediteration_case1.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\corruptedshroudediteration_case2.ini"-"c:\tpkcs12intg\data\ini\corruptedshroudediteration_case2.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\encrypteddatasaltcorrupted.ini"-"c:\tpkcs12intg\data\ini\encrypteddatasaltcorrupted.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\encryptedusingdifferentalg.ini"-"c:\tpkcs12intg\data\ini\encryptedusingdifferentalg.ini"	
+
+"\epoc32\winscw\c\tpkcs12intg\data\ini\authsafe_contentnotoctetstring.ini"-"c:\tpkcs12intg\data\ini\authsafe_contentnotoctetstring.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\authsafe_contentnotsequence.ini"-"c:\tpkcs12intg\data\ini\authsafe_contentnotsequence.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\authsafe_notasequence.ini"-"c:\tpkcs12intg\data\ini\authsafe_notasequence.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\authsafe_oidnotoctetstring.ini"-"c:\tpkcs12intg\data\ini\authsafe_oidnotoctetstring.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\digestalgorithmnotasequence.ini"-"c:\tpkcs12intg\data\ini\digestalgorithmnotasequence.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macdata_iterationnotinteger.ini"-"c:\tpkcs12intg\data\ini\macdata_iterationnotinteger.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macdata_negiteration.ini"-"c:\tpkcs12intg\data\ini\macdata_negiteration.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macdata_nosalt_noiteration.ini"-"c:\tpkcs12intg\data\ini\macdata_nosalt_noiteration.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macdatanotasequence.ini"-"c:\tpkcs12intg\data\ini\macdatanotasequence.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macdataverifyintegritydigestalgnotsha1.ini"-"c:\tpkcs12intg\data\ini\macdataverifyintegritydigestalgnotsha1.ini"	
+"\epoc32\winscw\c\tpkcs12intg\data\ini\macsaltnotasequence.ini"-"c:\tpkcs12intg\data\ini\macsaltnotasequence.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pfx_missingcontents1.ini"-"c:\tpkcs12intg\data\ini\pfx_missingcontents1.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\pfx_notasequence.ini"-"c:\tpkcs12intg\data\ini\pfx_notasequence.ini"				
+"\epoc32\winscw\c\tpkcs12intg\data\ini\version_notinteger.ini"-"c:\tpkcs12intg\data\ini\version_notinteger.ini"				
+"\epoc32\winscw\c\tpkcs12intg\data\ini\digestinfonotasequence.ini"-"c:\tpkcs12intg\data\ini\digestinfonotasequence.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\unsupported_contenttype.ini"-"c:\tpkcs12intg\data\ini\unsupported_contenttype.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\certbag_notasequence.ini"-"c:\tpkcs12intg\data\ini\certbag_notasequence.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\certbag_oidnotoctetstring.ini"-"c:\tpkcs12intg\data\ini\certbag_oidnotoctetstring.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\certbag_explicittagchanged.ini"-"c:\tpkcs12intg\data\ini\certbag_explicittagchanged.ini"		
+"\epoc32\winscw\c\tpkcs12intg\data\ini\certbag_notoctetstring.ini"-"c:\tpkcs12intg\data\ini\certbag_notoctetstring.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\bagattributenotaseq.ini"-"c:\tpkcs12intg\data\ini\bagattributenotaseq.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\bagattributeoid_notoctet.ini"-"c:\tpkcs12intg\data\ini\bagattributeoid_notoctet.ini"			
+"\epoc32\winscw\c\tpkcs12intg\data\ini\bagattributeval_notset.ini"-"c:\tpkcs12intg\data\ini\bagattributeval_notset.ini"			
+;//OOMTest
+"\epoc32\winscw\c\tpkcs12intg\data\ini\oomtest.ini"-"c:\tpkcs12intg\data\ini\oomtest.ini"		
+
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_im001.p12"-"c:\tpkcs12intg\data\pkcs12_im001.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_im002.p12"-"c:\tpkcs12intg\data\pkcs12_im002.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm001.p12"-"c:\tpkcs12intg\data\pkcs12_pm001.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm002.p12"-"c:\tpkcs12intg\data\pkcs12_pm002.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm003.p12"-"c:\tpkcs12intg\data\pkcs12_pm003.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm004.p12"-"c:\tpkcs12intg\data\pkcs12_pm004.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm005.p12"-"c:\tpkcs12intg\data\pkcs12_pm005.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm006.p12"-"c:\tpkcs12intg\data\pkcs12_pm006.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm007.p12"-"c:\tpkcs12intg\data\pkcs12_pm007.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm008.p12"-"c:\tpkcs12intg\data\pkcs12_pm008.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm009.p12"-"c:\tpkcs12intg\data\pkcs12_pm009.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pm010.p12"-"c:\tpkcs12intg\data\pkcs12_pm010.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_ci001.p12"-"c:\tpkcs12intg\data\pkcs12_ci001.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_ci002.p12"-"c:\tpkcs12intg\data\pkcs12_ci002.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_sb001.p12"-"c:\tpkcs12intg\data\pkcs12_sb001.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_sb002.p12"-"c:\tpkcs12intg\data\pkcs12_sb002.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_sb003.p12"-"c:\tpkcs12intg\data\pkcs12_sb003.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb001.p12"-"c:\tpkcs12intg\data\pkcs12_cb001.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb002.p12"-"c:\tpkcs12intg\data\pkcs12_cb002.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb003.p12"-"c:\tpkcs12intg\data\pkcs12_cb003.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb004.p12"-"c:\tpkcs12intg\data\pkcs12_cb004.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb005.p12"-"c:\tpkcs12intg\data\pkcs12_cb005.p12" 
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_cb006.p12"-"c:\tpkcs12intg\data\pkcs12_cb006.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_junk.p12"-"c:\tpkcs12intg\data\pkcs12_junk.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_ct001.p12"-"c:\tpkcs12intg\data\pkcs12_ct001.p12"
+
+
+; Negative Test
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_changetag.p12"-"c:\tpkcs12intg\data\pkcs12_changetag.p12"		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_contenttype.p12"-"c:\tpkcs12intg\data\pkcs12_contenttype.p12"  		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedattrval.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedattrval.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedSalt.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedSalt.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedshroudedval.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedshroudedval.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedversion.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedversion.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalg1.p12"-"c:\tpkcs12intg\data\pkcs12_digestalg1.p12"  		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalg2.p12"-"c:\tpkcs12intg\data\pkcs12_digestalg2.p12"  		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestcorrupted.p12"-"c:\tpkcs12intg\data\pkcs12_digestcorrupted.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_emptycontentinfo.p12"-"c:\tpkcs12intg\data\pkcs12_emptycontentinfo.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_emptydigest.p12"-"c:\tpkcs12intg\data\pkcs12_emptydigest.p12"  		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encrypteddataabsent.p12"-"c:\tpkcs12intg\data\pkcs12_encrypteddataabsent.p12"	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_unsupportedbag.p12"-"c:\tpkcs12intg\data\pkcs12_unsupportedbag.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_unsupportedcontentinfo.p12"-"c:\tpkcs12intg\data\pkcs12_unsupportedcontentinfo.p12"	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encryptedcontentabsent.p12"-"c:\tpkcs12intg\data\pkcs12_encryptedcontentabsent.p12"	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_attributevaluecorrupted.p12"-"c:\tpkcs12intg\data\pkcs12_attributevaluecorrupted.p12"	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedencryptedcontent.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedencryptedcontent.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedshroudediteration1.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedshroudediteration1.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_corruptedshroudediteration2.p12"-"c:\tpkcs12intg\data\pkcs12_corruptedshroudediteration2.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encryptedcontentiteration1.p12"-"c:\tpkcs12intg\data\pkcs12_encryptedcontentiteration1.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encryptedcontentiteration2.p12"-"c:\tpkcs12intg\data\pkcs12_encryptedcontentiteration2.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encryptedcontentversion.p12"-"c:\tpkcs12intg\data\pkcs12_encryptedcontentversion.p12"  
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_encryptedusingdifferentAlg.p12"-"c:\tpkcs12intg\data\pkcs12_encryptedusingdifferentAlg.p12"  
+
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_authsafe_contentnotoctetstring.p12"-"c:\tpkcs12intg\data\pkcs12_authsafe_contentnotoctetstring.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_authsafe_contentnotsequence.p12"-"c:\tpkcs12intg\data\pkcs12_authsafe_contentnotsequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_authsafe_notasequence.p12"-"c:\tpkcs12intg\data\pkcs12_authsafe_notasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_authsafe_oidnotoctetstring.p12"-"c:\tpkcs12intg\data\pkcs12_authsafe_oidnotoctetstring.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_certbag_explicittagchanged.p12"-"c:\tpkcs12intg\data\pkcs12_certbag_explicittagchanged.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_certbag_notasequence.p12"-"c:\tpkcs12intg\data\pkcs12_certbag_notasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_certbag_notoctetstring.p12"-"c:\tpkcs12intg\data\pkcs12_certbag_notoctetstring.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_certbag_oidnotoctetstring.p12"-"c:\tpkcs12intg\data\pkcs12_certbag_oidnotoctetstring.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalgnotsha1.p12"-"c:\tpkcs12intg\data\pkcs12_digestalgnotsha1.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalgorithmnotasequence.p12"-"c:\tpkcs12intg\data\pkcs12_digestalgorithmnotasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestinfonotasequence.p12"-"c:\tpkcs12intg\data\pkcs12_digestinfonotasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_macdata_iterationnotinteger.p12"-"c:\tpkcs12intg\data\pkcs12_macdata_iterationnotinteger.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_macdata_negiteration.p12"-"c:\tpkcs12intg\data\pkcs12_macdata_negiteration.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_macdata_nosalt_noiteration.p12"-"c:\tpkcs12intg\data\pkcs12_macdata_nosalt_noiteration.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_macdatanotasequence.p12"-"c:\tpkcs12intg\data\pkcs12_macdatanotasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_macsaltnotoctetstring.p12"-"c:\tpkcs12intg\data\pkcs12_macsaltnotoctetstring.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pfx_missingcontents1.p12"-"c:\tpkcs12intg\data\pkcs12_pfx_missingcontents1.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_pfx_notasequence.p12"-"c:\tpkcs12intg\data\pkcs12_pfx_notasequence.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_unsupported_contenttype.p12"-"c:\tpkcs12intg\data\pkcs12_unsupported_contenttype.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_version_notinteger.p12"-"c:\tpkcs12intg\data\pkcs12_version_notinteger.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_bagattributenotaseq.p12"-"c:\tpkcs12intg\data\pkcs12_bagattributenotaseq.p12"
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_bagattributeoid_notoctet.p12"-"c:\tpkcs12intg\data\pkcs12_bagattributeoid_notoctet.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_bagattributeval_notset.p12"-"c:\tpkcs12intg\data\pkcs12_bagattributeval_notset.p12"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalgnotsha1_mac.der"-"c:\tpkcs12intg\data\pkcs12_digestalgnotsha1_mac.der"  	
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_digestalgnotsha1_salt.der"-"c:\tpkcs12intg\data\pkcs12_digestalgnotsha1_salt.der"  	
+;//OOM Test
+"\epoc32\winscw\c\tpkcs12intg\data\oommacdata.der"-"c:\tpkcs12intg\data\oommacdata.der"
+"\epoc32\winscw\c\tpkcs12intg\data\oomauthsafedata.der"-"c:\tpkcs12intg\data\oomauthsafedata.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomattributes.der"-"c:\tpkcs12intg\data\oomattributes.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomshroudedkeybag.der"-"c:\tpkcs12intg\data\oomshroudedkeybag.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomcertbag.der"-"c:\tpkcs12intg\data\oomcertbag.der"
+"\epoc32\winscw\c\tpkcs12intg\data\oomkeybag.der"-"c:\tpkcs12intg\data\oomkeybag.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomsafecontentsbag.der"-"c:\tpkcs12intg\data\oomsafecontentsbag.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomsafebag.der"-"c:\tpkcs12intg\data\oomsafebag.der"			
+"\epoc32\winscw\c\tpkcs12intg\data\oomcrlbag.der"-"c:\tpkcs12intg\data\oomcrlbag.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\oomsecretbag.der"-"c:\tpkcs12intg\data\oomsecretbag.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\pkcs12_oomsafecontentencrypteddata.p12"-"c:\tpkcs12intg\data\pkcs12_oomsafecontentencrypteddata.p12"	
+
+"\epoc32\winscw\c\tpkcs12intg\data\root5ca.der"-"c:\tpkcs12intg\data\root5ca.der"
+"\epoc32\winscw\c\tpkcs12intg\data\root5ca.pem"-"c:\tpkcs12intg\data\root5ca.pem"
+
+"\epoc32\winscw\c\tpkcs12intg\data\root5_ee.der"-"c:\tpkcs12intg\data\root5_ee.der"
+"\epoc32\winscw\c\tpkcs12intg\data\root5ca_key.der"-"c:\tpkcs12intg\data\root5ca_key.der"
+"\epoc32\winscw\c\tpkcs12intg\data\pm009_shrouded"-"c:\tpkcs12intg\data\pm009_shrouded"
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\root5ca_key.pem"-"c:\tpkcs12intg\data\root5ca_key.pem"
+"\epoc32\winscw\c\tpkcs12intg\data\root5ca_key.pk8"-"c:\tpkcs12intg\data\root5ca_key.pk8" 
+"\epoc32\winscw\c\tpkcs12intg\data\symbiantestrootcadsa_key.pk8"-"c:\tpkcs12intg\data\symbiantestrootcadsa_key.pk8"
+"\epoc32\winscw\c\tpkcs12intg\data\ee_key.pk8"-"c:\tpkcs12intg\data\ee_key.pk8"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_1.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_2.der"-"c:\tpkcs12intg\data\safebag_shrouded_2.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_3.der"-"c:\tpkcs12intg\data\safebag_shrouded_3.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_4.der"-"c:\tpkcs12intg\data\safebag_shrouded_4.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_5.der"-"c:\tpkcs12intg\data\safebag_shrouded_5.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_6.der"-"c:\tpkcs12intg\data\safebag_shrouded_6.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_7.der"-"c:\tpkcs12intg\data\safebag_shrouded_7.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_8.der"-"c:\tpkcs12intg\data\safebag_shrouded_8.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_10.der"-"c:\tpkcs12intg\data\safebag_shrouded_10.der" 
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb001.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb001.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb006_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb006_1.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\localkeyid.der"-"c:\tpkcs12intg\data\localkeyid.der"
+
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\friendlyname_ct001.der"-"c:\tpkcs12intg\data\friendlyname_ct001.der"
+"\epoc32\winscw\c\tpkcs12intg\data\localkeyid_ct001.der"-"c:\tpkcs12intg\data\localkeyid_ct001.der"
+"\epoc32\winscw\c\tpkcs12intg\data\sdsicert.der"-"c:\tpkcs12intg\data\sdsicert.der"
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\friendlyname.der"-"c:\tpkcs12intg\data\friendlyname.der"
+"\epoc32\winscw\c\tpkcs12intg\data\localkeyid_cert.der"-"c:\tpkcs12intg\data\localkeyid_cert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\localkeyid_im002.der"-"c:\tpkcs12intg\data\localkeyid_im002.der"
+"\epoc32\winscw\c\tpkcs12intg\data\friendlyname_im002.der"-"c:\tpkcs12intg\data\friendlyname_im002.der"
+"\epoc32\winscw\c\tpkcs12intg\data\localkeyid_shrouded.der"-"c:\tpkcs12intg\data\localkeyid_shrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb002_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb002_1.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb002_2.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb002_2.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb003_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb003_1.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_firstkey.der"-"c:\tpkcs12intg\data\cb004_localkeyid_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_firstkey.der"-"c:\tpkcs12intg\data\cb004_friendlyname_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_firstcert.der"-"c:\tpkcs12intg\data\cb004_localkeyid_firstcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_firstcert.der"-"c:\tpkcs12intg\data\cb004_friendlyname_firstcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb004_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb004_1.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_firstshrouded.der"-"c:\tpkcs12intg\data\cb004_localkeyid_firstshrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_firstshrouded.der"-"c:\tpkcs12intg\data\cb004_friendlyname_firstshrouded.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_secondkey.der"-"c:\tpkcs12intg\data\cb004_localkeyid_secondkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_secondkey.der"-"c:\tpkcs12intg\data\cb004_friendlyname_secondkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_secondcert.der"-"c:\tpkcs12intg\data\cb004_localkeyid_secondcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_secondcert.der"-"c:\tpkcs12intg\data\cb004_friendlyname_secondcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb004_2.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb004_2.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_localkeyid_secondshrouded.der"-"c:\tpkcs12intg\data\cb004_localkeyid_secondshrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_friendlyname_secondshrouded.der"-"c:\tpkcs12intg\data\cb004_friendlyname_secondshrouded.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_firstkey.der"-"c:\tpkcs12intg\data\cb005_localkeyid_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_firstkey.der"-"c:\tpkcs12intg\data\cb005_friendlyname_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_firstcertbag.der"-"c:\tpkcs12intg\data\cb005_localkeyid_firstcertbag.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_firstcertbag.der"-"c:\tpkcs12intg\data\cb005_friendlyname_firstcertbag.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb005_1.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb005_1.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_firstshrouded.der"-"c:\tpkcs12intg\data\cb005_localkeyid_firstshrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_firstshrouded.der"-"c:\tpkcs12intg\data\cb005_friendlyname_firstshrouded.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_secondkey.der"-"c:\tpkcs12intg\data\cb005_localkeyid_secondkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_secondkey.der"-"c:\tpkcs12intg\data\cb005_friendlyname_secondkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_secondcert.der"-"c:\tpkcs12intg\data\cb005_localkeyid_secondcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_secondcert.der"-"c:\tpkcs12intg\data\cb005_friendlyname_secondcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_cb005_2.der"-"c:\tpkcs12intg\data\safebag_shrouded_cb005_2.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_localkeyid_secondshrouded.der"-"c:\tpkcs12intg\data\cb005_localkeyid_secondshrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_friendlyname_secondshrouded.der"-"c:\tpkcs12intg\data\cb005_friendlyname_secondshrouded.der"
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_localkeyid_firstkey.der"-"c:\tpkcs12intg\data\cb006_localkeyid_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_friendlyname_firstkey.der"-"c:\tpkcs12intg\data\cb006_friendlyname_firstkey.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_localkeyid_firstcert.der"-"c:\tpkcs12intg\data\cb006_localkeyid_firstcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_friendlyname_firstcert.der"-"c:\tpkcs12intg\data\cb006_friendlyname_firstcert.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_localkeyid_firstshrouded.der"-"c:\tpkcs12intg\data\cb006_localkeyid_firstshrouded.der"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_friendlyname_firstshrouded.der"-"c:\tpkcs12intg\data\cb006_friendlyname_firstshrouded.der"
+
+
+
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm001.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm001.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm002.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm002.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm003.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm003.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm004.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm004.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm005.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm005.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm006.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm006.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm007.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm007.der"
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm008.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm008.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\safebag_shrouded_pm010.der"-"c:\tpkcs12intg\data\safebag_shrouded_pm010.der"
+
+"\epoc32\winscw\c\tpkcs12intg\data\safebag.der"-"c:\tpkcs12intg\data\safebag.der"
+
+// Negative Test
+"\epoc32\winscw\c\tpkcs12intg\data\attrvalchangedfriendlyname"-"c:\tpkcs12intg\data\attrvalchangedfriendlyname"	
+"\epoc32\winscw\c\tpkcs12intg\data\attrvalchangedlocalkeyid"-"c:\tpkcs12intg\data\attrvalchangedlocalkeyid"	
+"\epoc32\winscw\c\tpkcs12intg\data\digestchangedmac.der"-"c:\tpkcs12intg\data\digestchangedmac.der"		
+"\epoc32\winscw\c\tpkcs12intg\data\digestchangedmacsalt.der"-"c:\tpkcs12intg\data\digestchangedmacsalt.der"	
+
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb001_mac"-"c:\tpkcs12intg\data\cb001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb001_macsalt"-"c:\tpkcs12intg\data\cb001_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb002_mac"-"c:\tpkcs12intg\data\cb002_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb002_macsalt"-"c:\tpkcs12intg\data\cb002_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb003_mac"-"c:\tpkcs12intg\data\cb003_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb003_macsalt"-"c:\tpkcs12intg\data\cb003_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_mac"-"c:\tpkcs12intg\data\cb004_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb004_macsalt"-"c:\tpkcs12intg\data\cb004_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_mac"-"c:\tpkcs12intg\data\cb005_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb005_macsalt"-"c:\tpkcs12intg\data\cb005_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_mac"-"c:\tpkcs12intg\data\cb006_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\cb006_macsalt"-"c:\tpkcs12intg\data\cb006_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\im001_mac"-"c:\tpkcs12intg\data\im001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\im001_macsalt"-"c:\tpkcs12intg\data\im001_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\im002_mac"-"c:\tpkcs12intg\data\im002_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\im002_macsalt"-"c:\tpkcs12intg\data\im002_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm001_mac"-"c:\tpkcs12intg\data\pm001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm001_macsalt"-"c:\tpkcs12intg\data\pm001_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm003_mac"-"c:\tpkcs12intg\data\pm003_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm003_macsalt"-"c:\tpkcs12intg\data\pm003_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm002_mac"-"c:\tpkcs12intg\data\pm002_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm002_macsalt"-"c:\tpkcs12intg\data\pm002_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm004_mac"-"c:\tpkcs12intg\data\pm004_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm004_macsalt"-"c:\tpkcs12intg\data\pm004_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm005_mac"-"c:\tpkcs12intg\data\pm005_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm005_macsalt"-"c:\tpkcs12intg\data\pm005_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm006_mac"-"c:\tpkcs12intg\data\pm006_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm006_macsalt"-"c:\tpkcs12intg\data\pm006_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm007_mac"-"c:\tpkcs12intg\data\pm007_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm007_macsalt"-"c:\tpkcs12intg\data\pm007_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm008_mac"-"c:\tpkcs12intg\data\pm008_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm008_macsalt"-"c:\tpkcs12intg\data\pm008_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\pm010_mac"-"c:\tpkcs12intg\data\pm010_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\pm010_macsalt"-"c:\tpkcs12intg\data\pm010_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\sb001_mac"-"c:\tpkcs12intg\data\sb001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\sb001_macsalt"-"c:\tpkcs12intg\data\sb001_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\sb002_mac"-"c:\tpkcs12intg\data\sb002_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\sb002_macsalt"-"c:\tpkcs12intg\data\sb002_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\sb003_mac"-"c:\tpkcs12intg\data\sb003_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\sb003_macsalt"-"c:\tpkcs12intg\data\sb003_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\ci001_mac"-"c:\tpkcs12intg\data\ci001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\ci001_macsalt"-"c:\tpkcs12intg\data\ci001_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\ci002_mac"-"c:\tpkcs12intg\data\ci002_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\ci002_macsalt"-"c:\tpkcs12intg\data\ci002_macsalt"
+
+"\epoc32\winscw\c\tpkcs12intg\data\ct001_mac"-"c:\tpkcs12intg\data\ct001_mac"
+"\epoc32\winscw\c\tpkcs12intg\data\ct001_macsalt"-"c:\tpkcs12intg\data\ct001_macsalt"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/ocsptests.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,164 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"Ocsp Tests"}, (0x101FB3E5), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"Ocsp integration test"
+
+
+"\epoc32\winscw\c\system\tocsp\scripts\Valicert.txt"-"c:\system\TOCSP\scripts\Valicert.txt
+"\epoc32\winscw\c\system\tocsp\scripts\CertCo.txt"-"c:\system\TOCSP\scripts\CertCo.txt
+
+
+//OCSP tests TMS support
+
+"\epoc32\winscw\c\system\TOCSP\scripts\openssl.script"-"c:\system\TOCSP\scripts\openssl.script1"
+"\epoc32\winscw\c\system\tocsp\scripts\XCert-local.script"-"c:\system\TOCSP\scripts\XCert-local.script1"
+"\epoc32\winscw\c\system\tocsp\scripts\XCert-oom.script"-"c:\system\TOCSP\scripts\XCert-oom.script1"
+"\epoc32\winscw\c\system\tocsp\scripts\OpenSSL-local.script"-"c:\system\TOCSP\scripts\OpenSSL-local.script1"
+
+
+"\epoc32\winscw\c\system\tocsp\scripts\Error.script"-"c:\system\TOCSP\scripts\Error.script1"
+"\epoc32\winscw\c\system\tocsp\scripts\defaultpolicy.script"-"c:\system\TOCSP\scripts\defaultpolicy.script1"
+"\epoc32\winscw\c\system\tocsp\scripts\httpinterface.script"-"c:\system\tocsp\scripts\httpinterface.script1"
+
+"\epoc32\winscw\c\system\TOCSP\scripts\openssl.ini"-"c:\system\TOCSP\scripts\openssl.ini"
+"\epoc32\winscw\c\system\tocsp\scripts\XCert-local.ini"-"c:\system\TOCSP\scripts\XCert-local.ini"
+"\epoc32\winscw\c\system\tocsp\scripts\XCert-oom.ini"-"c:\system\TOCSP\scripts\XCert-oom.ini"
+"\epoc32\winscw\c\system\tocsp\scripts\OpenSSL-local.ini"-"c:\system\TOCSP\scripts\OpenSSL-local.ini"
+
+
+"\epoc32\winscw\c\system\tocsp\scripts\Error.ini"-"c:\system\TOCSP\scripts\Error.ini"
+"\epoc32\winscw\c\system\tocsp\scripts\defaultpolicy.ini"-"c:\system\TOCSP\scripts\defaultpolicy.ini"
+"\epoc32\winscw\c\system\tocsp\scripts\httpinterface.ini"-"c:\system\tocsp\scripts\httpinterface.ini"
+
+//
+"\epoc32\winscw\c\system\tocsp\responses\response.n1"-"c:\system\TOCSP\responses\response.n1"
+"\epoc32\winscw\c\system\tocsp\responses\response.n2"-"c:\system\TOCSP\responses\response.n2"
+
+"\epoc32\winscw\c\system\tocsp\responses\response.000"-"c:\system\TOCSP\responses\response.000"
+"\epoc32\winscw\c\system\tocsp\responses\response.001"-"c:\system\TOCSP\responses\response.001"
+"\epoc32\winscw\c\system\tocsp\responses\response.002"-"c:\system\TOCSP\responses\response.002"
+"\epoc32\winscw\c\system\tocsp\responses\response.003"-"c:\system\TOCSP\responses\response.003"
+"\epoc32\winscw\c\system\tocsp\responses\response.004"-"c:\system\TOCSP\responses\response.004"
+"\epoc32\winscw\c\system\tocsp\responses\response.005"-"c:\system\TOCSP\responses\response.005"
+"\epoc32\winscw\c\system\tocsp\responses\response.006"-"c:\system\TOCSP\responses\response.006"
+"\epoc32\winscw\c\system\tocsp\responses\response.007"-"c:\system\TOCSP\responses\response.007"
+"\epoc32\winscw\c\system\tocsp\responses\response.008"-"c:\system\TOCSP\responses\response.008"
+"\epoc32\winscw\c\system\tocsp\responses\response.009"-"c:\system\TOCSP\responses\response.009"
+"\epoc32\winscw\c\system\tocsp\responses\response.010"-"c:\system\TOCSP\responses\response.010"
+"\epoc32\winscw\c\system\tocsp\responses\response.011"-"c:\system\TOCSP\responses\response.011"
+"\epoc32\winscw\c\system\tocsp\responses\response.012"-"c:\system\TOCSP\responses\response.012"
+"\epoc32\winscw\c\system\tocsp\responses\response.013"-"c:\system\TOCSP\responses\response.013"
+"\epoc32\winscw\c\system\tocsp\responses\response.014"-"c:\system\TOCSP\responses\response.014"
+"\epoc32\winscw\c\system\tocsp\responses\response.015"-"c:\system\TOCSP\responses\response.015"
+"\epoc32\winscw\c\system\tocsp\responses\response.016"-"c:\system\TOCSP\responses\response.016"
+"\epoc32\winscw\c\system\tocsp\responses\response.018"-"c:\system\TOCSP\responses\response.018"
+"\epoc32\winscw\c\system\tocsp\responses\vs_explicit_version.dat"-"c:\system\TOCSP\responses\vs_explicit_version.dat"
+"\epoc32\winscw\c\system\tocsp\responses\response.019"-"c:\system\TOCSP\responses\response.019"
+"\epoc32\winscw\c\system\tocsp\responses\response.020"-"c:\system\TOCSP\responses\response.020"
+"\epoc32\winscw\c\system\tocsp\responses\response.021"-"c:\system\TOCSP\responses\response.021"
+"\epoc32\winscw\c\system\tocsp\responses\response.022"-"c:\system\TOCSP\responses\response.022"
+"\epoc32\winscw\c\system\tocsp\responses\response.023"-"c:\system\TOCSP\responses\response.023"
+"\epoc32\winscw\c\system\tocsp\responses\response.024"-"c:\system\TOCSP\responses\response.024"
+"\epoc32\winscw\c\system\tocsp\responses\response.025"-"c:\system\TOCSP\responses\response.025"
+"\epoc32\winscw\c\system\tocsp\responses\response.026"-"c:\system\TOCSP\responses\response.026"
+"\epoc32\winscw\c\system\tocsp\responses\response.027"-"c:\system\TOCSP\responses\response.027"
+"\epoc32\winscw\c\system\tocsp\responses\response.028"-"c:\system\TOCSP\responses\response.028"
+"\epoc32\winscw\c\system\tocsp\responses\response.029"-"c:\system\TOCSP\responses\response.029"
+"\epoc32\winscw\c\system\tocsp\responses\response.030"-"c:\system\TOCSP\responses\response.030"
+"\epoc32\winscw\c\system\tocsp\responses\response.031"-"c:\system\TOCSP\responses\response.031"
+"\epoc32\winscw\c\system\tocsp\responses\response.032"-"c:\system\TOCSP\responses\response.032"
+"\epoc32\winscw\c\system\tocsp\responses\response.033"-"c:\system\TOCSP\responses\response.033"
+"\epoc32\winscw\c\system\tocsp\responses\response.034"-"c:\system\TOCSP\responses\response.034"
+"\epoc32\winscw\c\system\tocsp\responses\response.035"-"c:\system\TOCSP\responses\response.035"
+
+"\epoc32\winscw\c\system\tocsp\responses\XCert_00_Good_RSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_00_Good_RSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_01_Revoked_RSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_01_Revoked_RSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_02_Suspended_RSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_02_Suspended_RSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_03_Unknown_RSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_03_Unknown_RSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_04_Good_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_04_Good_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_05_Revoked_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_05_Revoked_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_06_Suspended_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_06_Suspended_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_07_Unknown_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_07_Unknown_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_08_All_RSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_08_All_RSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_09_All_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_09_All_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_10_Expired_Subject_and_Issuer.rsp"-"c:\system\TOCSP\responses\XCert_10_Expired_Subject_and_Issuer.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_11_Expired_Signing.rsp"-"c:\system\TOCSP\responses\XCert_11_Expired_Signing.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_12_Expired_Subject.rsp"-"c:\system\TOCSP\responses\XCert_12_Expired_Subject.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_14_Expired_subject_valid_time.rsp"-"c:\system\TOCSP\responses\XCert_14_Expired_subject_valid_time.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_15_Expired_unspecified.rsp"-"c:\system\TOCSP\responses\XCert_15_Expired_unspecified.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_16_ThisUpdateTooEarly.rsp"-"c:\system\TOCSP\responses\XCert_16_ThisUpdateTooEarly.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_20_Nonce_Off.rsp"-"c:\system\TOCSP\responses\XCert_20_Nonce_Off.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_22_BadSig_DSA_XCert.rsp"-"c:\system\TOCSP\responses\XCert_22_BadSig_DSA_XCert.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_23_ResultCombination1.rsp"-"c:\system\TOCSP\responses\XCert_23_ResultCombination1.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_24_ResultCombination2.rsp"-"c:\system\TOCSP\responses\XCert_24_ResultCombination2.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_25_ResultCombination3.rsp"-"c:\system\TOCSP\responses\XCert_25_ResultCombination3.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\XCert_26_ResultCombination4.rsp"-"c:\system\TOCSP\responses\XCert_26_ResultCombination4.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\Error_00_Single_R5.rsp"-"c:\system\TOCSP\responses\Error_00_Single_R5.rsp"
+"\epoc32\winscw\c\system\tocsp\responses\Error_01_Double_R5.rsp"-"c:\system\TOCSP\responses\Error_01_Double_R5.rsp"
+
+"\epoc32\winscw\c\system\tocsp\responses\ca_1ext_usage_not_ocspsigning_resp.dat"-"c:\system\TOCSP\responses\ca_1ext_usage_not_ocspsigning_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_2ext_usage_not_ocspsigning_resp.dat"-"c:\system\TOCSP\responses\ca_2ext_usage_not_ocspsigning_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_2ext_usage_ocspsigning_bad_sign_resp.dat"-"c:\system\TOCSP\responses\ca_2ext_usage_ocspsigning_bad_sign_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_2ext_usage_ocspsigning_bad_name_resp.dat"-"c:\system\TOCSP\responses\ca_2ext_usage_ocspsigning_bad_name_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_2ext_usage_ocspsigning_resp.dat"-"c:\system\TOCSP\responses\ca_2ext_usage_ocspsigning_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_no_ext_usage_resp.dat"-"c:\system\TOCSP\responses\ca_no_ext_usage_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\multi_cert_resp.dat"-"c:\system\TOCSP\responses\multi_cert_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\no_cert_resp.dat"-"c:\system\TOCSP\responses\no_cert_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\multiple_response.dat"-"c:\system\TOCSP\responses\multiple_response.dat"
+"\epoc32\winscw\c\system\tocsp\responses\wrong_ca_cert_resp.dat"-"c:\system\TOCSP\responses\wrong_ca_cert_resp.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_delg_wrong_key.dat"-"c:\system\TOCSP\responses\ca_delg_wrong_key.dat"
+
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_good_wrong_key.dat"-"c:\system\TOCSP\responses\ca_direct_good_wrong_key.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_multi_cert_inc_right.dat"-"c:\system\TOCSP\responses\ca_direct_multi_cert_inc_right.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_multi_cert_no_right.dat"-"c:\system\TOCSP\responses\ca_direct_multi_cert_no_right.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_revoked.dat"-"c:\system\TOCSP\responses\ca_direct_revoked.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_wrong_cert.dat"-"c:\system\TOCSP\responses\ca_direct_wrong_cert.dat"
+"\epoc32\winscw\c\system\tocsp\responses\ca_direct_wrong_resp_name.dat"-"c:\system\TOCSP\responses\ca_direct_wrong_resp_name.dat"
+"\epoc32\winscw\c\system\tocsp\responses\no_certresp_signedby_delegate.dat"-"c:\system\TOCSP\responses\no_certresp_signedby_delegate.dat"
+
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response01.dat"-"c:\system\TOCSP\responses\OpenSSL\response01.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response02.dat"-"c:\system\TOCSP\responses\OpenSSL\response02.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response03.dat"-"c:\system\TOCSP\responses\OpenSSL\response03.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response04.dat"-"c:\system\TOCSP\responses\OpenSSL\response04.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response05.dat"-"c:\system\TOCSP\responses\OpenSSL\response05.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response06.dat"-"c:\system\TOCSP\responses\OpenSSL\response06.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response07.dat"-"c:\system\TOCSP\responses\OpenSSL\response07.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response08.dat"-"c:\system\TOCSP\responses\OpenSSL\response08.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response09.dat"-"c:\system\TOCSP\responses\OpenSSL\response09.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response10.dat"-"c:\system\TOCSP\responses\OpenSSL\response10.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response11.dat"-"c:\system\TOCSP\responses\OpenSSL\response11.dat"
+"\epoc32\winscw\c\system\tocsp\responses\OpenSSL\response12.dat"-"c:\system\TOCSP\responses\OpenSSL\response12.dat"
+
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request01.dat"-"c:\system\TOCSP\requests\OpenSSL\request01.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request02.dat"-"c:\system\TOCSP\requests\OpenSSL\request02.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request03.dat"-"c:\system\TOCSP\requests\OpenSSL\request03.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request04.dat"-"c:\system\TOCSP\requests\OpenSSL\request04.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request05.dat"-"c:\system\TOCSP\requests\OpenSSL\request05.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request06.dat"-"c:\system\TOCSP\requests\OpenSSL\request06.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request07.dat"-"c:\system\TOCSP\requests\OpenSSL\request07.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request08.dat"-"c:\system\TOCSP\requests\OpenSSL\request08.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request09.dat"-"c:\system\TOCSP\requests\OpenSSL\request09.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request10.dat"-"c:\system\TOCSP\requests\OpenSSL\request10.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request11.dat"-"c:\system\TOCSP\requests\OpenSSL\request11.dat"
+"\epoc32\winscw\c\system\tocsp\requests\OpenSSL\request12.dat"-"c:\system\TOCSP\requests\OpenSSL\request12.dat"
+"\epoc32\winscw\c\system\tocsp\responses\openssl\no_aia_no_ocspext.dat"-"c:\system\TOCSP\responses\openssl\no_aia_no_ocspext.dat"
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/group/recog.pkg	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,51 @@
+;
+; Copyright (c) 2010 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: 
+;
+&EN
+
+;Header
+#{"recog Tests"}, (0x101FB3E1), 1, 2, 3, TYPE=SA
+
+%{"Nokia ATS Test"}
+:"recog integration test"
+
+
+
+; trecog cert exports
+"\epoc32\winscw\c\trecog\trecogcert.ini"-"c:\trecog\trecogcert.ini"
+"\epoc32\winscw\c\trecog\trecogcert.script"-"c:\trecog\trecogcert.script"
+"\epoc32\winscw\c\trecog\ca.der"-"c:\trecog\ca.der"
+"\epoc32\winscw\c\trecog\user.der"-"c:\trecog\user.der"
+"\epoc32\winscw\c\trecog\wtls.cer"-"c:\trecog\wtls.cer"
+"\epoc32\winscw\c\trecog\x509v1.cer"-"c:\trecog\x509v1.cer"
+"\epoc32\winscw\c\trecog\noversion.cer"-"c:\trecog\noversion.cer"
+"\epoc32\winscw\c\trecog\serialnumberlengthFF.der"-"c:\trecog\serialnumberlengthFF.der"
+"\epoc32\winscw\c\trecog\longserialnumber.der"-"c:\trecog\longserialnumber.der"
+
+
+
+"\epoc32\winscw\c\trecog\trecogpkcs12.ini"-"c:\trecog\trecogpkcs12.ini"
+"\epoc32\winscw\c\trecog\trecogpkcs12.script"-"c:\trecog\trecogpkcs12.script"
+"\epoc32\winscw\c\trecog\pkcs12simple.p12"-"c:\trecog\pkcs12simple.p12"
+"\epoc32\winscw\c\trecog\pkcs12simple.pfx"-"c:\trecog\pkcs12simple.pfx"
+"\epoc32\winscw\c\trecog\pkcs12simple.xyz"-"c:\trecog\pkcs12simple.xyz"
+"\epoc32\winscw\c\trecog\root5ca_key.pk8"-"c:\trecog\root5ca_key.pk8"
+"\epoc32\winscw\c\trecog\small.txt"-"c:\trecog\small.txt"
+
+
+
+
+
+
--- a/cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/inc/SecurityTests.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -21,9 +21,11 @@
 // We need bigger ROFS files for tests with TBAS
 rofssize=0x2100000
 
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 // Save build details in ROM
 data=\buildid.txt                 \buildid.txt
-
+#endif
 
 // This should be included in the Techview.oby file
 // All test data and scripts gets copied to the root of ROM drive.
@@ -47,9 +49,7 @@
 
 #include "securityframeworktestserver.iby"
 
-
 #if defined SYMBIAN_KEYSTORE_USE_AUTH_SERVER || defined SDP_ROM1
-
 	#include "ups.iby"
 	#include "tups.iby"
 	#include "asnpkcstests.iby"
@@ -57,6 +57,28 @@
 	#include "tpkcs7server.iby"     
 	#include "tpkcs12integrationserver.iby"  	
 	#include "ctframeworktests.iby"
+	// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+	// temp added
+	#ifndef _SERIAL_DOWNLOAD
+		#include "streamingcaf.iby"
+		// iby files for caf
+		#include "caf.iby"
+		#include "caftest.iby"
+		#include "reccafconfig.iby"
+		#include "rta.iby"
+		#include "rtatest.iby"
+		#include "cryptotests.iby"
+		#include "tscaf.iby"	
+		#include "randomtests.iby"
+		#include "hashtests.iby"
+
+		#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+		#include "mtputils.iby"
+		#include "mtputilstest.iby"
+		#include "refcafhelper.iby"
+		#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+	#endif
+
 #else
 	#include "streamingcaf.iby"
 	// iby files for caf
@@ -75,9 +97,19 @@
 	#include "mtputilstest.iby"
 	#include "refcafhelper.iby"
 	#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+	// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+	// temp added
+	#ifndef _SERIAL_DOWNLOAD
+		#include "ups.iby"
+		#include "tups.iby"
+		#include "asnpkcstests.iby"
+		#include "certmantests.iby"
+		#include "tpkcs7server.iby"     
+		#include "tpkcs12integrationserver.iby"  	
+		#include "ctframeworktests.iby"		
+	#endif 
 
-#endif
- 
+#endif 
 	
 // Common utils libraries
 #include "securitycommonutils.iby"
@@ -98,6 +130,10 @@
 define ZDRIVE \epoc32\winscw\c
 // This is the bat file to run the security tests automatically
 // comms configuration (and configuration using sim.tsy)
+// temp addeed the next line
+#ifndef _SERIAL_DOWNLOAD
+data = ZDRIVE\auto.cfg                 \buildid.txt
+#endif
 data = ZDRIVE\auto.cfg					\auto.cfg
 data = ZDRIVE\auto_broken.cfg					\auto_broken.cfg
 data = ZDRIVE\autosimtsy.cfg					\autosimtsy.cfg
@@ -195,7 +231,10 @@
 
 file=ABI_DIR\BUILD_DIR\RUNTESTS.EXE                 System\Programs\RUNTESTS.EXE
 
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 #include "thindump.iby"
+#endif
 #include "sntpclient.iby"
 
 // *** Additional includes and configuration for SSM Requirements ***
--- a/cryptomgmtlibs/securitytestfw/inc/cryptodeps.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/inc/cryptodeps.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -24,6 +24,9 @@
 #include "paddingtests.iby"
 #ifdef SYMBIAN_CRYPTOSPI
 #include "tcryptospi.iby"
+
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 #include "cryptospi_testplugins.iby"
 	
 // Proof of concept KMS (Key Management Server)
@@ -45,8 +48,9 @@
 file=ABI_DIR\BUILD_DIR\kmsclient.dll		sys\bin\kmsclient.dll
 
 file=ABI_DIR\BUILD_DIR\kmstest.exe			sys\bin\kmstest.exe
-
+#endif
 file=ABI_DIR\BUILD_DIR\tsymmetric.exe	System\Programs\tsymmetric.exe
 file=ABI_DIR\BUILD_DIR\tasymmetric.exe	System\Programs\tasymmetric.exe
 file=ABI_DIR\BUILD_DIR\tbigint.exe	System\Programs\tbigint.exe
 #endif
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/copysecuritytestfiles.bat	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,360 @@
+@rem
+@rem Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+@rem All rights reserved.
+@rem This component and the accompanying materials are made available
+@rem under the terms of the License "Eclipse Public License v1.0"
+@rem which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
+
+if "%1"=="init" goto init;
+if "%1"=="auto" goto auto; 
+if "%1"=="cryptohash" goto cryptohash;
+if "%1"=="cryptohashdel" goto cryptohashdel;
+if "%1"=="tpadding" goto tpadding; 
+if "%1"=="tpaddingdel" goto tpaddingdel;
+if "%1"=="tcryptospi" goto tcryptospi;
+if "%1"=="tcryptospidel" goto tcryptospidel; 
+if "%1"=="tasymmetric" goto tasymmetric;
+if "%1"=="tsymmetric" goto tsymmetric;
+if "%1"=="tbigint" goto tbigint; 
+if "%1"=="tasymmetricdel" goto tasymmetricdel;
+if "%1"=="tsymmetricdel" goto tsymmetricdel;
+if "%1"=="tbigintdel" goto tbigintdel; 
+if "%1"=="tpkcs5kdf" goto tpkcs5kdf;
+if "%1"=="tpkcs5kdfdel" goto tpkcs5kdfdel;
+if "%1"=="tpbe" goto tpbe; 
+if "%1"=="tpbedel" goto tpbedel;
+if "%1"=="trecog" goto trecog;
+if "%1"=="trecogdel" goto trecogdel;
+if "%1"=="tkeystore" goto tkeystore; 
+if "%1"=="tkeystoredel" goto tkeystoredel;
+if "%1"=="tcertapps" goto tcertapps;
+if "%1"=="tcertappsdel" goto tcertappsdel; 
+if "%1"=="t_keystore" goto t_keystore;
+if "%1"=="t_keystoredel" goto t_keystoredel;
+if "%1"=="tcaf" goto tcaf; 
+if "%1"=="tcafdel" goto tcafdel;
+if "%1"=="rta" goto rta;
+if "%1"=="rtadel" goto rtadel; 
+if "%1"=="tscaf" goto tscaf;
+if "%1"=="tscafdel" goto tscafdel;
+if "%1"=="mtputils" goto mtputils; 
+if "%1"=="mtputilsdel" goto mtputilsdel;
+if "%1"=="tpkcs12intg" goto tpkcs12intg;
+if "%1"=="tpkcs12intgdel" goto tpkcs12intgdel; 
+if "%1"=="tasnpkcs" goto tasnpkcs;
+if "%1"=="tasnpkcsdel" goto tasnpkcsdel;
+if "%1"=="tpkcs7" goto tpkcs7; 
+if "%1"=="tpkcs7del" goto tpkcs7del;
+if "%1"=="certstore" goto certstore;
+if "%1"=="cacertsdel" goto cacertsdel; 
+if "%1"=="certclientdel" goto certclientdel;
+if "%1"=="certstoredel" goto certstoredel;
+if "%1"=="tocsp" goto tocsp; 
+if "%1"=="tocspdel" goto tocspdel; 
+if "%1"=="tx509" goto tx509;
+if "%1"=="tx509del" goto tx509del;
+if "%1"=="tasn1" goto tasn1; 
+if "%1"=="tasn1del" goto tasn1del;
+if "%1"=="twtlscert" goto twtlscert;
+if "%1"=="twtlscertdel" goto twtlscertdel; 
+if "%1"=="tpkixcert" goto tpkixcert;
+if "%1"=="tpkixcertdel" goto tpkixcertdel;
+if "%1"=="tpkcs10" goto tpkcs10; 
+if "%1"=="tpkcs10del" goto tpkcs10del;
+if "%1"=="tpkixcert_tef" goto tpkixcert_tef;
+if "%1"=="tpkixcert_tefdel" goto tpkixcert_tefdel;
+goto exit
+
+
+:init
+REM create testresults directory
+md c:\testresults
+
+REM copy hosts file to redirect cam-ocspserver request to ban-ocspserver
+md c:\private
+md c:\private\10000882
+copy z:\hosts c:\private\10000882\hosts
+goto exit;
+
+:auto
+REM install automated commdb
+copy z:\auto.cfg c:\auto.cfg
+goto exit;
+
+:cryptohash
+copy /s z:\thash\ c:\thash\
+goto exit;
+
+:cryptohashdel
+del /s c:\thash\
+goto exit;
+
+:tpadding
+copy /s z:\tpadding\ c:\tpadding\
+goto exit;
+
+:tpaddingdel
+del /s c:\tpadding\
+goto exit;
+
+:tcryptospi
+copy /s z:\testdata\tcryptospi\ c:\testdata\tcryptospi\
+goto exit;
+
+:tcryptospidel
+del /s c:\testdata\tcryptospi\
+goto exit;
+
+:tasymmetric
+md c:\tasymmetric
+copy /s z:\tasymmetric\ c:\tasymmetric\
+goto exit;
+
+:tsymmetric
+md c:\tsymmetric
+copy /s z:\tsymmetric\ c:\tsymmetric\
+goto exit;
+
+:tbigint
+md c:\tbigint
+copy /s z:\tbigint\ c:\tbigint\
+goto exit;
+
+:tasymmetricdel
+del /s c:\tasymmetric\
+goto exit;
+
+:tsymmetricdel
+del c:\tsymmetric\
+goto exit;
+
+:tbigintdel
+del c:\tbigint\
+goto exit;
+
+:tpkcs5kdf
+md c:\tpkcs5kdf
+copy z:\tpkcs12kdftests.script c:\tpkcs5kdf\tpkcs12kdftests.script
+goto exit;
+
+:tpkcs5kdfdel
+del /s c:\tpkcs5kdf\
+goto exit;
+
+:tpbe
+md c:\tpbe
+copy z:\tpbe\*.dat c:\tpbe
+attrib c:\tpbe\strong.dat -r
+attrib c:\tpbe\weak.dat -r
+goto exit;
+
+:tpbedel
+del /s c:\tpbe\
+goto exit;
+
+:trecog
+md c:\trecog
+copy /s z:\trecog\* c:\trecog
+goto exit;
+
+:trecogdel
+del c:\trecog\
+goto exit;
+
+:tkeystore
+copy /s z:\tkeystore\ c:\tkeystore\
+copy /s z:\tcertstore\ c:\tcertstore\
+copy /s z:\ttesttools\ c:\ttesttools\
+copy /s z:\system\data\test1certstore.dat c:\system\data\test1certstore.dat
+copy /s c:\ttesttools\data\certclients.dat c:\private\101f72a6\certclients.dat
+goto exit;
+
+:tkeystoredel
+del c:\private\101f72a6\certclients.dat
+del c:\system\data\test1certstore.dat
+del /s c:\ttesttools\
+del /s c:\tcertstore\
+del /s c:\tkeystore\
+goto exit;
+
+:tcertapps
+copy /s z:\tcertapps\ c:\tcertapps\
+goto exit;
+
+:tcertappsdel
+del /s c:\tcertapps\
+goto exit;
+
+:t_keystore
+copy /s z:\tkeystore\ c:\tkeystore\
+goto exit;
+
+:t_keystoredel
+del /s c:\tkeystore\
+goto exit;
+
+:tcaf
+md c:\tcaf
+copy /s z:\tcaf\* c:\tcaf
+goto exit;
+
+:tcafdel
+del c:\tcaf\*.*
+goto exit;
+
+:rta
+md c:\rta
+copy /s z:\rta\* c:\rta
+goto exit;
+
+:rtadel
+del c:\rta\*.*
+goto exit;
+
+:tscaf
+md c:\tcaf
+md c:\tcaf\tscaf
+copy /s z:\tcaf\tscaf\* c:\tcaf\tscaf
+goto exit;
+
+:tscafdel
+del c:\tcaf\tscaf\*.*
+goto exit;
+
+:mtputils
+md c:\tcaf
+md c:\tcaf\tmtputils
+copy /s z:\tcaf\tmtputils\* c:\tcaf\tmtputils
+goto exit;
+
+:mtputilsdel
+del c:\tcaf\tmtputils\*.*
+goto exit;
+
+:tpkcs12intg
+copy /s z:\tpkcs12intg\ c:\tpkcs12intg\
+goto exit;
+
+:tpkcs12intgdel
+del /s c:\tpkcs12intg
+goto exit;
+
+:tasnpkcs
+md c:\tkeystore
+md c:\tkeystore\data
+copy /s z:\tkeystore\data\ c:\tkeystore\data\
+copy z:\tasnpkcstests.script c:\tasnpkcstests.script
+goto exit;
+
+:tasnpkcsdel
+del c:\tasnpkcstests.script
+del /s c:\tkeystore\data\
+goto exit;
+
+:tpkcs7
+md c:\tpkcs7
+copy /s z:\tpkcs7\ c:\tpkcs7\
+goto exit;
+
+:tpkcs7del
+del /s c:\tpkcs7\
+goto exit;
+
+:certstore
+copy /s z:\tcertstore\ c:\tcertstore\
+copy z:\certappmanager.txt c:\certappmanager.txt
+copy /s z:\unifiedcertstore2\ c:\unifiedcertstore2\
+copy z:\tcertstore\data\TestKeyStore.txt c:\system\data\testkeystore.txt
+goto exit;
+
+:cacertsdel
+del c:\system\data\cacerts.dat
+goto exit;
+
+:certclientdel
+del c:\system\data\certclients.dat
+goto exit;
+
+:certstoredel
+rem deleting data on c: to save room and leave slots in root folder
+del /s c:\unifiedcertstore2\
+del /s c:\tcertstore\
+del c:\certappmanager.txt
+goto exit;
+
+
+:tocsp
+rem copy tocsp test data
+md c:\system
+md c:\system\tocsp
+copy /s z:\system\tocsp\ c:\system\tocsp\
+goto exit;
+
+:tocspdel
+del c:\system\tocsp\
+goto exit;
+
+
+:tx509
+copy /s z:\tx509\ c:\tx509\
+goto exit;
+
+:tx509del
+del /s c:\tx509\
+goto exit;
+
+:tasn1
+copy /s z:\tasn1\ c:\tasn1\
+goto exit;
+
+:tasn1del
+del /s c:\tasn1\
+goto exit;
+
+:twtlscert
+copy /s z:\twtlscert\ c:\twtlscert\
+goto exit;
+
+:twtlscertdel
+del /s c:\twtlscert\
+goto exit;
+
+:tpkixcert
+copy /s z:\tpkixcert\ c:\tpkixcert\
+copy /s z:\pkixtestdata\ c:\pkixtestdata\
+goto exit;
+
+:tpkixcertdel
+del c:\pkixtestdata\*.*
+goto exit;
+
+:tpkcs10
+copy /s z:\tpkcs10\ c:\tpkcs10\
+goto exit;
+
+:tpkcs10del
+del /s c:\tpkcs10
+goto exit;
+
+:tpkixcert_tef
+copy /s z:\tpkixcert_tef\ c:\tpkixcert_tef\
+goto exit;
+
+:tpkixcert_tefdel
+del /s c:\tpkixcert_tef
+goto exit;
+
+
+:exit
+
+
+ 
--- a/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/autotesting/sdp_bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -53,9 +53,7 @@
 #include "os/security/securityanddataprivacytools/securityconfig/group/bld.inf"
 #include "os/security/cryptomgmtlibs/securitytestfw/group/bld.inf"
 #include "os/security/contentmgmt/cafrecogniserconfig/bld.inf"
-#ifdef SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
-#include "os/security/contentmgmt/referencedrmagent/refcafhelper/group/bld.inf"
-#endif //SYMBIAN_ENABLE_SDP_WMDRM_SUPPORT
+
 #include "os/security/contentmgmt/contentaccessfwfordrm/group/bld.inf"
 #include "os/security/contentmgmt/cafstreamingsupport/group/bld.inf"
 #include "os/security/contentmgmt/referencedrmagent/RefTestAgent/group/bld.inf"
@@ -68,6 +66,9 @@
 #include "os/security/authorisation/userpromptutils/group/bld.inf"
 
 
+//Test certificates temp added will be removed once filtered good certificates
+#include "os/security/cryptomgmtlibs/securitydocs/doxygen_docs/noncontributed/testcertificates/group/bld.inf"
+
 #ifdef SYMBIAN_AUTH_SERVER
 #include "os/security/authenticationservices/authenticationserver/group/bld.inf"
 #endif
--- a/cryptomgmtlibs/securitytestfw/test/testhandler2/tScriptSetup.cpp	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securitytestfw/test/testhandler2/tScriptSetup.cpp	Wed Aug 18 11:33:05 2010 +0300
@@ -206,7 +206,7 @@
 		else
 			{
 			TPtr scriptFileNameDes = iScriptPath->Des();
-			if (scriptFileNameDes.Right(7) == _L(".script"))
+			if (scriptFileNameDes.Right(8) == _L(".script1"))
 				{
 				iTefScript = ETrue;
 				}
--- a/cryptomgmtlibs/securityutils/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptomgmtlibs/securityutils/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 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"
@@ -34,7 +34,7 @@
 // ROMKIT includes
 ../inc/secutil.iby 	/epoc32/rom/include/secutil.iby
 ../inc/sectcbutil.iby	/epoc32/rom/include/sectcbutil.iby
-../inc/SecSettings.iby			/epoc32/rom/include/SecSettings.iby
+../inc/secsettings.iby			/epoc32/rom/include/secsettings.iby
 
 
 PRJ_TESTEXPORTS
--- a/cryptoplugins/cryptospiplugins/test/h4drv/crypto_h4/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoplugins/cryptospiplugins/test/h4drv/crypto_h4/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -23,8 +23,5 @@
 cryptojobs.mmp
 
 PRJ_TESTEXPORTS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-cryptodriver.h /epoc32/include/cryptodriver.h
-#endif
 
 // End of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/browserrootcertificates/browserrootcerts.mrp	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,9 @@
+component browserrootcertificates
+source \sf\os\security\cryptoservices\browserrootcertificates
+notes_source \component_defs\release.src 
+
+
+#  == IPR section auto-inserted from distribution.policy files  ==
+ipr E 
+
+# == end auto-inserted section ==
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/browserrootcertificates/certconvert.py	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,349 @@
+#
+# 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: 
+# Script to convert the Mozilla certificate store into the store format Symbian OS understands.
+#
+# Mozilla certificate store and its associated license is available at
+# http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+#
+#
+
+import string, getopt, sys, subprocess, glob, os
+
+#
+# Default input files
+#
+inFileMozillaCerts = "certdata.txt"
+inFileTrustMapping = "trustmapping.txt"
+
+#
+# Output path (don't change this!) and other temp files
+#
+outPath = ".\\"
+outFileCaCerts = "cacerts_text.txt"
+outFileCertClients = "certclients_text.txt"
+outCertAppOutput = "output.txt"
+
+#
+# Constants
+#
+ERROR_NONE = 0
+ERROR_EOF = -1
+ERROR_GENERAL = -2
+
+#
+# Class CertRecord
+#
+class CertRecord:
+    def __init__(self, file):
+        self.file = file
+        # Read over the first CKA_CLASS record
+        value = ""
+        self.ReadTokenValue("CKA_CLASS")
+        # Can we assert if value != "CKO_NETSCAPE_BUILTIN_ROOT_LIST"
+
+    # Read and parse next record, return 0 if no more records exist
+    def Next(self):
+        # Read next certificate token
+        err, value = self.ReadTokenValue("CKA_CLASS")
+        if (err == ERROR_EOF):
+            return err
+        if (err != ERROR_NONE or value != "CKO_CERTIFICATE"):
+            return err
+
+        # Read the cert label
+        err, self.certLabel = self.ReadTokenValue("CKA_LABEL")
+        if (err != ERROR_NONE):
+            return err
+
+        # Read the cert type
+        err, self.certType = self.ReadTokenValue("CKA_CERTIFICATE_TYPE")
+        if (err != ERROR_NONE):
+            return err
+
+        # Read the cert serial number
+        err, self.certSerialNum = self.ReadTokenValue("CKA_SERIAL_NUMBER")
+        if (err != ERROR_NONE):
+            return err
+
+        # Read the actual cert data (DER encoded)
+        err, self.certData = self.ReadTokenValue("CKA_VALUE")
+        if (err != ERROR_NONE):
+            return err
+
+        # Read the trust details
+        err, value = self.ReadTokenValue("CKA_CLASS")
+        if (err != ERROR_NONE or value != "CKO_NETSCAPE_TRUST"):
+            return err
+
+        # Read the trust label and match it with cert label
+        err, self.trustLabel = self.ReadTokenValue("CKA_LABEL")
+        if (err != ERROR_NONE or self.trustLabel != self.certLabel):
+            print "Certificate and Trust label mismatch or not found for cert " + self.certLabel
+            return err
+
+        # Read the SHA1 hash (aka thumbprint)
+        err, self.trustSha1Hash = self.ReadTokenValue("CKA_CERT_SHA1_HASH")
+
+        # Read the trust serial number and match it with cert serial number
+        err, self.trustSerialNum = self.ReadTokenValue("CKA_SERIAL_NUMBER")
+        if (err != ERROR_NONE or self.trustSerialNum != self.certSerialNum):
+            print "Warning: Certificate and Trust serial number mismatch or not found for cert " + self.certLabel
+
+        # Read the trust list. This has a variable token so can't use ReadTokenValue method
+        err, self.trustTrustList = self.ReadTrustValues()
+        if (err != ERROR_NONE):
+            return err
+
+        return ERROR_NONE
+
+    def ReadTrustValues(self):
+        # Keep reading lines till token "CKA_TRUST_STEP_UP_APPROVED" found
+        trustList = []
+        for line in self.file:
+            line = line.rstrip('\n')
+            fields = line.split(" ")
+            if (len(fields) == 0):
+                continue
+            if (fields[0] == "CKA_TRUST_STEP_UP_APPROVED"):
+                # Done reading trust settings
+                return ERROR_NONE, trustList
+                break
+            if (fields[1] == "CK_TRUST"):
+                if ((fields[2] == "CKT_NETSCAPE_TRUSTED_DELEGATOR")):
+                    trustList.append(fields[0].strip())
+            else:
+                # Something is wrong
+                print "Error reading trust settings. " + line
+                return ERROR_GENERAL, []
+
+        # End of file?
+        if (line == ""):
+            return ERROR_EOF, ""
+        print "Error in ReadTrustValues(). Token ('CKA_TRUST_STEP_UP_APPROVED') not found!"
+        return ERROR_GENERAL, ""
+
+    def ReadTokenValue(self, token):
+        # Keep reading lines till token found
+        for line in self.file:
+            line = line.rstrip('\n')
+            fields = line.split(" ")
+            if (len(fields) == 0):
+                continue
+            if (fields[0] == token):
+                if (fields[1] != "MULTILINE_OCTAL"):
+                    value = " ".join(fields[2:])
+                    return ERROR_NONE, value
+                else:
+                    # Read multiline octal value till END
+                    value=""
+                    for nextline in self.file:
+                        nextline = nextline.rstrip('\n')
+                        if (nextline == "END"):
+                            break
+                        if (nextline != ""):
+                            # Convert string of octal to binary data
+                            # There must be an easier way than this!
+                            octalWordList = nextline.split("\\")
+                            for octalWord in octalWordList:
+                                if (octalWord != ""):
+                                    value = value + chr(int(octalWord, 8))
+                        else:
+                            print "ReadTokenValue(" + token + ") awaiting END. Unexpected end of file!"
+                            return ERROR_EOF, ""
+                    return ERROR_NONE, value
+
+        #print "ReadTokenValue(" + token + "). Token not found!"
+        return ERROR_EOF, ""
+
+#
+# Global function ReadTrustMapping()
+#
+def ReadTrustMapping(file):
+    trustMapping = []
+    for line in file:
+        line = line.rstrip('\n')
+        if (line == "" or line[0] == "#"):
+            continue
+        fields = line.split(",")
+        if (len(fields) == 0):
+            continue
+        if ((len(fields) % 2) != 1):
+            print "Error in file '%s' in line '%s'\n" % inFileTrustMapping % line
+            return GENERAL_ERROR, [[]]
+        mozTrust = fields[0].strip()
+        for index in range(1, len(fields), 2):
+            appUID = fields[index].strip()
+            appName = fields[index + 1].strip()
+            trustMapping.append([mozTrust, appUID, appName])
+    return ERROR_NONE, trustMapping
+
+#
+# Global function ReadCommandlineArgs()
+#
+def ReadCommandlineArgs(argv):
+    try:
+        flags, args = getopt.getopt(argv[1:], "hm:t:", ["help", "mozilla=", "trust="])
+    except getopt.GetoptError, err:
+        # Print usage
+        print str(err) + "\n"
+        PrintUsage()
+        sys.exit(-1)
+    for flag, arg in flags:
+        if flag in ("-h", "--help"):
+            PrintUsage()
+            sys.exit()
+        elif flag in ("-m", "--mozilla"):
+            globals()["inFileMozillaCerts"] = arg
+        elif flag in ("-t", "--trust"):
+            globals()["inFileTrustMapping"] = arg
+    print "certconvert - This script converts the Mozilla certificate store into Symbian OS certificate store."
+    print "\nInput Mozilla store file: %s" % globals()["inFileMozillaCerts"]
+    print "Input trust mapping: %s" % globals()["inFileTrustMapping"]
+
+#
+#
+#
+def PrintUsage():
+    print "certconvert - This script converts the Mozilla certificate store into Symbian OS certificate store."
+    print "It uses certapp for the conversion so certapp must be in the path."
+    print "Usage: certconvert [-h] | [-m <file> -t <file>] [-o <outpath>]"
+    print "where:"
+    print "-h | --help\tshows this help"
+    print "-m | --mozilla\tis used to specify the Mozilla certificate store input file."
+    print "\t\tIf not specified default is taken as 'certdata.txt'."
+    print "-t | --trust\tis used to specify the input trust mapping input file."
+    print "\t\tThis file maps the trust settings from the Mozilla store to "
+    print "\t\tSymbian's applications and uids."
+    print "\t\tIf not specified default is taken as 'trustmapping.txt'."
+
+#
+# Main starts here
+#
+
+# Read and process command line arguments
+ReadCommandlineArgs(sys.argv)
+
+# First read the trust mappings file
+print "Reading trust mapping file...",
+file = open(inFileTrustMapping, "r")
+err, trustMapping = ReadTrustMapping(file)
+if (err != ERROR_NONE):
+    print "\nError reading trust mapping file!\n"
+    sys.exit(-1)
+file.close()
+print "done."
+
+print "Reading Mozilla certificate store and processing certificates",
+inFileMoz=open(inFileMozillaCerts, "r")
+record = CertRecord(inFileMoz)
+inRecNum = outRecNum = 0
+while (record.Next() == ERROR_NONE):
+    inRecNum = inRecNum + 1
+    #print "Read record %d: %s" % (inRecNum, record.certLabel)
+    # Do filtering of records (if any)
+    
+    outRecNum = outRecNum + 1
+    # Create the human readable filecertstore entry
+    if (outRecNum == 1):
+        if (os.path.exists(outPath) == False):
+            os.makedirs(outPath)
+        if (os.path.exists(outPath + "\\certs") == False):
+            os.makedirs(outPath + "\\certs")
+        outFileSym = open(outPath + outFileCaCerts, "w")
+        outFileSym.write("StartCertStoreEntries\n")
+
+    outFileSym.write("\t# Entry %d\n" % outRecNum)
+
+    # Write out the SHA1 hash of the certificate (to make it easier to compare certs)
+    # Convert to hex
+    sha1hash = ""
+    #octalWordList = record.trustSha1Hash.split("\\")
+    for index in range(0, len(record.trustSha1Hash)):
+        hexdigits = hex(ord(record.trustSha1Hash[index]))[2:]
+        hexdigits = hexdigits.zfill(2)
+        sha1hash = sha1hash + hexdigits + " "
+    outFileSym.write("\t# Thumbprint(hex) %s\n" % sha1hash)
+
+    outFileSym.write("\tStartEntry " + record.certLabel + "\n")
+    outFileSym.write("\t\tDeletable true\n")
+    outFileSym.write("\t\tFormat EX509Certificate\n")
+    outFileSym.write("\t\tCertOwnerType ECACertificate\n")
+    outFileSym.write("\t\tSubjectKeyId auto\n")
+    outFileSym.write("\t\tIssuerKeyId auto\n")
+
+    # Write out trust details
+    outFileSym.write("\t\tStartApplicationList\n")
+    for trust in record.trustTrustList:
+        # Look for the mapping
+        for mapping in trustMapping:
+            if (trust == mapping[0]):
+                # Found a mapping. Add it and keep on looking since
+                # there could be more than one app mapping
+                outFileSym.write('\t\t\tApplication "' + mapping[2] + '"\n');
+    outFileSym.write("\t\tEndApplicationList\n")
+    outFileSym.write("\t\tTrusted true\n")
+    certFileName = "certs\\\\cert%04d" % outRecNum + ".der"
+    outFileSym.write('\t\tDataFileName "' + certFileName + '"\n')
+    outFileSym.write("\tEndEntry\n\n")
+    # Write the certificate file
+    outFileCert = open(outPath + certFileName, "wb")
+    outFileCert.write(record.certData)
+    outFileCert.close()
+    print ".",
+
+if (outRecNum > 0):
+    outFileSym.write("EndCertStoreEntries\n")
+    outFileSym.close()
+print "done."
+
+# Finally create the app to uid mapping file for Symbian OS
+if (outRecNum > 0):
+    outFileSym = open(outPath + outFileCertClients, "w")
+    outFileSym.write("StartClientInfo\n")
+    for index in range(0, len(trustMapping)):
+        outFileSym.write("\t#Entry %d\n" % (index + 1))
+        outFileSym.write("\t\tUid %s\n" % trustMapping[index][1])
+        outFileSym.write('\t\tName "%s"\n' % trustMapping[index][2])
+    outFileSym.write("EndClientInfo\n")
+    outFileSym.close()
+inFileMoz.close()
+
+print "Invoking certapp tool to create the Symbian certificate store...",
+certappCmd = "certapp" + \
+             " --in --hca=" + outPath + outFileCaCerts + " --hcc=" + outPath + outFileCertClients + \
+             " --out --bca=" + outPath + "cacerts.dat" + " --bcc=" + outPath + "certclients.dat"
+
+dummyFile = open(outPath + outCertAppOutput, "w")
+p = subprocess.Popen(certappCmd, 0, None, None, dummyFile, dummyFile)
+retcode = p.wait()
+dummyFile.close()
+
+if (retcode != 0):
+    print "\ncertapp returned error code: %d" % retcode
+    print certappCmd
+    print "For details see file " + outPath + outCertAppOutput
+    print "Leaving temp files untouched for debugging"
+else:
+    print "done."
+    print "Cleaning up temp files...",
+    files = glob.glob(outPath + "certs\\*")
+    for file in files:
+       os.remove(file)
+    os.rmdir(outPath + "certs")
+    os.remove(outPath + outFileCaCerts)
+    os.remove(outPath + outFileCertClients)
+    os.remove(outPath + outCertAppOutput)
+    print "done."
+    print "Done. Read %d" % inRecNum + " certificates. Written %d" % outRecNum + " certificates.\n"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/browserrootcertificates/readme.txt	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,5 @@
+This component just contains the python script to convert the Mozilla root certificate store into the file format that can be used by the Symbian OS file-based certificates store.
+
+The latest Mozilla certificate store can be obtained from http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+
+After fetching the above certificate store file (certdata.txt) run the script (certconvert.py --help) for more information.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/browserrootcertificates/trustmapping.txt	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,21 @@
+#
+# Trust mapping file used by the certconvert.py script to match the Mozilla certificate trust to Symbian's application uid and name
+# The fomat is:
+# <Mozilla Trust Entry>[, <Symbian app UID>, <Name>]
+#
+
+CKA_TRUST_DIGITAL_SIGNATURE
+CKA_TRUST_NON_REPUDIATION
+CKA_TRUST_KEY_ENCIPHERMENT
+CKA_TRUST_DATA_ENCIPHERMENT
+CKA_TRUST_KEY_AGREEMENT
+CKA_TRUST_KEY_CERT_SIGN
+CKA_TRUST_CRL_SIGN
+CKA_TRUST_SERVER_AUTH, 0x1000183D, Server Authentication, 0x1000A8B6, OCSP
+CKA_TRUST_CLIENT_AUTH
+CKA_TRUST_CODE_SIGNING, 0x101F9B28, MIDlet Installation
+CKA_TRUST_EMAIL_PROTECTION
+CKA_TRUST_IPSEC_END_SYSTEM
+CKA_TRUST_IPSEC_TUNNEL
+CKA_TRUST_IPSEC_USER
+CKA_TRUST_TIME_STAMPING
--- a/cryptoservices/certificateandkeymgmt/group/bld.inf	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -52,14 +52,6 @@
 ../inc/x509constraintext.h			SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(x509constraintext.h)
 
 ../inc/x509keyencoder.h				SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(x509keyencoder.h)
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/x509bitstring.h				/epoc32/include/x509bitstring.h
-#endif
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/pkcs7signedobject.h			/epoc32/include/pkcs7signedobject.h
-#endif
-#endif
 
 ../inc/swicertstore.h           SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(swicertstore.h)
 
@@ -74,9 +66,6 @@
 ../inc/wtlscertchain.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(wtlscertchain.h)
 ../inc/pkcs7excert.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs7excert.h)
 ../inc/pkcs7issuerserial.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(pkcs7issuerserial.h)
-#ifdef SYMBIAN_OLD_EXPORT_LOCATION
-../inc/pkcs7signerinfo.h
-#endif
 
 
 ../inc/cmssignedobject.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(cmssignedobject.h)
@@ -884,12 +873,12 @@
 
 
 // Symbian signed root certs and swi cert store, from top-level rootcerts directory
-../../rootcertificates/SymbianA.der			/epoc32/winscw/c/rootcerts/symbiana.der
-../../rootcertificates/SymbianB.der			/epoc32/winscw/c/rootcerts/symbianb.der
-../../rootcertificates/symbianc.der			/epoc32/winscw/c/rootcerts/symbianc.der
-../../rootcertificates/symbiand.der			/epoc32/winscw/c/rootcerts/symbiand.der
-../../rootcertificates/SymbianSignedCerts.txt	/epoc32/winscw/c/rootcerts/symbiansignedcerts.txt
-../../rootcertificates/swicertstore.dat		/epoc32/winscw/c/rootcerts/swicertstore.dat
+../../rootcertificates/data/SymbianA.der			/epoc32/winscw/c/rootcerts/symbiana.der
+../../rootcertificates/data/SymbianB.der			/epoc32/winscw/c/rootcerts/symbianb.der
+../../rootcertificates/data/symbianc.der			/epoc32/winscw/c/rootcerts/symbianc.der
+../../rootcertificates/data/symbiand.der			/epoc32/winscw/c/rootcerts/symbiand.der
+../../rootcertificates/data/SymbianSignedCerts.txt	/epoc32/winscw/c/rootcerts/symbiansignedcerts.txt
+../../rootcertificates/data/swicertstore.dat		/epoc32/winscw/c/rootcerts/swicertstore.dat
 
 ../tpkcs12intgrtn/inc/tpkcs12integrationserver.iby /epoc32/rom/include/tpkcs12integrationserver.iby
 ../tpkcs7/tpkcs7server.iby /epoc32/rom/include/tpkcs7server.iby
--- a/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/inc/tpkcs12integrationserver.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/certificateandkeymgmt/tpkcs12intgrtn/inc/tpkcs12integrationserver.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -19,9 +19,16 @@
 #define __TPKCS12INTEGRATIONSERVER_IBY__
 
 #include <testexecute.iby>
+// conditionally included to avoid to be included in vasco image creation but needed in h4/h6 image creation
+#ifdef _SERIAL_DOWNLOAD
 #include <pkcs12.iby>
-
-
+#else
+// depends upon x509 certificate chains
+#include <certman.iby>
+// DEF139848 fix - Forward Propogation from Symtb9.1 - Illegal dependency from OCSP to HTTP.
+#include <ocsp.iby>
+file=ABI_DIR\BUILD_DIR\pkcs12.dll	System\Libs\pkcs12.dll
+#endif
 // Programs
 file=ABI_DIR\BUILD_DIR\tpkcs12libtest.exe			System\Libs\tpkcs12libtest.exe
 
--- a/cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/Inc/filetokens.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -30,7 +30,7 @@
 
 #ifdef SYMBIAN_KEYSTORE_USE_AUTH_SERVER
 file=ABI_DIR\BUILD_DIR\fstokenserver_useauth.exe		sys\bin\fstokenserver.exe
-data=\epoc32\data\z\private\10202BE9\200218e6.txt   \private\10202be9\200218e6.txt
+data=EPOCROOT##epoc32\data\z\private\10202be9\200218e6.txt   \private\10202be9\200218e6.txt
 
 #else
 file=ABI_DIR\BUILD_DIR\fstokenserver.exe				sys\bin\fstokenserver.exe
--- a/cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/Inc/filetokenstests.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -277,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 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)
@@ -298,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
 #endif // SYMBIAN_KEYSTORE_USE_AUTH_SERVER
 
 #endif
--- a/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.mmp	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.mmp	Wed Aug 18 11:33:05 2010 +0300
@@ -20,6 +20,7 @@
 /**
  @file
 */
+//RTEST
 #ifdef SYMBIAN_AUTH_SERVER
 MACRO KEYTOOL=1
 #endif // SYMBIAN_AUTH_SERVER
@@ -74,7 +75,7 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 #ifdef SYMBIAN_AUTH_SERVER
-SYSTEMINCLUDE	/epoc32/include/ct
+SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(ct)
 #endif // SYMBIAN_AUTH_SERVER
 
 LIBRARY	euser.lib efsrv.lib 
--- a/cryptoservices/filebasedcertificateandkeystores/test/ttesttools/ttesttoolserver.cpp	Tue Jul 06 16:21:56 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/test/ttesttools/ttesttoolserver.cpp	Wed Aug 18 11:33:05 2010 +0300
@@ -16,18 +16,6 @@
 */
 
 
-#include <c32comm.h>
-
-#if defined (__WINS__)
-#define PDD_NAME		_L("ECDRV")
-#else
-#define PDD_NAME		_L("EUART1")
-#define PDD2_NAME		_L("EUART2")
-#define PDD3_NAME		_L("EUART3")
-#define PDD4_NAME		_L("EUART4")
-#endif
-
-#define LDD_NAME		_L("ECOMM")
 
 /**
  * @file
@@ -54,22 +42,6 @@
 	return server;
 	}
 
-static void InitCommsL()
-    {
-    TInt ret = User::LoadPhysicalDevice(PDD_NAME);
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-
-#ifndef __WINS__
-    ret = User::LoadPhysicalDevice(PDD2_NAME);
-    ret = User::LoadPhysicalDevice(PDD3_NAME);
-    ret = User::LoadPhysicalDevice(PDD4_NAME);
-#endif
-
-    ret = User::LoadLogicalDevice(LDD_NAME);
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-    ret = StartC32();
-    User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret);
-    }
 
 LOCAL_C void MainL()
 	{
@@ -78,7 +50,6 @@
 	RProcess().DataCaging(RProcess::EDataCagingOn);
 	RProcess().SecureApi(RProcess::ESecureApiOn);
 #endif
-	InitCommsL();
 	
 	CActiveScheduler* sched=NULL;
 	sched=new(ELeave) CActiveScheduler;
Binary file cryptoservices/rootcertificates/data/SymbianA.der has changed
Binary file cryptoservices/rootcertificates/data/SymbianB.der has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/data/SymbianSignedCerts.txt	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,103 @@
+# SymbianSignedCerts.txt
+#
+# Populates the SWI cert store with the Symbian Signed certificates
+
+[SymbianA]
+file = c:\rootcerts\SymbianA.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianB]
+file = c:\rootcerts\SymbianB.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianC]
+file = c:\rootcerts\SymbianC.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
+
+[SymbianD]
+file = c:\rootcerts\SymbianD.der
+capability = TCB
+capability = CommDD
+capability = PowerMgmt
+capability = MultimediaDD
+capability = ReadDeviceData
+capability = WriteDeviceData
+capability = DRM
+capability = TrustedUI
+capability = ProtServ
+capability = DiskAdmin
+capability = NetworkControl
+capability = AllFiles
+capability = SwEvent
+capability = NetworkServices
+capability = LocalServices
+capability = ReadUserData
+capability = WriteUserData
+capability = Location
+capability = SurroundingsDD
+capability = UserEnvironment
+application = SWInstall
+application = SWInstallOCSP
Binary file cryptoservices/rootcertificates/data/swicertstore.dat has changed
Binary file cryptoservices/rootcertificates/data/symbianc.der has changed
Binary file cryptoservices/rootcertificates/data/symbiand.der has changed
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/bld.inf	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,32 @@
+/*
+* 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: 
+* Exports SWI certificate store 
+*
+*/
+
+/**
+ @file
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+../data/swicertstore.dat  /epoc32/release/winscw/udeb/Z/resource/swicertstore.dat
+../data/swicertstore.dat  /epoc32/release/winscw/urel/Z/resource/swicertstore.dat
+../data/swicertstore.dat  /epoc32/data/z/resource/swicertstore.dat
+
+// ROMKIT includes
+rootcerts.iby 	/epoc32/rom/include/rootcerts.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* 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 
+*/
+
+#ifndef __ROOTCERTS_IBY__
+#define __ROOTCERTS_IBY__
+
+data=ZRESOURCE\swicertstore.dat resource\swicertstore.dat
+
+#endif // __ROOTCERTS_IBY__
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/group/rootcerts.mrp	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,8 @@
+component rootcerts
+source \sf\os\security\cryptoservices\rootcertificates
+exports \sf\os\security\cryptoservices\rootcertificates\group
+notes_source \component_defs\release.src 
+
+
+ipr E 
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cryptoservices/rootcertificates/rootcerts.history.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relnotes name="Certificate and Key Management">
+  <purpose>
+    Certificate management supporting public key cryptography including storage and retrieval, assignment of trust status, certificate chain construction, validation and revocation.
+  </purpose>
+
+  <minorchange revision="001">
+    Symbian C and Symbian D certificates added to the source tree and swicertstore.dat.
+  </minorchange>
+</relnotes>
--- a/package_definition.xml	Tue Jul 06 16:21:56 2010 +0300
+++ b/package_definition.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -2,7 +2,7 @@
 <SystemDefinition schema="3.0.0">
   <package id="security" name="OS Security" levels="physical-abstraction plugins libraries management services utilities">
 	<collection id="authenticationservices" name="Authentication Services" level="utilities">
-      <component id="authenticationserver" name="Authentication Server" introduced="^3" purpose="optional">
+      <component id="authenticationserver" name="Authentication Server" introduced="^4" purpose="optional">
         <unit bldFile="authenticationservices/authenticationserver/group" mrp="authenticationservices/authenticationserver/group/security_authserver.mrp"/>
       </component>
     </collection>
@@ -73,6 +73,12 @@
       <component id="filebasedcertificateandkeystores" name="File-based Certificate and Key Stores" introduced="8.0" purpose="optional">
         <unit bldFile="cryptoservices/filebasedcertificateandkeystores/group" mrp="cryptoservices/filebasedcertificateandkeystores/group/security_filetokens.mrp"/>
       </component>
+      <component id="rootcertificates" name="Root Certificates" introduced="7.0s" purpose="optional" filter="sf_build">
+        <unit bldFile="cryptoservices/rootcertificates/group" mrp="cryptoservices/rootcertificates/group/rootcerts.mrp"/>
+      </component>
+      <component id="browserrootcertificates" name="Browser Root Certificates" introduced="^2" purpose="optional" filter="sf_build">
+        <unit mrp="cryptoservices/browserrootcertificates/browserrootcerts.mrp"/>
+      </component>
       <component id="asnpkcs" name="ASN PKCS" introduced="8.0" purpose="optional">
         <unit bldFile="cryptoservices/asnpkcs/group" mrp="cryptoservices/asnpkcs/group/security_asnpkcs.mrp"/>
       </component>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="os"/>
--- a/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/securityanddataprivacytools/securityconfig/ocsp/ocspcenrep.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -19,7 +19,7 @@
 #ifndef __OCSPCENREP_IBY__
 #define __OCSPCENREP_IBY__
 
-data=ZPRIVATE\10202BE9\2002b28b.txt private\10202be9\2002b28b.txt
+data=ZPRIVATE\10202be9\2002b28b.txt private\10202be9\2002b28b.txt
 
 #endif // __OCSPCENREP_IBY__
 
--- a/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/securityanddataprivacytools/securityconfig/tlsprovider/tlsproviderconfig.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 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"
@@ -22,6 +22,6 @@
 
 data=ZRESOURCE\tlsproviderpolicy.ini 	\Resource\tlsproviderpolicy.ini
 data=MULTI_LINGUIFY(RSC ZRESOURCE\swtlstokentype resource\swtlstokentype)
-data=MULTI_LINGUIFY(RSC ZRESOURCE\TlsCacheServer\TlsCacheTimeouts resource\TlsCacheServer\TlsCacheTimeouts)
+data=MULTI_LINGUIFY(RSC ZRESOURCE\tlscacheserver\tlscachetimeouts resource\tlscacheserver\tlscachetimeouts)
 
 #endif
--- a/securityanddataprivacytools/securityconfig/ups/ups_config.iby	Tue Jul 06 16:21:56 2010 +0300
+++ b/securityanddataprivacytools/securityconfig/ups/ups_config.iby	Wed Aug 18 11:33:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 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"
@@ -19,10 +19,10 @@
 
 #ifndef __UPS_CONFIG_IBY__
 #define __UPS_CONFIG_IBY__
-define ZDRIVE EPOCROOT##epoc32\data\Z
+define ZDRIVE EPOCROOT##epoc32\data\z
 
 data=ZDRIVE\system\install\upsserver.sis 		system\install\upsserver.sis
-data=ZDRIVE\Private\10283558\backup_registration.xml	private\10283558\backup_registration.xml
+data=ZDRIVE\private\10283558\backup_registration.xml	private\10283558\backup_registration.xml
 
 #endif
 
--- a/securityanddataprivacytools/securitytools/certapp/group/certapp.mmp	Tue Jul 06 16:21:56 2010 +0300
+++ b/securityanddataprivacytools/securitytools/certapp/group/certapp.mmp	Wed Aug 18 11:33:05 2010 +0300
@@ -50,11 +50,11 @@
 
 USERINCLUDE .. ../utils ../store-- ../encdec
 
-SYSTEMINCLUDE ../store--
+USERINCLUDE ../store--
 
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-SYSTEMINCLUDE ../../openssllib/import/inc/openssl
-SYSTEMINCLUDE ../../openssllib/import/inc
+USERINCLUDE ../../openssllib/import/inc/openssl
+USERINCLUDE ../../openssllib/import/inc
 
 #ifndef TOOLS2_LINUX
 STATICLIBRARY		eay32 zlib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_4_0-1.dtd	Wed Aug 18 11:33:05 2010 +0300
@@ -0,0 +1,86 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>