--- a/cryptoservices/certificateandkeymgmt/tcertstore/scripts/swicertstore1hw.ini	Fri Nov 06 13:21:00 2009 +0200
+++ b/cryptoservices/certificateandkeymgmt/tcertstore/scripts/swicertstore1hw.ini	Tue Nov 24 09:06:03 2009 +0200
@@ -1,3 +1,6 @@
+[SEC-TCERTSTORE-SWICERTSTORE1HW-2-001]
+<actionbody>
+	<filter>
 	<ownertype>ca</ownertype>
 	</filter>
 </actionbody>
@@ -6,10 +9,9 @@
 	<CCTCertInfo><label>SymbianTestDSACA</label><readonly>True</readonly></CCTCertInfo>
 	<CCTCertInfo><label>SymbianTestRSACA</label><readonly>True</readonly></CCTCertInfo>
 	<CCTCertInfo><label>allcapabilitiesinstall</label><readonly>True</readonly></CCTCertInfo>
-
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-20-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-3-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>
@@ -17,29 +19,29 @@
 	<systemupgrade>ETrue</systemupgrade>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-3-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-4-001]
 <actionbody>
 	<filter>
 	<ownertype>user</ownertype>
 	</filter>
 </actionbody>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-4-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-5-001]
 <actionbody>
 	<label>Root5CA</label>
 </actionbody>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-5-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-6-001]
 <actionbody>
 	<label>SymbianTestDSACA</label>
 </actionbody>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-6-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-7-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-7-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-8-001]
 <actionbody>
 	<label>Root5CA</label>
 </actionbody>
@@ -47,7 +49,7 @@
 	<uid>268452523</uid>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-8-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-9-001]
 <actionbody>
 	<label>Root5CA</label>
 </actionbody>
@@ -55,7 +57,7 @@
 	<trust>1</trust>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-9-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-10-001]
 <actionbody>
 	<label>SymbianTestDSACA</label>
 </actionbody>
@@ -63,7 +65,7 @@
 	<uid>268452523 268478646</uid>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-10-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-11-001]
 <actionbody>
 	<label>SymbianTestDSACA</label>
 </actionbody>
@@ -71,7 +73,7 @@
 	<trust>1</trust>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-11-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-12-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>
@@ -79,7 +81,7 @@
 	<uid>268452523 268478646</uid>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-12-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-13-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>
@@ -87,7 +89,7 @@
 	<trust>1</trust>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-13-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-14-001]
 <actionbody>
 	<label>Root5CA</label>
 </actionbody>
@@ -98,7 +100,7 @@
 	<capability>AllFiles</capability>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-14-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-15-001]
 <actionbody>
 	<label>Root5CA</label>
 </actionbody>
@@ -106,7 +108,7 @@
 	<mandatory>EFalse</mandatory>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-15-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-16-001]
 <actionbody>
 	<label>SymbianTestDSACA</label>
 </actionbody>
@@ -117,7 +119,7 @@
 	<capability>Location</capability>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-16-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-17-001]
 <actionbody>
 	<label>SymbianTestDSACA</label>
 </actionbody>
@@ -125,7 +127,7 @@
 	<mandatory>EFalse</mandatory>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-17-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-18-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>
@@ -134,7 +136,7 @@
 	<capability>WriteUserData</capability>
 </actionresult>
 
-[SEC-TCERTSTORE-SWICERTSTORE1-18-001]
+[SEC-TCERTSTORE-SWICERTSTORE1HW-19-001]
 <actionbody>
 	<label>SymbianTestRSACA</label>
 </actionbody>