Skip to content

Commit 8d48557

Browse files
MarcMilMarcMil
committed
Remove predefined categories
1 parent 395b2d0 commit 8d48557

File tree

4 files changed

+4
-167
lines changed

4 files changed

+4
-167
lines changed

‎soot-infoflow-android/schema/FlowDroidConfiguration.xsd‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</xs:complexType>
3232

3333
<xs:complexType name="sourcesSinksElementType">
34-
<xs:attribute name="id" type="predefinedCategoryId" use="required" />
34+
<xs:attribute name="id" type="xs:string" use="required" />
3535
<xs:attribute name="mode" type="categoryModeType" use="required" />
3636
</xs:complexType>
3737

@@ -49,44 +49,6 @@
4949
</xs:restriction>
5050
</xs:simpleType>
5151

52-
<xs:simpleType name="predefinedCategoryId">
53-
<xs:restriction base="xs:string">
54-
<xs:enumeration value="NO_CATEGORY" />
55-
<xs:enumeration value="HARDWARE_INFO" />
56-
<xs:enumeration value="UNIQUE_IDENTIFIER" />
57-
<xs:enumeration value="LOCATION_INFORMATION" />
58-
<xs:enumeration value="NETWORK_INFORMATION" />
59-
<xs:enumeration value="ACCOUNT_INFORMATION" />
60-
<xs:enumeration value="EMAIL_INFORMATION" />
61-
<xs:enumeration value="FILE_INFORMATION" />
62-
<xs:enumeration value="BLUETOOTH_INFORMATION" />
63-
<xs:enumeration value="VOIP_INFORMATION" />
64-
<xs:enumeration value="VOIP_INFORMATION" />
65-
<xs:enumeration value="DATABASE_INFORMATION" />
66-
<xs:enumeration value="PHONE_INFORMATION" />
67-
<xs:enumeration value="PHONE_CONNECTION" />
68-
<xs:enumeration value="INTER_APP_COMMUNICATION" />
69-
<xs:enumeration value="VOIP" />
70-
<xs:enumeration value="PHONE_STATE" />
71-
<xs:enumeration value="EMAIL" />
72-
<xs:enumeration value="BLUETOOTH" />
73-
<xs:enumeration value="ACCOUNT_SETTINGS" />
74-
<xs:enumeration value="VIDEO" />
75-
<xs:enumeration value="SYNCHRONIZATION_DATA" />
76-
<xs:enumeration value="NETWORK" />
77-
<xs:enumeration value="EMAIL_SETTINGS" />
78-
<xs:enumeration value="FILE" />
79-
<xs:enumeration value="LOG" />
80-
<xs:enumeration value="AUDIO" />
81-
<xs:enumeration value="SMS_MMS" />
82-
<xs:enumeration value="CONTACT_INFORMATION" />
83-
<xs:enumeration value="CALENDAR_INFORMATION" />
84-
<xs:enumeration value="SYSTEM_SETTINGS" />
85-
<xs:enumeration value="IMAGE" />
86-
<xs:enumeration value="BROWSER_INFORMATION" />
87-
<xs:enumeration value="NFC" />
88-
</xs:restriction>
89-
</xs:simpleType>
9052

9153
<xs:simpleType name="layoutMatchingModeType">
9254
<xs:restriction base="xs:string">

‎soot-infoflow-android/schema/SourcesAndSinks.xsd‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xs:element name="field" type="fieldType" />
1818
</xs:choice>
1919
</xs:sequence>
20-
<xs:attribute name="id" type="categoryEnum" use="required" />
20+
<xs:attribute name="id" type="xs:string" use="required" />
2121
<xs:attribute name="description" type="xs:string" use="optional" />
2222
</xs:complexType>
2323

@@ -122,47 +122,6 @@
122122

123123

124124

125-
<!--Special type to describe a potential sink.
126-
Distinguishing between all categories(ALL), sources(NO_CATEGORY-PHONE_INFORMATION), sinks(PHONE_CONNECTION-LOG) and shared (AUDIO-NFC). -->
127-
128-
<xs:simpleType name="categoryEnum">
129-
<xs:restriction base="xs:string">
130-
<xs:enumeration value="ALL" />
131-
<xs:enumeration value="NO_CATEGORY" />
132-
<xs:enumeration value="HARDWARE_INFO" />
133-
<xs:enumeration value="UNIQUE_IDENTIFIER" />
134-
<xs:enumeration value="LOCATION_INFORMATION" />
135-
<xs:enumeration value="NETWORK_INFORMATION" />
136-
<xs:enumeration value="ACCOUNT_INFORMATION" />
137-
<xs:enumeration value="EMAIL_INFORMATION" />
138-
<xs:enumeration value="FILE_INFORMATION" />
139-
<xs:enumeration value="BLUETOOTH_INFORMATION" />
140-
<xs:enumeration value="VOIP_INFORMATION" />
141-
<xs:enumeration value="DATABASE_INFORMATION" />
142-
<xs:enumeration value="PHONE_INFORMATION" />
143-
<xs:enumeration value="PHONE_CONNECTION" />
144-
<xs:enumeration value="INTER_APP_COMMUNINCATION" />
145-
<xs:enumeration value="VOIP" />
146-
<xs:enumeration value="PHONE_STATE" />
147-
<xs:enumeration value="EMAIL" />
148-
<xs:enumeration value="BLUETOOTH" />
149-
<xs:enumeration value="ACCOUNT_SETTINGS" />
150-
<xs:enumeration value="VIDEO" />
151-
<xs:enumeration value="SYNCHRONIZATION_DATA" />
152-
<xs:enumeration value="NETWORK" />
153-
<xs:enumeration value="EMAIL_SETTINGS" />
154-
<xs:enumeration value="FILE" />
155-
<xs:enumeration value="LOG" />
156-
<xs:enumeration value="AUDIO" />
157-
<xs:enumeration value="SMS_MMS" />
158-
<xs:enumeration value="CONTACT_INFORMATION" />
159-
<xs:enumeration value="CALENDAR_INFORMATION" />
160-
<xs:enumeration value="SYSTEM_SETTINGS" />
161-
<xs:enumeration value="IMAGE" />
162-
<xs:enumeration value="BROWSER_INFORMATION" />
163-
<xs:enumeration value="NFC" />
164-
</xs:restriction>
165-
</xs:simpleType>
166125

167126

168127
</xs:schema>

‎soot-infoflow-cmd/schema/FlowDroidConfiguration.xsd‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</xs:complexType>
3232

3333
<xs:complexType name="sourcesSinksElementType">
34-
<xs:attribute name="id" type="predefinedCategoryId" use="required" />
34+
<xs:attribute name="id" type="xs:string" use="required" />
3535
<xs:attribute name="mode" type="categoryModeType" use="required" />
3636
</xs:complexType>
3737

@@ -49,45 +49,6 @@
4949
</xs:restriction>
5050
</xs:simpleType>
5151

52-
<xs:simpleType name="predefinedCategoryId">
53-
<xs:restriction base="xs:string">
54-
<xs:enumeration value="NO_CATEGORY" />
55-
<xs:enumeration value="HARDWARE_INFO" />
56-
<xs:enumeration value="UNIQUE_IDENTIFIER" />
57-
<xs:enumeration value="LOCATION_INFORMATION" />
58-
<xs:enumeration value="NETWORK_INFORMATION" />
59-
<xs:enumeration value="ACCOUNT_INFORMATION" />
60-
<xs:enumeration value="EMAIL_INFORMATION" />
61-
<xs:enumeration value="FILE_INFORMATION" />
62-
<xs:enumeration value="BLUETOOTH_INFORMATION" />
63-
<xs:enumeration value="VOIP_INFORMATION" />
64-
<xs:enumeration value="VOIP_INFORMATION" />
65-
<xs:enumeration value="DATABASE_INFORMATION" />
66-
<xs:enumeration value="PHONE_INFORMATION" />
67-
<xs:enumeration value="PHONE_CONNECTION" />
68-
<xs:enumeration value="INTER_APP_COMMUNICATION" />
69-
<xs:enumeration value="VOIP" />
70-
<xs:enumeration value="PHONE_STATE" />
71-
<xs:enumeration value="EMAIL" />
72-
<xs:enumeration value="BLUETOOTH" />
73-
<xs:enumeration value="ACCOUNT_SETTINGS" />
74-
<xs:enumeration value="VIDEO" />
75-
<xs:enumeration value="SYNCHRONIZATION_DATA" />
76-
<xs:enumeration value="NETWORK" />
77-
<xs:enumeration value="EMAIL_SETTINGS" />
78-
<xs:enumeration value="FILE" />
79-
<xs:enumeration value="LOG" />
80-
<xs:enumeration value="AUDIO" />
81-
<xs:enumeration value="SMS_MMS" />
82-
<xs:enumeration value="CONTACT_INFORMATION" />
83-
<xs:enumeration value="CALENDAR_INFORMATION" />
84-
<xs:enumeration value="SYSTEM_SETTINGS" />
85-
<xs:enumeration value="IMAGE" />
86-
<xs:enumeration value="BROWSER_INFORMATION" />
87-
<xs:enumeration value="NFC" />
88-
</xs:restriction>
89-
</xs:simpleType>
90-
9152
<xs:simpleType name="layoutMatchingModeType">
9253
<xs:restriction base="xs:string">
9354
<xs:enumeration value="NoMatch" />

‎soot-infoflow-cmd/schema/SourcesAndSinks.xsd‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<xs:element name="field" type="fieldType" />
1818
</xs:choice>
1919
</xs:sequence>
20-
<xs:attribute name="id" type="categoryEnum" use="required" />
20+
<xs:attribute name="id" type="xs:string" use="required" />
2121
<xs:attribute name="description" type="xs:string" use="optional" />
2222
</xs:complexType>
2323

@@ -113,49 +113,4 @@
113113
</xs:complexType>
114114

115115

116-
117-
118-
<!--Special type to describe a potential sink.
119-
Distinguishing between all categories(ALL), sources(NO_CATEGORY-PHONE_INFORMATION), sinks(PHONE_CONNECTION-LOG) and shared (AUDIO-NFC). -->
120-
121-
<xs:simpleType name="categoryEnum">
122-
<xs:restriction base="xs:string">
123-
<xs:enumeration value="ALL" />
124-
<xs:enumeration value="NO_CATEGORY" />
125-
<xs:enumeration value="HARDWARE_INFO" />
126-
<xs:enumeration value="UNIQUE_IDENTIFIER" />
127-
<xs:enumeration value="LOCATION_INFORMATION" />
128-
<xs:enumeration value="NETWORK_INFORMATION" />
129-
<xs:enumeration value="ACCOUNT_INFORMATION" />
130-
<xs:enumeration value="EMAIL_INFORMATION" />
131-
<xs:enumeration value="FILE_INFORMATION" />
132-
<xs:enumeration value="BLUETOOTH_INFORMATION" />
133-
<xs:enumeration value="VOIP_INFORMATION" />
134-
<xs:enumeration value="DATABASE_INFORMATION" />
135-
<xs:enumeration value="PHONE_INFORMATION" />
136-
<xs:enumeration value="PHONE_CONNECTION" />
137-
<xs:enumeration value="INTER_APP_COMMUNINCATION" />
138-
<xs:enumeration value="VOIP" />
139-
<xs:enumeration value="PHONE_STATE" />
140-
<xs:enumeration value="EMAIL" />
141-
<xs:enumeration value="BLUETOOTH" />
142-
<xs:enumeration value="ACCOUNT_SETTINGS" />
143-
<xs:enumeration value="VIDEO" />
144-
<xs:enumeration value="SYNCHRONIZATION_DATA" />
145-
<xs:enumeration value="NETWORK" />
146-
<xs:enumeration value="EMAIL_SETTINGS" />
147-
<xs:enumeration value="FILE" />
148-
<xs:enumeration value="LOG" />
149-
<xs:enumeration value="AUDIO" />
150-
<xs:enumeration value="SMS_MMS" />
151-
<xs:enumeration value="CONTACT_INFORMATION" />
152-
<xs:enumeration value="CALENDAR_INFORMATION" />
153-
<xs:enumeration value="SYSTEM_SETTINGS" />
154-
<xs:enumeration value="IMAGE" />
155-
<xs:enumeration value="BROWSER_INFORMATION" />
156-
<xs:enumeration value="NFC" />
157-
</xs:restriction>
158-
</xs:simpleType>
159-
160-
161116
</xs:schema>

0 commit comments

Comments
 (0)