Merge pull request ComplianceAsCode#10948 from marcusburghardt/packag…

…e_cryptsetup-luks_installed_rhel9

Enable package_cryptsetup-luks_installed rule for RHEL9

components/cryptsetup-luks.yml → components/cryptsetup.yml

@@ -1,5 +1,5 @@
-name: cryptsetup-luks
+name: cryptsetup
 packages:
-- cryptsetup-luks
+- cryptsetup
 rules:
 - package_cryptsetup-luks_installed

controls/ccn_rhel9.yml

@@ -795,20 +795,17 @@ controls:
     original_title: El disco del sistema está cifrado.
     levels:
       - advanced
-    status: partial
-    notes: |-
-      package_cryptsetup-luks_installed should be enabled for RHEL9.
+    status: automated
     rules:
       - encrypt_partitions
-    related_rules:
       - package_cryptsetup-luks_installed
 
   - id: A.25.SEC-RHEL2
     title: The Data Disk is Encrypted
     original_title: El disco de datos está cifrado.
     levels:
       - advanced
-    status: partial
+    status: automated
     notes: |-
       The rules in this requirement overlaps the A.25.SEC-RHEL1 requirement
     related_rules:

linux_os/guide/system/software/system-tools/package_cryptsetup-luks_installed/rule.yml

@@ -1,32 +1,34 @@
 documentation_complete: true
 
-prodtype: fedora,ol7,rhel7
+prodtype: fedora,ol7,rhel7,rhel9
 
-title: 'Install cryptsetup-luks Package'
+title: 'Install cryptsetup Package'
 
 description: |-
-    {{{ describe_package_install(package="cryptsetup-luks") }}}
+    {{{ describe_package_install(package="cryptsetup") }}}
 
 rationale: |-
     LUKS is the upcoming standard for Linux hard disk encryption. By providing a standard
     on-disk format, it does not only facilitate compatibility among distributions, but also
     provide secure management of multiple user passwords. In contrast to existing solution,
     LUKS stores all necessary setup information in the partition header, enabling the user
     to transport or migrate their data seamlessly. LUKS for dm-crypt is implemented in
-    <tt>cryptsetup</tt>. <tt>cryptsetup-luks</tt> is intended as a complete replacement for the
-    original <tt>cryptsetup</tt>. It provides all the functionality of the original
-    version plus all LUKS features, that are accessible by luks* action.
+    <tt>cryptsetup</tt>.
 
 severity: medium
 
 identifiers:
     cce@rhel7: CCE-82996-0
+    cce@rhel9: CCE-86612-9
+
+references:
+    ccn@rhel9: A.25.SEC-RHEL1,A.25.SEC-RHEL2
 
 ocil_clause: 'the package is not installed'
 
-ocil: '{{{ ocil_package(package="cryptsetup-luks") }}}'
+ocil: '{{{ ocil_package(package="cryptsetup") }}}'
 
 template:
     name: package_installed
     vars:
-        pkgname: cryptsetup-luks
+        pkgname: cryptsetup

shared/references/cce-redhat-avail.txt

@@ -312,7 +312,6 @@ CCE-86607-9
 CCE-86608-7
 CCE-86609-5
 CCE-86610-3
-CCE-86612-9
 CCE-86613-7
 CCE-86615-2
 CCE-86616-0