Blame SOURCES/scap-security-guide-0.1.55-sshd_use_approved_macs_stig-PR_6546.patch

d10e36
From 5f8f98024f8955a0327b67f873923757a51d082c Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Tue, 19 Jan 2021 12:32:07 +0100
d10e36
Subject: [PATCH 1/7] add rule and remediations
d10e36
d10e36
---
d10e36
 .../ansible/shared.yml                        | 13 +++++
d10e36
 .../bash/shared.sh                            |  7 +++
d10e36
 .../oval/shared.xml                           | 38 +++++++++++++
d10e36
 .../rule.yml                                  | 57 +++++++++++++++++++
d10e36
 5 files changed, 115 insertions(+), 1 deletion(-)
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/ansible/shared.yml
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/rule.yml
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/ansible/shared.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/ansible/shared.yml
d10e36
new file mode 100644
d10e36
index 0000000000..cefba7db05
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/ansible/shared.yml
d10e36
@@ -0,0 +1,13 @@
d10e36
+# platform = Red Hat Enterprise Linux 7,Oracle Linux 7
d10e36
+# reboot = false
d10e36
+# strategy = restrict
d10e36
+# complexity = low
d10e36
+# disruption = low
d10e36
+
d10e36
+- name: "Configure sshd to use approved MACs"
d10e36
+  lineinfile:
d10e36
+    path: /etc/ssh/sshd_config
d10e36
+    line: 'MACs hmac-sha2-512,hmac-sha2-256'
d10e36
+    state: present
d10e36
+    regexp: '^[\s]*MACs[\s]+(hmac-sha2-512(?=[\w,-@]+|$),?)?(hmac-sha2-256(?=[\w,-@]+|$),?)?[\s]*(?:#.*)?$'
d10e36
+    create: True
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
new file mode 100644
d10e36
index 0000000000..c76190fb96
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+# platform = multi_platform_wrlinux,Red Hat Enterprise Linux 7,Oracle Linux 7
d10e36
+
d10e36
+if grep -q -P '^[[:space:]]*MACs[[:space:]]+' /etc/ssh/sshd_config; then
d10e36
+  sed -i 's/^\s*MACs.*/MACs hmac-sha2-512,hmac-sha2-256/' /etc/ssh/sshd_config
d10e36
+else
d10e36
+  echo "MACs hmac-sha2-512,hmac-sha2-256" >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
new file mode 100644
d10e36
index 0000000000..d7fbd9f0ed
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
@@ -0,0 +1,38 @@
d10e36
+<def-group>
d10e36
+  <definition class="compliance" id="sshd_use_approved_macs_ordered_stig" version="1">
d10e36
+    {{{ oval_metadata("Limit the Message Authentication Codes (MACs) to those which are FIPS-approved.") }}}
d10e36
+    <criteria operator="AND">
d10e36
+      <extend_definition comment="Installed OS is FIPS certified" definition_ref="installed_OS_is_FIPS_certified" />
d10e36
+      
d10e36
+      operator="OR">
d10e36
+        <criteria comment="sshd is not installed" operator="AND">
d10e36
+          
d10e36
+          definition_ref="sshd_not_required_or_unset" />
d10e36
+          
d10e36
+          definition_ref="package_openssh-server_removed" />
d10e36
+        </criteria>
d10e36
+        <criteria comment="sshd is installed and configured" operator="AND">
d10e36
+          
d10e36
+          definition_ref="sshd_required_or_unset" />
d10e36
+          
d10e36
+          definition_ref="package_openssh-server_installed" />
d10e36
+          
d10e36
+          test_ref="test_sshd_use_approved_macs_ordered_stig" />
d10e36
+        </criteria>
d10e36
+      </criteria>
d10e36
+    </criteria>
d10e36
+  </definition>
d10e36
+
d10e36
+  
d10e36
+  comment="tests the value of MACs setting in the /etc/ssh/sshd_config file"
d10e36
+  id="test_sshd_use_approved_macs_ordered_stig" version="1">
d10e36
+    <ind:object object_ref="obj_sshd_use_approved_macs_ordered_stig" />
d10e36
+  </ind:textfilecontent54_test>
d10e36
+
d10e36
+  <ind:textfilecontent54_object id="obj_sshd_use_approved_macs_ordered_stig" version="1">
d10e36
+    <ind:filepath>/etc/ssh/sshd_config</ind:filepath>
d10e36
+    <ind:pattern operation="pattern match">^[\s]*(?i)MACs(?-i)[\s]+(?=[\w,-@]+)(hmac-sha2-512(?=[\w,-@]+|$),?)?(hmac-sha2-256(?=[\w,-@]+|$),?)?[\s]*(?:#.*)?$</ind:pattern>
d10e36
+    <ind:instance datatype="int">1</ind:instance>
d10e36
+  </ind:textfilecontent54_object>
d10e36
+
d10e36
+</def-group>
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/rule.yml
d10e36
new file mode 100644
d10e36
index 0000000000..dc9f7dca7c
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/rule.yml
d10e36
@@ -0,0 +1,57 @@
d10e36
+documentation_complete: true
d10e36
+
d10e36
+prodtype: rhel7
d10e36
+
d10e36
+title: 'Use Only FIPS 140-2 Validated MACs'
d10e36
+
d10e36
+description: |-
d10e36
+    Limit the MACs to those hash algorithms which are FIPS-approved.
d10e36
+    The following line in <tt>/etc/ssh/sshd_config</tt>
d10e36
+    demonstrates use of FIPS-approved MACs:
d10e36
+    
MACs hmac-sha2-512,hmac-sha2-256
d10e36
+    This rule ensures that there are configured MACs mentioned
d10e36
+    above (or their subset), keeping the given order of algorithms.
d10e36
+
d10e36
+rationale: |-
d10e36
+    DoD Information Systems are required to use FIPS-approved cryptographic hash
d10e36
+    functions. The only SSHv2 hash algorithms meeting this requirement is SHA2.
d10e36
+
d10e36
+severity: medium
d10e36
+
d10e36
+identifiers:
d10e36
+    cce@rhel7: CCE-83398-8
d10e36
+
d10e36
+references:
d10e36
+    disa: CCI-000068,CCI-000803,CCI-000877,CCI-001453,CCI-003123
d10e36
+    srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093,SRG-OS-000394-GPOS-00174
d10e36
+    stigid@rhel7: RHEL-07-040400
d10e36
+
d10e36
+ocil_clause: 'MACs option is commented out or not using FIPS-approved hash algorithms'
d10e36
+
d10e36
+ocil: |-
d10e36
+    Only FIPS-approved MACs should be used. To verify that only FIPS-approved
d10e36
+    MACs are in use, run the following command:
d10e36
+    
$ sudo grep -i macs /etc/ssh/sshd_config
d10e36
+    The output should contain only following MACs (or a subset) in the exact order:
d10e36
+    
hmac-sha2-512,hmac-sha2-256
d10e36
+
d10e36
+warnings:
d10e36
+    - general: |-
d10e36
+        The system needs to be rebooted for these changes to take effect.
d10e36
+    - regulatory: |-
d10e36
+        System Crypto Modules must be provided by a vendor that undergoes
d10e36
+        FIPS-140 certifications.
d10e36
+        FIPS-140 is applicable to all Federal agencies that use
d10e36
+        cryptographic-based security systems to protect sensitive information
d10e36
+        in computer and telecommunication systems (including voice systems) as
d10e36
+        defined in Section 5131 of the Information Technology Management Reform
d10e36
+        Act of 1996, Public Law 104-106. This standard shall be used in
d10e36
+        designing and implementing cryptographic modules that Federal
d10e36
+        departments and agencies operate or are operated for them under
d10e36
+        contract. See {{{ weblink(link="https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.140-2.pdf") }}}
d10e36
+        To meet this, the system has to have cryptographic software provided by
d10e36
+        a vendor that has undergone this certification. This means providing
d10e36
+        documentation, test results, design information, and independent third
d10e36
+        party review by an accredited lab. While open source software is
d10e36
+        capable of meeting this, it does not meet FIPS-140 unless the vendor
d10e36
+        submits to this process.
d10e36
d10e36
From 18ea3b8671e15c06a5c1c864d9d1d67f4262189e Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Tue, 19 Jan 2021 12:32:25 +0100
d10e36
Subject: [PATCH 2/7] add tests
d10e36
d10e36
---
d10e36
 .../tests/comment.fail.sh                                  | 7 +++++++
d10e36
 .../tests/correct_reduced_list.pass.sh                     | 7 +++++++
d10e36
 .../tests/correct_scrambled.fail.sh                        | 7 +++++++
d10e36
 .../tests/correct_value.pass.sh                            | 7 +++++++
d10e36
 .../tests/line_not_there.fail.sh                           | 3 +++
d10e36
 .../tests/no_parameters.fail.sh                            | 7 +++++++
d10e36
 .../tests/wrong_value.fail.sh                              | 7 +++++++
d10e36
 7 files changed, 45 insertions(+)
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/comment.fail.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_reduced_list.pass.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_scrambled.fail.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_value.pass.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/line_not_there.fail.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/no_parameters.fail.sh
d10e36
 create mode 100644 linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/wrong_value.fail.sh
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/comment.fail.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/comment.fail.sh
d10e36
new file mode 100644
d10e36
index 0000000000..26bf18234c
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/comment.fail.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/# MACs hmac-sha2-512,hmac-sha2-256/" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo "# ciphers MACs hmac-sha2-512,hmac-sha2-256" >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_reduced_list.pass.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_reduced_list.pass.sh
d10e36
new file mode 100644
d10e36
index 0000000000..0d922cdee9
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_reduced_list.pass.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/MACs hmac-sha2-512/" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo "MACs hmac-sha2-512" >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_scrambled.fail.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_scrambled.fail.sh
d10e36
new file mode 100644
d10e36
index 0000000000..ce3f459352
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_scrambled.fail.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/MACs hmac-sha2-256,hmac-sha2-512/" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo "MACs hmac-sha2-256,hmac-sha2-512" >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_value.pass.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_value.pass.sh
d10e36
new file mode 100644
d10e36
index 0000000000..19da7102a7
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/correct_value.pass.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/MACs hmac-sha2-512,hmac-sha2-256/" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo 'MACs hmac-sha2-512,hmac-sha2-256' >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/line_not_there.fail.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/line_not_there.fail.sh
d10e36
new file mode 100644
d10e36
index 0000000000..fd1f19347a
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/line_not_there.fail.sh
d10e36
@@ -0,0 +1,3 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+sed -i "/^MACs.*/d" /etc/ssh/sshd_config
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/no_parameters.fail.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/no_parameters.fail.sh
d10e36
new file mode 100644
d10e36
index 0000000000..44c07c6de0
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/no_parameters.fail.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/MACs /" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo 'MACs ' >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/wrong_value.fail.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/wrong_value.fail.sh
d10e36
new file mode 100644
d10e36
index 0000000000..cf56cd228f
d10e36
--- /dev/null
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/tests/wrong_value.fail.sh
d10e36
@@ -0,0 +1,7 @@
d10e36
+#!/bin/bash
d10e36
+
d10e36
+if grep -q "^MACs" /etc/ssh/sshd_config; then
d10e36
+	sed -i "s/^MACs.*/MACs hmac-sha2-512,hmac-sha2-256,blahblah/" /etc/ssh/sshd_config
d10e36
+else
d10e36
+	echo "MACs hmac-sha2-512,hmac-sha2-256,blahblah" >> /etc/ssh/sshd_config
d10e36
+fi
d10e36
d10e36
From a334b4b434adf92c94b8bd6bb888751782e70ad3 Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Tue, 19 Jan 2021 12:32:58 +0100
d10e36
Subject: [PATCH 3/7] modify rhel7 stig profile
d10e36
d10e36
---
d10e36
 rhel7/profiles/stig.profile | 3 +--
d10e36
 1 file changed, 1 insertion(+), 2 deletions(-)
d10e36
d10e36
diff --git a/rhel7/profiles/stig.profile b/rhel7/profiles/stig.profile
d10e36
index 6c06a8ede6..17c781d3eb 100644
d10e36
--- a/rhel7/profiles/stig.profile
d10e36
+++ b/rhel7/profiles/stig.profile
d10e36
@@ -28,7 +28,6 @@ selections:
d10e36
     - inactivity_timeout_value=15_minutes
d10e36
     - var_screensaver_lock_delay=5_seconds
d10e36
     - sshd_idle_timeout_value=10_minutes
d10e36
-    - sshd_approved_macs=stig
d10e36
     - var_accounts_fail_delay=4
d10e36
     - var_selinux_state=enforcing
d10e36
     - var_selinux_policy_name=targeted
d10e36
@@ -259,7 +258,7 @@ selections:
d10e36
     - sshd_print_last_log
d10e36
     - sshd_disable_root_login
d10e36
     - sshd_allow_only_protocol2
d10e36
-    - sshd_use_approved_macs
d10e36
+    - sshd_use_approved_macs_ordered_stig
d10e36
     - file_permissions_sshd_pub_key
d10e36
     - file_permissions_sshd_private_key
d10e36
     - sshd_disable_gssapi_auth
d10e36
d10e36
From df71fc735efa8754a73fab5d355d422c6e0ffa53 Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Tue, 19 Jan 2021 12:33:10 +0100
d10e36
Subject: [PATCH 4/7] remove rhel7 stigid from sshd_use_approved_macs
d10e36
d10e36
---
d10e36
 .../services/ssh/ssh_server/sshd_use_approved_macs/rule.yml      | 1 -
d10e36
 1 file changed, 1 deletion(-)
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml
d10e36
index 394c733f51..d47eb443f5 100644
d10e36
--- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs/rule.yml
d10e36
@@ -54,7 +54,6 @@ references:
d10e36
     nist-csf: PR.AC-1,PR.AC-3,PR.DS-5,PR.PT-4
d10e36
     srg: SRG-OS-000125-GPOS-00065,SRG-OS-000250-GPOS-00093,SRG-OS-000394-GPOS-00174
d10e36
     vmmsrg: SRG-OS-000033-VMM-000140,SRG-OS-000120-VMM-000600,SRG-OS-000478-VMM-001980,SRG-OS-000480-VMM-002000,SRG-OS-000396-VMM-001590
d10e36
-    stigid@rhel7: RHEL-07-040400
d10e36
     stigid@sle12: SLES-12-030180
d10e36
     isa-62443-2013: 'SR 1.1,SR 1.13,SR 1.2,SR 1.3,SR 1.4,SR 1.5,SR 1.7,SR 1.8,SR 1.9,SR 2.6,SR 3.1,SR 3.5,SR 3.8,SR 4.1,SR 4.3,SR 5.1,SR 5.2,SR 5.3,SR 7.1,SR 7.6'
d10e36
     isa-62443-2009: 4.3.3.5.1,4.3.3.6.6
d10e36
d10e36
From 9c24aaaba67f0123a82335672fd25aacd913caa4 Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Thu, 21 Jan 2021 11:43:16 +0100
d10e36
Subject: [PATCH 5/7] simplify regex
d10e36
d10e36
---
d10e36
 .../sshd_use_approved_macs_ordered_stig/oval/shared.xml         | 2 +-
d10e36
 1 file changed, 1 insertion(+), 1 deletion(-)
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
index d7fbd9f0ed..5973488661 100644
d10e36
--- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
@@ -31,7 +31,7 @@
d10e36
 
d10e36
   <ind:textfilecontent54_object id="obj_sshd_use_approved_macs_ordered_stig" version="1">
d10e36
     <ind:filepath>/etc/ssh/sshd_config</ind:filepath>
d10e36
-    <ind:pattern operation="pattern match">^[\s]*(?i)MACs(?-i)[\s]+(?=[\w,-@]+)(hmac-sha2-512(?=[\w,-@]+|$),?)?(hmac-sha2-256(?=[\w,-@]+|$),?)?[\s]*(?:#.*)?$</ind:pattern>
d10e36
+    <ind:pattern operation="pattern match">^[\s]*(?i)MACs(?-i)[\s]+(?=[\w,-@]+)(hmac-sha2-512(?=[\w,]+|$),?)?(hmac-sha2-256)?[\s]*(?:#.*)?$</ind:pattern>
d10e36
     <ind:instance datatype="int">1</ind:instance>
d10e36
   </ind:textfilecontent54_object>
d10e36
 
d10e36
d10e36
From e3973f4c2988308a2d1a18e67a730a059f791336 Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Thu, 21 Jan 2021 11:55:19 +0100
d10e36
Subject: [PATCH 6/7] make bash remediation more readable
d10e36
d10e36
---
d10e36
 .../sshd_use_approved_macs_ordered_stig/bash/shared.sh          | 2 +-
d10e36
 1 file changed, 1 insertion(+), 1 deletion(-)
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
index c76190fb96..f8f6f39bee 100644
d10e36
--- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/bash/shared.sh
d10e36
@@ -1,6 +1,6 @@
d10e36
 # platform = multi_platform_wrlinux,Red Hat Enterprise Linux 7,Oracle Linux 7
d10e36
 
d10e36
-if grep -q -P '^[[:space:]]*MACs[[:space:]]+' /etc/ssh/sshd_config; then
d10e36
+if grep -q -P '^\s*MACs\s+' /etc/ssh/sshd_config; then
d10e36
   sed -i 's/^\s*MACs.*/MACs hmac-sha2-512,hmac-sha2-256/' /etc/ssh/sshd_config
d10e36
 else
d10e36
   echo "MACs hmac-sha2-512,hmac-sha2-256" >> /etc/ssh/sshd_config
d10e36
d10e36
From e5c379ac8cbd7bd42b116d3a5473a78406a662fd Mon Sep 17 00:00:00 2001
d10e36
From: Vojtech Polasek <vpolasek@redhat.com>
d10e36
Date: Thu, 21 Jan 2021 13:05:18 +0100
d10e36
Subject: [PATCH 7/7] one more small fix to oval regex
d10e36
d10e36
---
d10e36
 .../sshd_use_approved_macs_ordered_stig/oval/shared.xml         | 2 +-
d10e36
 1 file changed, 1 insertion(+), 1 deletion(-)
d10e36
d10e36
diff --git a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
index 5973488661..b5443b07c4 100644
d10e36
--- a/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
+++ b/linux_os/guide/services/ssh/ssh_server/sshd_use_approved_macs_ordered_stig/oval/shared.xml
d10e36
@@ -31,7 +31,7 @@
d10e36
 
d10e36
   <ind:textfilecontent54_object id="obj_sshd_use_approved_macs_ordered_stig" version="1">
d10e36
     <ind:filepath>/etc/ssh/sshd_config</ind:filepath>
d10e36
-    <ind:pattern operation="pattern match">^[\s]*(?i)MACs(?-i)[\s]+(?=[\w,-@]+)(hmac-sha2-512(?=[\w,]+|$),?)?(hmac-sha2-256)?[\s]*(?:#.*)?$</ind:pattern>
d10e36
+    <ind:pattern operation="pattern match">^[\s]*(?i)MACs(?-i)[\s]+(?=[\w]+)(hmac-sha2-512(?=[\w,]+|$),?)?(hmac-sha2-256)?[\s]*(?:#.*)?$</ind:pattern>
d10e36
     <ind:instance datatype="int">1</ind:instance>
d10e36
   </ind:textfilecontent54_object>
d10e36