>From 19f0301428e4091129b7550b6bc47229096ff958 Mon Sep 17 00:00:00 2001 From: Shawn Wells Date: Mon, 23 Dec 2013 08:58:44 -0500 Subject: [PATCH 24/25] Adding RHEL7 RHT-CCP profile - Initial draft of RHEL7 CCP profile - Only verified uncommented OVAL checks work Signed-off-by: Shawn Wells --- :100644 100644 9ba82d5... 98e8433... M RHEL/7/Makefile :100644 100644 0df84ce... 9c2ee03... M RHEL/7/input/guide.xslt :000000 100644 0000000... 3424223... A RHEL/7/input/profiles/rht-ccp.xml :100644 000000 ef079b4... 0000000... D RHEL/7/input/profiles/stig-rhel6-server-upstream.xml :000000 100644 0000000... ef079b4... A RHEL/7/input/profiles/stig-rhel7-server-upstream.xml RHEL/7/Makefile | 2 + RHEL/7/input/guide.xslt | 84 +++++++++++++ RHEL/7/input/profiles/rht-ccp.xml | 138 +++++++++++++++++++++ .../input/profiles/stig-rhel6-server-upstream.xml | 7 -- .../input/profiles/stig-rhel7-server-upstream.xml | 7 ++ 5 files changed, 231 insertions(+), 7 deletions(-) diff --git a/RHEL/7/Makefile b/RHEL/7/Makefile index 9ba82d5..98e8433 100644 --- a/RHEL/7/Makefile +++ b/RHEL/7/Makefile @@ -18,6 +18,8 @@ shorthand2xccdf: shorthand-guide oscap xccdf resolve -o $(OUT)/unlinked-rhel7-xccdf.xml $(OUT)/unlinked-unresolved-rhel7-xccdf.xml # xsltproc -stringparam profile "stig-rhel7-server" -o $(OUT)/unlinked-rhel7-xccdf.xml \ # $(TRANS)/xccdf-addrefs.xslt $(OUT)/unlinked-rhel7-xccdf.xml + xsltproc -stringparam profile "rht-ccp" -o $(OUT)/unlinked-rhel7-xccdf.xml \ + $(TRANS)/xccdf-addrefs.xslt $(OUT)/unlinked-rhel7-xccdf.xml # extract manual check instructions from xccdf into an ocil file xsltproc -o $(OUT)/unlinked-rhel7-ocil.xml $(TRANS)/xccdf-create-ocil.xslt $(OUT)/unlinked-rhel7-xccdf.xml xmllint --format --output $(OUT)/unlinked-rhel7-ocil.xml $(OUT)/unlinked-rhel7-ocil.xml diff --git a/RHEL/7/input/guide.xslt b/RHEL/7/input/guide.xslt index 0df84ce..9c2ee03 100644 --- a/RHEL/7/input/guide.xslt +++ b/RHEL/7/input/guide.xslt @@ -9,6 +9,7 @@ + @@ -28,7 +29,13 @@ + + + + + + @@ -36,9 +43,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,3 +129,4 @@ + diff --git a/RHEL/7/input/profiles/rht-ccp.xml b/RHEL/7/input/profiles/rht-ccp.xml new file mode 100644 index 0000000..3424223 --- /dev/null +++ b/RHEL/7/input/profiles/rht-ccp.xml @@ -0,0 +1,138 @@ + +Red Hat Corporate Profile for Certified Cloud Providers (RH CCP) +This is a *draft* SCAP profile for Red Hat Certified Cloud Providers + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/RHEL/7/input/profiles/stig-rhel6-server-upstream.xml b/RHEL/7/input/profiles/stig-rhel6-server-upstream.xml deleted file mode 100644 index ef079b4..0000000 --- a/RHEL/7/input/profiles/stig-rhel6-server-upstream.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Pre-release Draft STIG for RHEL 7 Server -This profile is being developed under the DoD consensus model to become a STIG in coordination with DISA FSO. - - + + -- 1.8.3.1