diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/filebasedcertificateandkeystores/test/ttesttools/scripts/sec-filetokens-tools.ini
--- a/cryptoservices/filebasedcertificateandkeystores/test/ttesttools/scripts/sec-filetokens-tools.ini	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/ttesttools/scripts/sec-filetokens-tools.ini	Thu Sep 10 14:01:51 2009 +0300
@@ -1,310 +1,310 @@
-[certhelp]
-actualoutput=c:\output.txt
-numlines=5
-line0=Usage
-line1= certtool 	 [{-list -l} {-liststores -ls} {-import -i} {-remove -r} 
-line2={-addapps -a } {-setapps} {-removeapps} {-page -p } {-help -h}] {CertificateLabel}
-line3=Type certtool -h {CommandName} for details on a particular command.
-line4=Type certtool -h noninteractive for details on how to run the commands in noninteractive mode.
-
-[certhelp_individual]
-actualoutput=c:\output.txt
-numlines=1
-line0=-liststores | -ls List the certstore implementations available on the device.
-
-[certtool_liststores]
-actualoutput=c:\output.txt
-liststore=1
-
-[certtool_import_store0]
-expectedlabel1=wtls2
-expectedlabel2=c:\tcertstore\ent-wtls2.cer
-
-[certtool_import_store1]
-expectedlabel1=wtls1
-
-[certtool_import_store01twice]
-expectedlabel1=wtls
-numtimes=2
-
-[certtool_import_keycert]
-expectedlabel1=usercert
-
-
-[certtool_setapps]
-expectedlabel1=wtls1
-numapps=2
-apps0=ssl/tls
-apps1=midletinstall
-
-[certtool_addapps]
-expectedlabel1=wtls1
-numapps=3
-apps0=ssl/tls
-apps1=midletinstall
-apps2=swinstall
-
-[certtool_removeapps]
-expectedlabel1=wtls1
-numapps=2
-apps0=midletinstall
-apps1=swinstall
-
-[certtool_list]
-actualoutput=c:\output.txt
-
-[certtool_list_store]
-actualoutput=c:\output.txt
-store=1
-
-[certtool_list_cert]
-expectedlabel1=wtls1
-
-[certtool_list_certowner]
-actualoutput=c:\output.txt
-owner=ca
-
-[certtool_remove1]
-expectedlabel1=wtls
-numtimes=0
-
-[certtool_remove2]
-expectedlabel1=wtls1
-numtimes=0
-
-[certtool_remove3]
-expectedlabel1=wtls2
-numtimes=0
-
-[certtool_removekey]
-expectedlabel1=usercert
-numtimes=0
-
-[keytool_help]
-actualoutput=c:\output.txt
-numlines=5
-line0=Usage
-line1= keytool 	[{-list -l} {-liststores -ls} {-import -i} {-remove -r} 
-line2={-page -p } {-help -h} {-setuser -s} {-setallusers -a} {-removeuser -ru} {-setmanager -m}] {KeyLabel}
-line3=Type keytool -h {CommandName} for details on a particular command.
-line4=Type keytool -h noninteractive for details on how to run the commands in noninteractive mode.
-
-[keytool_help_individual]
-actualoutput=c:\output.txt
-numlines=1
-line0=-setuser uid KeyLabel Sets the given UID as the user of the specified key. UID is interpreted as hexadecimal number.
-
-[keytool_liststores]
-actualoutput=c:\output.txt
-liststore=1
-
-
-[keytool_import_key]
-expectedlabel1=pkcs2
-expectedlabel2=c:\tkeystore\data\pkcs8dsa2.001
-
-[keytool_import_key_store1]
-expectedlabel1=pkcs3
-
-[keytool_import_key_store01twice]
-expectedlabel1=pkcs4
-numtimes=2
-
-[keytool_list]
-actualoutput=c:\output.txt
-
-[keytool_list_store]
-actualoutput=c:\output.txt
-store=0
-
-[keytool_list_key]
-expectedlabel1=pkcs2
-
-[keytool_remove]
-expectedlabel1=pkcs2
-numtimes=0
-
-[keytool_setuser]
-expectedlabel1=pkcs4
-user=1
-expecteduser=305441741
-
-[keytool_setallusers]
-expectedlabel1=pkcs4
-user=1
-expecteduser=All
-
-[keytool_setmanager]
-expectedlabel1=pkcs4
-user=2
-expecteduser=WriteDeviceData
-
-[keytool_removeuser]
-expectedlabel1=pkcs4
-user=1
-expecteduser=271064114
-
-[certtoolkey_keytoolmanage]
-expectedlabel1=pkcs4
-user=1
-expecteduser=305441741
-
-[certtoolkey_keytoolmanage1]
-expectedlabel1=pkcs4
-user=2
-expecteduser=WriteDeviceData
-
-[certtool_helpfail]
-expected=c:\ttesttools\data\output31.txt
-actual=c:\output.txt
-
-[certtool_individual_helpfail]
-expected=c:\ttesttools\data\output32.txt
-actual=c:\output.txt
-
-[certtool_liststoresfail]
-actualoutput=c:\output.txt
-liststore=1
-
-[certtool_import_twicefail]
-actualoutput=c:\output.txt
-expectederror=The given label is invalid, or already present in the certstore.
-
-[certtool_import_emptycertstorefail]
-actualoutput=c:\output.txt
-expectederror=The specified certstore implementation does not exist.
-
-[certtool_import_nonexistfail]
-actualoutput=c:\output.txt
-expectederror=Cannot open certificate file.
-
-[certtool_import_corruptcertfail]
-actualoutput=c:\output.txt
-expectederror=An error occured during certificate import.
-
-[certtool_import_emptycertfail]
-actualoutput=c:\output.txt
-expectederror=The specified certificate file appears to be empty.
-
-[certtool_setapps_invalidfail]
-actualoutput=c:\output.txt
-expectederror=No valid applications specified, try one of
-
-
-[certtool_setapps_userfail]
-actualoutput=c:\output.txt
-expectederror=An Unknown error occured while adding the applicability.
-
-[certtool_addapps_invalidfail]
-actualoutput=c:\output.txt
-expectederror=No valid applications specified, try one of
-
-[certtool_addapps_userfail]
-actualoutput=c:\output.txt
-expectederror=An Unknown error occured while adding the applicability.
-
-[certtool_removeapps_invalidfail]
-actualoutput=c:\output.txt
-expectederror=No valid applications specified, try one of
-
-[certtool_removeapps_untrustfail]
-actualoutput=c:\output.txt
-expectederror=The certificate wan not trusted for application SWInstall.
-
-[certtool_list_fail]
-actualoutput=c:\output.txt
-expectederror=The specified certstore implementation does not exist.
-
-[certtool_list_fail1]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified Certificate
-
-[certtool_list_fail2]
-actualoutput=c:\output.txt
-expectederror=No Certificate Exist
-
-[certtool_remove_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified certificate.
-
-[keytool_liststore_fail]
-expected=c:\ttesttools\data\output52.txt
-actual=c:\output.txt
-
-[keytool_import_fail]
-actualoutput=c:\output.txt
-expectederror=An error occured during key import.
-
-
-[keytool_import_fail1]
-actualoutput=c:\output.txt
-expectederror=The specified keystore implementation does not exist.
-
-[keytool_import_fail2]
-actualoutput=c:\output.txt
-expectederror=Cannot open key file.
-
-[keytool_import_fail3]
-actualoutput=c:\output.txt
-expectederror=An error occured during key import.
-
-[keytool_import_fail4]
-actualoutput=c:\output.txt
-expectederror=The specified key file appears to be empty.
-
-[keytool_setuser_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[keytool_setuser_fail1]
-actualoutput=c:\output.txt
-expectederror=User set failed.
-
-[keytool_setallusers_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[keytool_setallusers_fail1]
-actualoutput=c:\output.txt
-expectederror=AllUsers set failed.
-
-[keytool_setmanager_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[keytool_setmanager_fail1]
-actualoutput=c:\output.txt
-expectederror=manager set failed.
-
-[keytool_removeuser_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[keytool_removeuser_fail1]
-actualoutput=c:\output.txt
-expectederror=Users removal failed.
-
-[keytool_list_fail]
-actualoutput=c:\output.txt
-expectederror=The specified keystore implementation does not exist.
-
-[keytool_list_fail1]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[keytool_remove_fail]
-actualoutput=c:\output.txt
-expectederror=Cannot find the specified key.
-
-[certtool_import]
-expectedlabel1=c:\tcertstore\data\cert_dsa1.der
-
-[certtool_setapps1]
-actualoutput=c:\output.txt
-expectedlabel1=c:\tcertstore\ent-wtls1.cer
-numapps=1
-apps0=SSL/TLS
-
-[certtool_setapps2]
-expectedlabel1=c:\tcertstore\ent-wtls1.cer
+[certhelp]
+actualoutput=c:\output.txt
+numlines=5
+line0=Usage
+line1= certtool 	 [{-list -l} {-liststores -ls} {-import -i} {-remove -r} 
+line2={-addapps -a } {-setapps} {-removeapps} {-page -p } {-help -h}] {CertificateLabel}
+line3=Type certtool -h {CommandName} for details on a particular command.
+line4=Type certtool -h noninteractive for details on how to run the commands in noninteractive mode.
+
+[certhelp_individual]
+actualoutput=c:\output.txt
+numlines=1
+line0=-liststores | -ls List the certstore implementations available on the device.
+
+[certtool_liststores]
+actualoutput=c:\output.txt
+liststore=1
+
+[certtool_import_store0]
+expectedlabel1=wtls2
+expectedlabel2=c:\tcertstore\ent-wtls2.cer
+
+[certtool_import_store1]
+expectedlabel1=wtls1
+
+[certtool_import_store01twice]
+expectedlabel1=wtls
+numtimes=2
+
+[certtool_import_keycert]
+expectedlabel1=usercert
+
+
+[certtool_setapps]
+expectedlabel1=wtls1
+numapps=2
+apps0=ssl/tls
+apps1=midletinstall
+
+[certtool_addapps]
+expectedlabel1=wtls1
+numapps=3
+apps0=ssl/tls
+apps1=midletinstall
+apps2=swinstall
+
+[certtool_removeapps]
+expectedlabel1=wtls1
+numapps=2
+apps0=midletinstall
+apps1=swinstall
+
+[certtool_list]
+actualoutput=c:\output.txt
+
+[certtool_list_store]
+actualoutput=c:\output.txt
+store=1
+
+[certtool_list_cert]
+expectedlabel1=wtls1
+
+[certtool_list_certowner]
+actualoutput=c:\output.txt
+owner=ca
+
+[certtool_remove1]
+expectedlabel1=wtls
+numtimes=0
+
+[certtool_remove2]
+expectedlabel1=wtls1
+numtimes=0
+
+[certtool_remove3]
+expectedlabel1=wtls2
+numtimes=0
+
+[certtool_removekey]
+expectedlabel1=usercert
+numtimes=0
+
+[keytool_help]
+actualoutput=c:\output.txt
+numlines=5
+line0=Usage
+line1= keytool 	[{-list -l} {-liststores -ls} {-import -i} {-remove -r} 
+line2={-page -p } {-help -h} {-setuser -s} {-setallusers -a} {-removeuser -ru} {-setmanager -m}] {KeyLabel}
+line3=Type keytool -h {CommandName} for details on a particular command.
+line4=Type keytool -h noninteractive for details on how to run the commands in noninteractive mode.
+
+[keytool_help_individual]
+actualoutput=c:\output.txt
+numlines=1
+line0=-setuser uid KeyLabel Sets the given UID as the user of the specified key. UID is interpreted as hexadecimal number.
+
+[keytool_liststores]
+actualoutput=c:\output.txt
+liststore=1
+
+
+[keytool_import_key]
+expectedlabel1=pkcs2
+expectedlabel2=c:\tkeystore\data\pkcs8dsa2.001
+
+[keytool_import_key_store1]
+expectedlabel1=pkcs3
+
+[keytool_import_key_store01twice]
+expectedlabel1=pkcs4
+numtimes=2
+
+[keytool_list]
+actualoutput=c:\output.txt
+
+[keytool_list_store]
+actualoutput=c:\output.txt
+store=0
+
+[keytool_list_key]
+expectedlabel1=pkcs2
+
+[keytool_remove]
+expectedlabel1=pkcs2
+numtimes=0
+
+[keytool_setuser]
+expectedlabel1=pkcs4
+user=1
+expecteduser=305441741
+
+[keytool_setallusers]
+expectedlabel1=pkcs4
+user=1
+expecteduser=All
+
+[keytool_setmanager]
+expectedlabel1=pkcs4
+user=2
+expecteduser=WriteDeviceData
+
+[keytool_removeuser]
+expectedlabel1=pkcs4
+user=1
+expecteduser=271064114
+
+[certtoolkey_keytoolmanage]
+expectedlabel1=pkcs4
+user=1
+expecteduser=305441741
+
+[certtoolkey_keytoolmanage1]
+expectedlabel1=pkcs4
+user=2
+expecteduser=WriteDeviceData
+
+[certtool_helpfail]
+expected=c:\ttesttools\data\output31.txt
+actual=c:\output.txt
+
+[certtool_individual_helpfail]
+expected=c:\ttesttools\data\output32.txt
+actual=c:\output.txt
+
+[certtool_liststoresfail]
+actualoutput=c:\output.txt
+liststore=1
+
+[certtool_import_twicefail]
+actualoutput=c:\output.txt
+expectederror=The given label is invalid, or already present in the certstore.
+
+[certtool_import_emptycertstorefail]
+actualoutput=c:\output.txt
+expectederror=The specified certstore implementation does not exist.
+
+[certtool_import_nonexistfail]
+actualoutput=c:\output.txt
+expectederror=Cannot open certificate file.
+
+[certtool_import_corruptcertfail]
+actualoutput=c:\output.txt
+expectederror=An error occured during certificate import.
+
+[certtool_import_emptycertfail]
+actualoutput=c:\output.txt
+expectederror=The specified certificate file appears to be empty.
+
+[certtool_setapps_invalidfail]
+actualoutput=c:\output.txt
+expectederror=No valid applications specified, try one of
+
+
+[certtool_setapps_userfail]
+actualoutput=c:\output.txt
+expectederror=An Unknown error occured while adding the applicability.
+
+[certtool_addapps_invalidfail]
+actualoutput=c:\output.txt
+expectederror=No valid applications specified, try one of
+
+[certtool_addapps_userfail]
+actualoutput=c:\output.txt
+expectederror=An Unknown error occured while adding the applicability.
+
+[certtool_removeapps_invalidfail]
+actualoutput=c:\output.txt
+expectederror=No valid applications specified, try one of
+
+[certtool_removeapps_untrustfail]
+actualoutput=c:\output.txt
+expectederror=The certificate wan not trusted for application SWInstall.
+
+[certtool_list_fail]
+actualoutput=c:\output.txt
+expectederror=The specified certstore implementation does not exist.
+
+[certtool_list_fail1]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified Certificate
+
+[certtool_list_fail2]
+actualoutput=c:\output.txt
+expectederror=No Certificate Exist
+
+[certtool_remove_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified certificate.
+
+[keytool_liststore_fail]
+expected=c:\ttesttools\data\output52.txt
+actual=c:\output.txt
+
+[keytool_import_fail]
+actualoutput=c:\output.txt
+expectederror=An error occured during key import.
+
+
+[keytool_import_fail1]
+actualoutput=c:\output.txt
+expectederror=The specified keystore implementation does not exist.
+
+[keytool_import_fail2]
+actualoutput=c:\output.txt
+expectederror=Cannot open key file.
+
+[keytool_import_fail3]
+actualoutput=c:\output.txt
+expectederror=An error occured during key import.
+
+[keytool_import_fail4]
+actualoutput=c:\output.txt
+expectederror=The specified key file appears to be empty.
+
+[keytool_setuser_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[keytool_setuser_fail1]
+actualoutput=c:\output.txt
+expectederror=User set failed.
+
+[keytool_setallusers_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[keytool_setallusers_fail1]
+actualoutput=c:\output.txt
+expectederror=AllUsers set failed.
+
+[keytool_setmanager_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[keytool_setmanager_fail1]
+actualoutput=c:\output.txt
+expectederror=manager set failed.
+
+[keytool_removeuser_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[keytool_removeuser_fail1]
+actualoutput=c:\output.txt
+expectederror=Users removal failed.
+
+[keytool_list_fail]
+actualoutput=c:\output.txt
+expectederror=The specified keystore implementation does not exist.
+
+[keytool_list_fail1]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[keytool_remove_fail]
+actualoutput=c:\output.txt
+expectederror=Cannot find the specified key.
+
+[certtool_import]
+expectedlabel1=c:\tcertstore\data\cert_dsa1.der
+
+[certtool_setapps1]
+actualoutput=c:\output.txt
+expectedlabel1=c:\tcertstore\ent-wtls1.cer
+numapps=1
+apps0=SSL/TLS
+
+[certtool_setapps2]
+expectedlabel1=c:\tcertstore\ent-wtls1.cer
 trust=1
\ No newline at end of file