diff -r 675a964f4eb5 -r 35751d3474b7 securityanddataprivacytools/securitytools/certapp/test/swi.txt
--- a/securityanddataprivacytools/securitytools/certapp/test/swi.txt	Tue Jul 21 01:04:32 2009 +0100
+++ b/securityanddataprivacytools/securitytools/certapp/test/swi.txt	Thu Sep 10 14:01:51 2009 +0300
@@ -1,72 +1,72 @@
-StartSwiCertStoreEntries
-	StartEntry "SymbianA"
-		Format 42
-		CertOwnerType "ECACertificate" # 0x0
-		StartApplicationList
-			# Entry 1
-				Application "SW Install" # 0x100042ab
-			# Entry 2
-				Application "SW Install OCSP Signing" # 0x1000a8b6
-		EndApplicationList
-		Trusted "true" # 0x1
-		DataFileName "swicertstore_cert0.der"
-		#DataStreamId(read) 0x0
-		CapabilitySet { TCB PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
-		Mandatory "false" # 0x0
-		SystemUpgrade "false" # 0x0
-	EndEntry
-	StartEntry "SymbianB \"with quotes\""
-		Format "EX509Certificate" # 0x0
-		CertOwnerType "ECACertificate" # 0x0
-		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
-		IssuerKeyId auto
-		StartApplicationList
-			# Entry 1
-				Application "SW Install" # 0x100042ab
-			# Entry 2
-				Application "SW Install OCSP Signing" # 0x1000a8b6
-		EndApplicationList
-		Trusted "true" # 0x1
-		DataFileName "swicertstore_cert1.der"
-		#DataStreamId(read) 0x0
-		CapabilitySet { TCB CommDD MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment 0x7f }
-		Mandatory "false" # 0x0
-		SystemUpgrade "false" # 0x0
-	EndEntry
-	StartEntry "SymbianC"
-		Format "EX509Certificate" # 0x0
-		CertOwnerType "ECACertificate" # 0x0
-		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
-		IssuerKeyId auto
-		StartApplicationList
-			# Entry 1
-				Application "SW Install" # 0x100042ab
-			# Entry 2
-				Application "SW Install OCSP Signing" # 0x1000a8b6
-		EndApplicationList
-		Trusted "true" # 0x1
-		DataFileName "swicertstore_cert2.der"
-		#DataStreamId(read) 0x0
-		CapabilitySet { TCB CommDD PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
-		Mandatory "false" # 0x0
-		SystemUpgrade "false" # 0x0
-	EndEntry
-	StartEntry "SymbianD"
-		Format "EX509Certificate" # 0x0
-		CertOwnerType "ECACertificate" # 0x0
-		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
-		IssuerKeyId auto
-		StartApplicationList
-			# Entry 1
-				Application "SW Install" # 0x100042ab
-			# Entry 2
-				Application "SW Install OCSP Signing" # 0x1000a8b6
-		EndApplicationList
-		Trusted "true" # 0x1
-		DataFileName "swicertstore_cert3.der"
-		#DataStreamId(read) 0x0
-		CapabilitySet { TCB CommDD PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
-		Mandatory "false" # 0x0
-		SystemUpgrade "true" # 0x0
-	EndEntry
-EndSwiCertStoreEntries
+StartSwiCertStoreEntries
+	StartEntry "SymbianA"
+		Format 42
+		CertOwnerType "ECACertificate" # 0x0
+		StartApplicationList
+			# Entry 1
+				Application "SW Install" # 0x100042ab
+			# Entry 2
+				Application "SW Install OCSP Signing" # 0x1000a8b6
+		EndApplicationList
+		Trusted "true" # 0x1
+		DataFileName "swicertstore_cert0.der"
+		#DataStreamId(read) 0x0
+		CapabilitySet { TCB PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
+		Mandatory "false" # 0x0
+		SystemUpgrade "false" # 0x0
+	EndEntry
+	StartEntry "SymbianB \"with quotes\""
+		Format "EX509Certificate" # 0x0
+		CertOwnerType "ECACertificate" # 0x0
+		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
+		IssuerKeyId auto
+		StartApplicationList
+			# Entry 1
+				Application "SW Install" # 0x100042ab
+			# Entry 2
+				Application "SW Install OCSP Signing" # 0x1000a8b6
+		EndApplicationList
+		Trusted "true" # 0x1
+		DataFileName "swicertstore_cert1.der"
+		#DataStreamId(read) 0x0
+		CapabilitySet { TCB CommDD MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment 0x7f }
+		Mandatory "false" # 0x0
+		SystemUpgrade "false" # 0x0
+	EndEntry
+	StartEntry "SymbianC"
+		Format "EX509Certificate" # 0x0
+		CertOwnerType "ECACertificate" # 0x0
+		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
+		IssuerKeyId auto
+		StartApplicationList
+			# Entry 1
+				Application "SW Install" # 0x100042ab
+			# Entry 2
+				Application "SW Install OCSP Signing" # 0x1000a8b6
+		EndApplicationList
+		Trusted "true" # 0x1
+		DataFileName "swicertstore_cert2.der"
+		#DataStreamId(read) 0x0
+		CapabilitySet { TCB CommDD PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
+		Mandatory "false" # 0x0
+		SystemUpgrade "false" # 0x0
+	EndEntry
+	StartEntry "SymbianD"
+		Format "EX509Certificate" # 0x0
+		CertOwnerType "ECACertificate" # 0x0
+		SubjectKeyId auto # 'DA:39:A3:EE:5E:6B:4B:0D:32:55:BF:EF:95:60:18:90:AF:D8:07:09'
+		IssuerKeyId auto
+		StartApplicationList
+			# Entry 1
+				Application "SW Install" # 0x100042ab
+			# Entry 2
+				Application "SW Install OCSP Signing" # 0x1000a8b6
+		EndApplicationList
+		Trusted "true" # 0x1
+		DataFileName "swicertstore_cert3.der"
+		#DataStreamId(read) 0x0
+		CapabilitySet { TCB CommDD PowerMgmt MultimediaDD ReadDeviceData WriteDeviceData DRM TrustedUI ProtServ DiskAdmin NetworkControl AllFiles SwEvent NetworkServices LocalServices ReadUserData WriteUserData Location SurroundingsDD UserEnvironment }
+		Mandatory "false" # 0x0
+		SystemUpgrade "true" # 0x0
+	EndEntry
+EndSwiCertStoreEntries