--- a/components/openscap/files/cpe/openscap-cpe-oval.xml Fri Aug 28 11:04:52 2015 -0700
+++ b/components/openscap/files/cpe/openscap-cpe-oval.xml Fri Aug 28 12:37:50 2015 -0700
@@ -11,7 +11,7 @@
<generator>
<oval:product_name>Oracle Solaris</oval:product_name>
<oval:product_version />
- <oval:schema_version>5.9</oval:schema_version>
+ <oval:schema_version>5.11</oval:schema_version>
<oval:timestamp>2015-01-28T13:10:39</oval:timestamp>
</generator>
<definitions>
@@ -117,10 +117,162 @@
test_ref="oval:com.oracle.solaris.cpe:tst:12" />
</criteria>
</definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:120" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Global Zone</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Global Zone
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Global Zone">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Global Zone"
+ test_ref="oval:com.oracle.solaris.cpe:tst:120" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:121" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Non Global Zone</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Non Global Zone
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Non Global Zone">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Non Global Zone"
+ test_ref="oval:com.oracle.solaris.cpe:tst:121" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:122" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Kernel Zone</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Kernel Zone
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Kernel Zone">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Kernel Zone"
+ test_ref="oval:com.oracle.solaris.cpe:tst:122" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:123" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Logical Domain</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Logical Domain
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Logical Domain">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Logical Domain"
+ test_ref="oval:com.oracle.solaris.cpe:tst:123" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:124" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Logical Domain Control Role</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Logical Domain Control Role
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Logical Domain Control Role">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Logical Domain Control Role"
+ test_ref="oval:com.oracle.solaris.cpe:tst:124" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:125" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Logical Domain I/O Role</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Logical Domain I/O Role
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Logical Domain I/O Role">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Logical Domain I/O Role"
+ test_ref="oval:com.oracle.solaris.cpe:tst:125" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:126" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Logical Domain Root Role</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Logical Domain Root Role
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Logical Domain Root Role">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Logical Domain Root Role"
+ test_ref="oval:com.oracle.solaris.cpe:tst:126" />
+ </criteria>
+ </definition>
+ <definition id="oval:com.oracle.solaris.cpe:def:127" version="1"
+ class="inventory">
+ <metadata>
+ <title>Oracle Solaris 12 in Logical Domain Service Role</title>
+ <affected family="unix">
+ <product>Oracle Solaris</product>
+ </affected>
+ <description>
+ Oracle Solaris 12 in Logical Domain Service Role
+ </description>
+ </metadata>
+ <criteria operator="AND" negate="false"
+ comment="Operating System is Oracle Solaris 12 in Logical Domain Service Role">
+ <criterion comment="Oracle Solaris 12"
+ test_ref="oval:com.oracle.solaris.cpe:tst:12" />
+ <criterion comment="environment is Logical Domain Service Role"
+ test_ref="oval:com.oracle.solaris.cpe:tst:127" />
+ </criteria>
+ </definition>
</definitions>
<tests>
<uname_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
- id="oval:com.oracle.solaris.cpe:tst:1" version="0" check="all"
+ id="oval:com.oracle.solaris.cpe:tst:1" version="1" check="all"
comment="Oracle Solaris" check_existence="all_exist">
<object object_ref="oval:com.oracle.solaris.cpe:obj:1" />
<state state_ref="oval:com.oracle.solaris.cpe:ste:1" />
@@ -132,35 +284,87 @@
<state state_ref="oval:com.oracle.solaris.cpe:ste:11" />
</uname_test>
<uname_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
- id="oval:com.oracle.solaris.cpe:tst:111" version="111" check="all"
+ id="oval:com.oracle.solaris.cpe:tst:111" version="1" check="all"
comment="Oracle Solaris 11.1" check_existence="all_exist">
<object object_ref="oval:com.oracle.solaris.cpe:obj:1" />
<state state_ref="oval:com.oracle.solaris.cpe:ste:111" />
</uname_test>
<uname_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
- id="oval:com.oracle.solaris.cpe:tst:112" version="11" check="all"
+ id="oval:com.oracle.solaris.cpe:tst:112" version="1" check="all"
comment="Oracle Solaris 11.2" check_existence="all_exist">
<object object_ref="oval:com.oracle.solaris.cpe:obj:1" />
<state state_ref="oval:com.oracle.solaris.cpe:ste:112" />
</uname_test>
<uname_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
- id="oval:com.oracle.solaris.cpe:tst:113" version="113" check="all"
+ id="oval:com.oracle.solaris.cpe:tst:113" version="1" check="all"
comment="Oracle Solaris 11.3" check_existence="all_exist">
<object object_ref="oval:com.oracle.solaris.cpe:obj:1" />
<state state_ref="oval:com.oracle.solaris.cpe:ste:113" />
</uname_test>
<uname_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
- id="oval:com.oracle.solaris.cpe:tst:12" version="12" check="all"
+ id="oval:com.oracle.solaris.cpe:tst:12" version="1" check="all"
comment="Oracle Solaris 12" check_existence="all_exist">
<object object_ref="oval:com.oracle.solaris.cpe:obj:1" />
<state state_ref="oval:com.oracle.solaris.cpe:ste:12" />
</uname_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:120" version="1" check="all"
+ comment="environment is Global Zone" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:120" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:121" version="1" check="all"
+ comment="environment is Non Global Zone" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:121" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:122" version="1" check="all"
+ comment="environement is Kernel Zone" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:122" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:123" version="1" check="all"
+ comment="environemnt is Logical Domain" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:123" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:124" version="1" check="all"
+ comment="environment is Logical Domain Control Role" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:124" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:125" version="1" check="all"
+ comment="environment is Logical Domain I/O Role" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:125" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:126" version="1" check="all"
+ comment="environment is Logical Domain Root Role" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:126" />
+ </virtualizationinfo_test>
+ <virtualizationinfo_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:tst:127" version="1" check="all"
+ comment="environment is Logical Domain Service Role" check_existence="all_exist">
+ <object object_ref="oval:com.oracle.solaris.cpe:obj:2" />
+ <state state_ref="oval:com.oracle.solaris.cpe:ste:127" />
+ </virtualizationinfo_test>
</tests>
<objects>
<uname_object
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
id="oval:com.oracle.solaris.cpe:obj:1" version="1"
comment="Oracle Solaris release" />
+ <virtualizationinfo_object
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:obj:2" version="1"
+ comment="Solaris Virtual Environment" />
</objects>
<states>
<uname_state
@@ -169,8 +373,8 @@
comment="Oracle Solaris">
<os_name datatype="string" operation="equals"
entity_check="all">SunOS</os_name>
- <os_version datatype="string" operation="pattern match"
- entity_check="all" >^5.*$</os_version>
+ <os_release datatype="string" operation="pattern match"
+ entity_check="all" >^5.*$</os_release>
</uname_state>
<uname_state
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
@@ -178,8 +382,8 @@
comment="Oracle Solaris 11">
<os_name datatype="string" operation="equals"
entity_check="all">SunOS</os_name>
- <os_version datatype="string" operation="equals"
- entity_check="all">5.11</os_version>
+ <os_release datatype="string" operation="equals"
+ entity_check="all">5.11</os_release>
</uname_state>
<uname_state
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
@@ -188,9 +392,9 @@
<os_name datatype="string" operation="equals"
entity_check="all">SunOS</os_name>
<os_release datatype="string" operation="equals"
- entity_check="all">11.1</os_release>
+ entity_check="all">5.11</os_release>
<os_version datatype="string" operation="equals"
- entity_check="all">5.11</os_version>
+ entity_check="all">11.1</os_version>
</uname_state>
<uname_state
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
@@ -199,9 +403,9 @@
<os_name datatype="string" operation="equals"
entity_check="all">SunOS</os_name>
<os_release datatype="string" operation="equals"
- entity_check="all">11.2</os_release>
+ entity_check="all">5.11</os_release>
<os_version datatype="string" operation="equals"
- entity_check="all">5.11</os_version>
+ entity_check="all">11.2</os_version>
</uname_state>
<uname_state
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
@@ -210,9 +414,9 @@
<os_name datatype="string" operation="equals"
entity_check="all">SunOS</os_name>
<os_release datatype="string" operation="equals"
- entity_check="all">11.3</os_release>
+ entity_check="all">5.11</os_release>
<os_version datatype="string" operation="equals"
- entity_check="all">5.11</os_version>
+ entity_check="all">11.3</os_version>
</uname_state>
<uname_state
xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix"
@@ -223,5 +427,69 @@
<os_release datatype="string" operation="equals"
entity_check="all">5.12</os_release>
</uname_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:120" version="1"
+ comment="environment is Global Zone">
+ <current datatype="string" operation="not equal"
+ entity_check="all">non-global-zone</current>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:121" version="1"
+ comment="environment is Non Global Zone">
+ <current datatype="string" operation="equals"
+ entity_check="all">non-global-zone</current>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:122" version="1"
+ comment="environment is Kernel Zone">
+ <current datatype="string" operation="equals"
+ entity_check="all">kernel-zone</current>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:123" version="1"
+ comment="environment is Logical Domain">
+ <current datatype="string" operation="equals"
+ entity_check="all">logical-domain</current>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:124" version="1"
+ comment="environment is Logical Domain Control Role">
+ <current datatype="string" operation="equals"
+ entity_check="all">logical-domain</current>
+ <ldom-role datatype="string" operation="equals"
+ entity_check="all">control-role</ldom-role>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:125" version="1"
+ comment="environment is Logical Domain I/O Role">
+ <current datatype="string" operation="equals"
+ entity_check="all">logical-domain</current>
+ <ldom-role datatype="string" operation="equals"
+ entity_check="all">io-role</ldom-role>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:126" version="1"
+ comment="environment is Logical Domain Root Role">
+ <current datatype="string" operation="equals"
+ entity_check="all">logical-domain</current>
+ <ldom-role datatype="string" operation="equals"
+ entity_check="all">root-role</ldom-role>
+ </virtualizationinfo_state>
+ <virtualizationinfo_state
+ xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris"
+ id="oval:com.oracle.solaris.cpe:ste:127" version="1"
+ comment="environment is Logical Domain Service Role">
+ <current datatype="string" operation="equals"
+ entity_check="all">logical-domain</current>
+ <ldom-role datatype="string" operation="equals"
+ entity_check="all">service-role</ldom-role>
+ </virtualizationinfo_state>
</states>
</oval_definitions>