File 0511-01fips-ensure-fips-initialization-succeeds-on-s390-x.patch of Package dracut.16003

From d31f6dc51b26ac4110b2e5357a46f9b74ebd80e2 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <dmolkentin@suse.com>
Date: Wed, 15 Mar 2017 11:59:28 +0100
Subject: [PATCH] 01fips: ensure fips initialization succeeds on s390(x)

More modules are x86_64 only but are not matchable
by the generic postfix checks. Others are helper modules
that are not strictly needed on all platforms. Ensure
we pass FIPS init without them.

Finally, cbc is not always compiled into the kernel -- try
adding as a module.

Relates-to: e8804fc3d2052000d66661ced4a03103e0176e63
Reference: bsc#1021687
---
 modules.d/01fips/fips.sh         | 3 +++
 modules.d/01fips/module-setup.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 30f53b4..a005b0f 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -110,6 +110,9 @@ do_fips()
                         -o  "$_module" != "${_module%x86_64}"   \
                         -o  "$_module" != "${_module%z90}"      \
                         -o  "$_module" != "${_module%s390}"     \
+                        -o  "$_module" == "twofish_x86_64_3way" \
+                        -o  "$_module" == "ablk_helper"         \
+                        -o  "$_module" == "glue_helper"         \
                     ]; then
                         _found=1
                     fi
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
index e29af08..beeb2f6 100755
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -23,7 +23,7 @@ installkernel() {
     _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis "
     _fipsmodules+="cast6_generic cast5_generic cast_common sha512_ssse3 serpent_sse2_x86_64 serpent_generic twofish_generic "
     _fipsmodules+="ablk_helper cryptd twofish_x86_64_3way lrw glue_helper twofish_x86_64 twofish_common blowfish_generic "
-    _fipsmodules+="blowfish_x86_64 blowfish_common des_generic "
+    _fipsmodules+="blowfish_x86_64 blowfish_common des_generic cbc "
 
     mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
 
-- 
2.10.2