[PATCH 09/10] Moved sshd_use_approved_ciphers to shared/
Shawn Wells
shawn at redhat.com
Mon Jan 27 16:02:36 UTC 2014
-------------- next part --------------
>From 9400a12ce6a17273065371450c38b089d4e059e6 Mon Sep 17 00:00:00 2001
From: Shawn Wells <shawn at redhat.com>
Date: Thu, 23 Jan 2014 01:23:17 -0500
Subject: [PATCH 09/10] Moved sshd_use_approved_ciphers to shared/
- Tested on RHEL7, updated CPE
- Symlinks
- Added to rhel7 rht-ccp profile
---
RHEL/6/input/checks/sshd_use_approved_ciphers.xml | 31 +----------------------
RHEL/7/input/checks/sshd_use_approved_ciphers.xml | 1 +
RHEL/7/input/profiles/rht-ccp.xml | 2 --
scap-security-guide.spec | 2 ++
shared/oval/sshd_use_approved_ciphers.xml | 31 +++++++++++++++++++++++
5 files changed, 35 insertions(+), 32 deletions(-)
mode change 100644 => 120000 RHEL/6/input/checks/sshd_use_approved_ciphers.xml
create mode 120000 RHEL/7/input/checks/sshd_use_approved_ciphers.xml
create mode 100644 shared/oval/sshd_use_approved_ciphers.xml
diff --git a/RHEL/6/input/checks/sshd_use_approved_ciphers.xml b/RHEL/6/input/checks/sshd_use_approved_ciphers.xml
deleted file mode 100644
index 2ec19d0..0000000
--- a/RHEL/6/input/checks/sshd_use_approved_ciphers.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<def-group>
- <definition class="compliance" id="sshd_use_approved_ciphers" version="1">
- <metadata>
- <title>Use Only Approved Ciphers</title>
- <affected family="unix">
- <platform>Red Hat Enterprise Linux 6</platform>
- </affected>
- <description>Limit the ciphers to those which are FIPS-approved and only
- use ciphers in counter (CTR) mode.</description>
- <reference source="MED" ref_id="20130813" ref_url="test_attestation" />
- </metadata>
- <criteria comment="SSH is not being used or conditions are met"
- operator="OR">
- <extend_definition comment="sshd service is disabled"
- definition_ref="service_sshd_disabled" />
- <criterion comment="Check ClientAliveInterval in /etc/ssh/sshd_config"
- test_ref="test_sshd_use_approved_ciphers" />
- </criteria>
- </definition>
- <ind:textfilecontent54_test check="all" check_existence="all_exist"
- comment="tests the value of Ciphers setting in the /etc/ssh/sshd_config file"
- id="test_sshd_use_approved_ciphers" version="1">
- <ind:object object_ref="obj_sshd_use_approved_ciphers" />
- </ind:textfilecontent54_test>
- <ind:textfilecontent54_object id="obj_sshd_use_approved_ciphers" version="1">
- <ind:filepath>/etc/ssh/sshd_config</ind:filepath>
- <ind:pattern operation="pattern match">^[\s]*(?i)Ciphers(?-i)[\s]+aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc,aes192-cbc,aes256-cbc[\s]*$</ind:pattern>
- <ind:instance datatype="int">1</ind:instance>
- </ind:textfilecontent54_object>
-</def-group>
diff --git a/RHEL/6/input/checks/sshd_use_approved_ciphers.xml b/RHEL/6/input/checks/sshd_use_approved_ciphers.xml
new file mode 120000
index 0000000..03a2d6a
--- /dev/null
+++ b/RHEL/6/input/checks/sshd_use_approved_ciphers.xml
@@ -0,0 +1 @@
+../../../../shared/oval/sshd_use_approved_ciphers.xml
\ No newline at end of file
diff --git a/RHEL/7/input/checks/sshd_use_approved_ciphers.xml b/RHEL/7/input/checks/sshd_use_approved_ciphers.xml
new file mode 120000
index 0000000..03a2d6a
--- /dev/null
+++ b/RHEL/7/input/checks/sshd_use_approved_ciphers.xml
@@ -0,0 +1 @@
+../../../../shared/oval/sshd_use_approved_ciphers.xml
\ No newline at end of file
diff --git a/RHEL/7/input/profiles/rht-ccp.xml b/RHEL/7/input/profiles/rht-ccp.xml
index 7abca8a..a0e3598 100644
--- a/RHEL/7/input/profiles/rht-ccp.xml
+++ b/RHEL/7/input/profiles/rht-ccp.xml
@@ -133,7 +133,5 @@ SSH / REMOTE ACCESS CHECKS
<select idref="sshd_disable_empty_passwords" selected="true"/>
<select idref="sshd_enable_warning_banner" selected="true"/>
<select idref="sshd_do_not_permit_user_env" selected="true"/>
-<!--
<select idref="sshd_use_approved_ciphers" selected="true"/>
--->
</Profile>
diff --git a/scap-security-guide.spec b/scap-security-guide.spec
index c48e943..f0ab777 100644
--- a/scap-security-guide.spec
+++ b/scap-security-guide.spec
@@ -61,6 +61,8 @@ cp -a RHEL/6/input/auxiliary/scap-security-guide.8 %{buildroot}%{_mandir}/en/man
- OVAL for sshd_disable_root_login
- OVAL for sshd_disable_empty_passwords
- OVAL for sshd_enable_warning_banner
+- OVAL for sshd_do_not_permit_user_env
+- OVAL for sshd_use_approved_ciphers
* Tue Dec 24 2013 Shawn Wells <shawn at redhat.com> 0.1-16.rc2
+ RHEL6 stig-rhel6-server XCCDF profile renamed to stig-rhel6-server-upstream
diff --git a/shared/oval/sshd_use_approved_ciphers.xml b/shared/oval/sshd_use_approved_ciphers.xml
new file mode 100644
index 0000000..04ef3e2
--- /dev/null
+++ b/shared/oval/sshd_use_approved_ciphers.xml
@@ -0,0 +1,31 @@
+<def-group>
+ <definition class="compliance" id="sshd_use_approved_ciphers" version="1">
+ <metadata>
+ <title>Use Only Approved Ciphers</title>
+ <affected family="unix">
+ <platform>Red Hat Enterprise Linux 6</platform>
+ <platform>Red Hat Enterprise Linux 7</platform>
+ </affected>
+ <description>Limit the ciphers to those which are FIPS-approved and only
+ use ciphers in counter (CTR) mode.</description>
+ <reference source="MED" ref_id="20130813" ref_url="test_attestation" />
+ </metadata>
+ <criteria comment="SSH is not being used or conditions are met"
+ operator="OR">
+ <extend_definition comment="sshd service is disabled"
+ definition_ref="service_sshd_disabled" />
+ <criterion comment="Check ClientAliveInterval in /etc/ssh/sshd_config"
+ test_ref="test_sshd_use_approved_ciphers" />
+ </criteria>
+ </definition>
+ <ind:textfilecontent54_test check="all" check_existence="all_exist"
+ comment="tests the value of Ciphers setting in the /etc/ssh/sshd_config file"
+ id="test_sshd_use_approved_ciphers" version="1">
+ <ind:object object_ref="obj_sshd_use_approved_ciphers" />
+ </ind:textfilecontent54_test>
+ <ind:textfilecontent54_object id="obj_sshd_use_approved_ciphers" version="1">
+ <ind:filepath>/etc/ssh/sshd_config</ind:filepath>
+ <ind:pattern operation="pattern match">^[\s]*(?i)Ciphers(?-i)[\s]+aes128-ctr,aes192-ctr,aes256-ctr,aes128-cbc,3des-cbc,aes192-cbc,aes256-cbc[\s]*$</ind:pattern>
+ <ind:instance datatype="int">1</ind:instance>
+ </ind:textfilecontent54_object>
+</def-group>
--
1.8.3.1
More information about the scap-security-guide
mailing list