# HG changeset patch # User Jacob Varughese # Date 1440790670 25200 # Node ID 3ef8b7f4d9d873b479d6b41192265cd48e402011 # Parent 1fb8a14c6702fa27bfd1fda0074f94c4f7bf5a96 21451842 Add Solaris virtualisation platforms to CPE dictionary 21636352 Fix the cpe OVAL checks diff -r 1fb8a14c6702 -r 3ef8b7f4d9d8 components/openscap/files/cpe/openscap-cpe-dict.xml --- a/components/openscap/files/cpe/openscap-cpe-dict.xml Fri Aug 28 11:04:52 2015 -0700 +++ b/components/openscap/files/cpe/openscap-cpe-dict.xml Fri Aug 28 12:37:50 2015 -0700 @@ -4,7 +4,7 @@ --> + xsi:schemaLocation="http://scap.nist.gov/schema/cpe/2.3/ cpe-dictionary_2.3.xsd"> Oracle Solaris oval:com.oracle.solaris.cpe:def:12 + + Oracle Solaris 12 in Global Zone + oval:com.oracle.solaris.cpe:def:120 + + + Oracle Solaris 12 in Non Global Zone + oval:com.oracle.solaris.cpe:def:121 + + + Oracle Solaris 12 in Kernel Zone + oval:com.oracle.solaris.cpe:def:122 + + + Oracle Solaris 12 in Logical Domain + oval:com.oracle.solaris.cpe:def:123 + + + Oracle Solaris 12 in Logical Domain Control Role + oval:com.oracle.solaris.cpe:def:124 + + + Oracle Solaris 12 in Logical Domain I/O Role + oval:com.oracle.solaris.cpe:def:125 + + + Oracle Solaris 12 in Logical Domain Root Role + oval:com.oracle.solaris.cpe:def:126 + + + Oracle Solaris 12 in Logical Domain Service Role + oval:com.oracle.solaris.cpe:def:127 + diff -r 1fb8a14c6702 -r 3ef8b7f4d9d8 components/openscap/files/cpe/openscap-cpe-oval.xml --- 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 @@ Oracle Solaris - 5.9 + 5.11 2015-01-28T13:10:39 @@ -117,10 +117,162 @@ test_ref="oval:com.oracle.solaris.cpe:tst:12" /> + + + Oracle Solaris 12 in Global Zone + + Oracle Solaris + + + Oracle Solaris 12 in Global Zone + + + + + + + + + + Oracle Solaris 12 in Non Global Zone + + Oracle Solaris + + + Oracle Solaris 12 in Non Global Zone + + + + + + + + + + Oracle Solaris 12 in Kernel Zone + + Oracle Solaris + + + Oracle Solaris 12 in Kernel Zone + + + + + + + + + + Oracle Solaris 12 in Logical Domain + + Oracle Solaris + + + Oracle Solaris 12 in Logical Domain + + + + + + + + + + Oracle Solaris 12 in Logical Domain Control Role + + Oracle Solaris + + + Oracle Solaris 12 in Logical Domain Control Role + + + + + + + + + + Oracle Solaris 12 in Logical Domain I/O Role + + Oracle Solaris + + + Oracle Solaris 12 in Logical Domain I/O Role + + + + + + + + + + Oracle Solaris 12 in Logical Domain Root Role + + Oracle Solaris + + + Oracle Solaris 12 in Logical Domain Root Role + + + + + + + + + + Oracle Solaris 12 in Logical Domain Service Role + + Oracle Solaris + + + Oracle Solaris 12 in Logical Domain Service Role + + + + + + + @@ -132,35 +284,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SunOS - ^5.*$ + ^5.*$ SunOS - 5.11 + 5.11 SunOS 11.1 + entity_check="all">5.11 5.11 + entity_check="all">11.1 SunOS 11.2 + entity_check="all">5.11 5.11 + entity_check="all">11.2 SunOS 11.3 + entity_check="all">5.11 5.11 + entity_check="all">11.3 5.12 + + non-global-zone + + + non-global-zone + + + kernel-zone + + + logical-domain + + + logical-domain + control-role + + + logical-domain + io-role + + + logical-domain + root-role + + + logical-domain + service-role +