|
 |
a0a3b4 |
From 0eb1afa9ea7e7807ef032f03563885996d26a961 Mon Sep 17 00:00:00 2001
|
|
|
a0a3b4 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
a0a3b4 |
Date: Thu, 21 Jul 2016 15:07:52 +0200
|
|
|
a0a3b4 |
Subject: [PATCH] fips: use /lib/modules/$(uname -r)/modules.fips
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
if /lib/modules/$(uname -r)/modules.fips exists, use that list instead
|
|
|
a0a3b4 |
of the dracut module list.
|
|
|
a0a3b4 |
---
|
|
|
a0a3b4 |
modules.d/01fips/module-setup.sh | 17 +++++++++++------
|
|
|
a0a3b4 |
1 file changed, 11 insertions(+), 6 deletions(-)
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
|
|
|
1755ca |
index 77ed24ef..e1296d75 100755
|
|
|
a0a3b4 |
--- a/modules.d/01fips/module-setup.sh
|
|
|
a0a3b4 |
+++ b/modules.d/01fips/module-setup.sh
|
|
|
a0a3b4 |
@@ -12,12 +12,17 @@ depends() {
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
installkernel() {
|
|
|
a0a3b4 |
local _fipsmodules _mod
|
|
|
a0a3b4 |
- _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
|
|
|
a0a3b4 |
- _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
|
|
|
a0a3b4 |
- _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
|
|
|
a0a3b4 |
- _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
|
|
|
a0a3b4 |
- _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
|
|
|
a0a3b4 |
- _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
|
|
|
a0a3b4 |
+
|
|
|
a0a3b4 |
+ if [[ -f "${srcmods}/modules.fips" ]]; then
|
|
|
a0a3b4 |
+ _fipsmodules="$(cat "${srcmods}/modules.fips")"
|
|
|
a0a3b4 |
+ else
|
|
|
a0a3b4 |
+ _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm "
|
|
|
a0a3b4 |
+ _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
|
|
|
a0a3b4 |
+ _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
|
|
|
a0a3b4 |
+ _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
|
|
|
a0a3b4 |
+ _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key sha1_s390 sha512_s390"
|
|
|
a0a3b4 |
+ _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
|
|
|
a0a3b4 |
+ fi
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
|
|
|
a0a3b4 |
|