Merge pull request #1049 from iankko/rhel6_various_nist_suite_fixes

[BugFix] [RHEL/6] Various NIST SCAP content validation test suite fixes
ComplianceAsCode · Feb 22, 2016 · 8cb5e42 · 8cb5e42
2 parents 5703131 + 6490af6
commit 8cb5e42
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/RHEL/6/input/guide.xml b/RHEL/6/input/guide.xml
@@ -43,4 +43,51 @@ respective companies.</rear-matter>
 <platform idref="cpe:/o:redhat:enterprise_linux:6" />
 <platform idref="cpe:/o:redhat:enterprise_linux:6::client" />
 <version>0.9</version>
+<metadata>
+	<dc:publisher>SCAP Security Guide Project</dc:publisher>
+	<dc:creator>SCAP Security Guide Project</dc:creator>
+	<dc:contributor>Gabe Alford</dc:contributor>
+	<dc:contributor>Christopher Anderson</dc:contributor>
+	<dc:contributor>Jeff Blank</dc:contributor>
+	<dc:contributor>Blake Burkhart</dc:contributor>
+	<dc:contributor>Frank Caviggia</dc:contributor>
+	<dc:contributor>Eric Christensen</dc:contributor>
+	<dc:contributor>Caleb Cooper</dc:contributor>
+	<dc:contributor>Nick Crawford</dc:contributor>
+	<dc:contributor>Maura Dailey</dc:contributor>
+	<dc:contributor>Greg Elin</dc:contributor>
+	<dc:contributor>Andrew Gilmore</dc:contributor>
+	<dc:contributor>Jeremiah Jahn</dc:contributor>
+	<dc:contributor>Luke Kordell</dc:contributor>
+	<dc:contributor>Ján Lieskovský</dc:contributor>
+	<dc:contributor>Šimon Lukašík</dc:contributor>
+	<dc:contributor>Michael McConachie</dc:contributor>
+	<dc:contributor>Rodney Mercer</dc:contributor>
+	<dc:contributor>Brian Millett</dc:contributor>
+	<dc:contributor>Michael Moseley</dc:contributor>
+	<dc:contributor>Joe Nall</dc:contributor>
+	<dc:contributor>Michele Newman</dc:contributor>
+	<dc:contributor>Michael Palmiotto</dc:contributor>
+	<dc:contributor>Kenneth Peeples</dc:contributor>
+	<dc:contributor>Martin Preisler</dc:contributor>
+	<dc:contributor>Rick Renshaw</dc:contributor>
+	<dc:contributor>Willy Santos</dc:contributor>
+	<dc:contributor>Satoru Satoh</dc:contributor>
+	<dc:contributor>Ray Shaw</dc:contributor>
+	<dc:contributor>Spencer Shimko</dc:contributor>
+	<dc:contributor>Francisco Slavin</dc:contributor>
+	<dc:contributor>Dave Smith</dc:contributor>
+	<dc:contributor>Kevin Spargur</dc:contributor>
+	<dc:contributor>Kenneth Stailey</dc:contributor>
+	<dc:contributor>Leland Steinke</dc:contributor>
+	<dc:contributor>Paul Tittle</dc:contributor>
+	<dc:contributor>Jeb Trayer</dc:contributor>
+	<dc:contributor>Shawn Wells</dc:contributor>
+	<dc:contributor>Jan Černý</dc:contributor>
+	<dc:contributor>Zbyněk Moravec</dc:contributor>
+	<dc:contributor>Michal Šrubař</dc:contributor>
+	<dc:contributor>Jean-Baptiste Donnette</dc:contributor>
+	<dc:contributor>Philippe Thierry</dc:contributor>
+	<dc:source>https://github.com/OpenSCAP/scap-security-guide/releases/latest</dc:source>
+</metadata>
 </Benchmark>
diff --git a/RHEL/6/input/oval/platform/rhel6-cpe-dictionary.xml b/RHEL/6/input/oval/platform/rhel6-cpe-dictionary.xml
@@ -7,6 +7,11 @@
             <!-- the check references an OVAL file that contains an inventory definition -->
             <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="filename">installed_OS_is_rhel6</check>
       </cpe-item>
+      <cpe-item name="cpe:/o:redhat:enterprise_linux:6::client">
+            <title xml:lang="en-us">Red Hat Enterprise Linux 6 Client</title>
+            <!-- the check references an OVAL file that contains an inventory definition -->
+            <check system="http://oval.mitre.org/XMLSchema/oval-definitions-5" href="filename">installed_OS_is_rhel6</check>
+      </cpe-item>
       <cpe-item name="cpe:/o:centos:centos:6">
             <title xml:lang="en-us">CentOS 6</title>
             <!-- the check references an OVAL file that contains an inventory definition -->