[PATCH] augmented transforms to display CCIs with STIG tables, generate STIG table sorted by CCI * interestingly, some CCIs referenced in the RHEL 5 STIG are not in the OS SRG * and CCIs in the OS SRG are not fully mapped to items in the STIG

[Jeffrey Blank]

Signed-off-by: Jeffrey Blank <bl...@eclipse.ncsc.mil>
---
 rhel6/src/Makefile                         |    1 +
 rhel6/src/transforms/xccdf2table-stig.xslt |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rhel6/src/Makefile b/rhel6/src/Makefile
index 7164870..9aa58c8 100644
--- a/rhel6/src/Makefile
+++ b/rhel6/src/Makefile
@@ -56,6 +56,7 @@ table-srgmap: shorthand-guide shorthand2xccdf
 table-stigs:
        xsltproc -o $(OUT)/rhel5-table-stig.html $(TRANS)/xccdf2table-stig.xslt 
$(REFS)/disa-stig-rhel5-v1r0.6-xccdf.xml  
        xsltproc -o $(OUT)/rhel5-table-stig-manual.html 
$(TRANS)/xccdf2table-stig.xslt $(REFS)/disa-stig-rhel5-v1r0.6-xccdf-manual.xml  
+       xsltproc --html -o $(OUT)/rhel5-table-stig-manual-ccisorted.html 
$(TRANS)/table-sortbyref.xslt $(OUT)/rhel5-table-stig-manual.html 
        xsltproc -o $(OUT)/rhel6-xccdf-stigformat.xml 
$(TRANS)/xccdf2stigformat.xslt $(OUT)/rhel6-xccdf.xml  
        xsltproc -stringparam profile "stig-server" -o 
$(OUT)/rhel6-table-stig-server.html $(TRANS)/xccdf2table-profileccirefs.xslt 
$(OUT)/rhel6-xccdf-stigformat.xml  
 
diff --git a/rhel6/src/transforms/xccdf2table-stig.xslt 
b/rhel6/src/transforms/xccdf2table-stig.xslt
index 068abb7..dea169d 100644
--- a/rhel6/src/transforms/xccdf2table-stig.xslt
+++ b/rhel6/src/transforms/xccdf2table-stig.xslt
@@ -49,6 +49,7 @@
                </style>
                <table>
                        <thead>
+                               <td>CCI</td>
                                <td>V-ID</td>
                                <td>GEN-ID</td>
                                <td>Title</td>
@@ -65,12 +66,12 @@
        <xsl:template name="rule-output">
           <xsl:param name="vulnid"/>
                <tr>
+                       <td> <xsl:value-of select="cdf:Rule/cdf:ident" /></td>
                        <td><xsl:value-of select="@id"/></td> 
-                       <!--<td> <xsl:value-of select="cdf:ident" /></td>-->
                        <td> <xsl:value-of select="cdf:title" /></td>
                        <td> <xsl:value-of select="cdf:Rule/cdf:title" /></td>
                        <td> <xsl:call-template 
name="extract-vulndiscussion"><xsl:with-param name="desc" 
select="cdf:Rule/cdf:description"/></xsl:call-template> </td>
-                       <td> <xsl:apply-templates 
select="cdf:Rule/cdf:fixtext"/> </td>
+                       <td> <xsl:value-of select="cdf:Rule/cdf:fixtext"/> </td>
                        <td> </td>
                </tr>
         </xsl:template>
-- 
1.7.1

_______________________________________________
scap-security-guide mailing list
scap-security-guide@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/scap-security-guide