diff --git a/dracut.changes b/dracut.changes index 7722b88..6ad4ae5 100644 --- a/dracut.changes +++ b/dracut.changes @@ -4,6 +4,12 @@ Fri Jun 3 14:05:36 UTC 2016 - trenn@suse.de - FCOE fix bsc#982588 * Add 0212-fcoe_reorder_init_path.patch +------------------------------------------------------------------- +Tue May 31 12:53:28 UTC 2016 - meissner@suse.com + +- fips-kernel-4.4-fixes.patch: adjust the kernel module list to + match the SLES 12 SP2 kernel. (bsc#976577) + ------------------------------------------------------------------- Wed May 4 15:40:37 CEST 2016 - hare@suse.de diff --git a/dracut.spec b/dracut.spec index 46f56a0..ea55ae8 100644 --- a/dracut.spec +++ b/dracut.spec @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -90,6 +90,7 @@ Patch57: 0057-01fips-Include-some-more-hmacs.patch Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch Patch138: 0138-fips_add_aesni-intel.patch +Patch139: fips-kernel-4.4-fixes.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -263,6 +264,7 @@ chmod a+x modules.d/91zipl/install_zipl_cmdline.sh %patch137 -p1 %patch138 -p1 +%patch139 -p1 %patch142 -p1 %patch144 -p1 diff --git a/fips-kernel-4.4-fixes.patch b/fips-kernel-4.4-fixes.patch new file mode 100644 index 0000000..40254f8 --- /dev/null +++ b/fips-kernel-4.4-fixes.patch @@ -0,0 +1,44 @@ +Index: dracut-044/modules.d/01fips/module-setup.sh +=================================================================== +--- dracut-044.orig/modules.d/01fips/module-setup.sh ++++ dracut-044/modules.d/01fips/module-setup.sh +@@ -13,16 +13,17 @@ depends() { + # called by dracut + installkernel() { + local _fipsmodules _mod +- _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 authenc authencesn blowfish camellia cast6 cbc ccm " +- _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg " +- _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 " +- _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic " +- _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib" +- _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390" +- _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 " +- _fipsmodules+="ghash-clmulni-intel aesni-intel " +- +- _fipsmodules+="drbg" ++ _fipsmodules="ansi_cprng arc4 authenc ccm " ++ _fipsmodules+="ctr cts deflate drbg " ++ _fipsmodules+="ecb fcrypt gcm ghash_generic khazad md4 michael_mic rmd128 " ++ _fipsmodules+="rmd160 rmd256 rmd320 seed " ++ _fipsmodules+="sha512_generic tcrypt tea wp512 xts zlib " ++ _fipsmodules+="aes_s390 des_s390 sha256_s390 ghash_s390 sha1_s390 sha512_s390 " ++ _fipsmodules+="gf128mul " ++ _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 " + + mkdir -m 0755 -p "${initdir}/etc/modprobe.d" + +Index: dracut-044/modules.d/01fips/fips.sh +=================================================================== +--- dracut-044.orig/modules.d/01fips/fips.sh ++++ dracut-044/modules.d/01fips/fips.sh +@@ -103,6 +103,7 @@ do_fips() + -o "$_module" != "${_module%-ssse3}" \ + -o "$_module" != "${_module%-x86_64}" \ + -o "$_module" != "${_module%z90}" \ ++ -o "$_module" != "${_module%s390}" \ + ]; then + _found=1 + fi