|
 |
bd46b7 |
From f78ca701b71fc489ee1b22ede3205fc9dc63c119 Mon Sep 17 00:00:00 2001
|
|
|
bd46b7 |
From: Milan Lysonek <mlysonek@redhat.com>
|
|
|
bd46b7 |
Date: Wed, 17 Aug 2022 09:36:19 +0200
|
|
|
bd46b7 |
Subject: [PATCH 08/11] Merge pull request #9355 from
|
|
|
bd46b7 |
yuumasato/enable_fips_mode_s390x_no_grubenv
|
|
|
bd46b7 |
|
|
|
bd46b7 |
Patch-name: scap-security-guide-0.1.64-fix_fips_enable_fips_mode_x390x-PR_9355.patch
|
|
|
bd46b7 |
Patch-status: Don't fail enable_fips_mode if /etc/grubenv is missing on s390x
|
|
|
bd46b7 |
---
|
|
|
bd46b7 |
.../integrity/fips/enable_fips_mode/oval/shared.xml | 9 ++++++++-
|
|
|
bd46b7 |
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
bd46b7 |
|
|
|
bd46b7 |
diff --git a/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
|
|
|
bd46b7 |
index 65056a654c..7af675de0d 100644
|
|
|
bd46b7 |
--- a/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
|
|
|
bd46b7 |
+++ b/linux_os/guide/system/software/integrity/fips/enable_fips_mode/oval/shared.xml
|
|
|
bd46b7 |
@@ -7,9 +7,16 @@
|
|
|
bd46b7 |
<extend_definition comment="Dracut FIPS module is enabled" definition_ref="enable_dracut_fips_module" />
|
|
|
bd46b7 |
<extend_definition comment="system cryptography policy is configured" definition_ref="configure_crypto_policy" />
|
|
|
bd46b7 |
<criterion comment="check if system crypto policy selection in var_system_crypto_policy in the profile is set to FIPS" test_ref="test_system_crypto_policy_value" />
|
|
|
bd46b7 |
- {{% if product in ["ol8","rhel8"] %}}
|
|
|
bd46b7 |
+ {{% if product in ["ol8"] %}}
|
|
|
bd46b7 |
|
|
|
bd46b7 |
test_ref="test_grubenv_fips_mode" />
|
|
|
bd46b7 |
+ {{% elif product in ["rhel8"] %}}
|
|
|
bd46b7 |
+ <criteria operator="OR">
|
|
|
bd46b7 |
+
|
|
|
bd46b7 |
+ definition_ref="system_info_architecture_s390_64" />
|
|
|
bd46b7 |
+
|
|
|
bd46b7 |
+ test_ref="test_grubenv_fips_mode" />
|
|
|
bd46b7 |
+ </criteria>
|
|
|
bd46b7 |
{{% endif %}}
|
|
|
bd46b7 |
</criteria>
|
|
|
bd46b7 |
</definition>
|
|
|
bd46b7 |
--
|
|
|
bd46b7 |
2.37.2
|
|
|
bd46b7 |
|