From: Ondrej Mosnacek <omosnace@redhat.com>
Date: Thu, 14 Jun 2018 08:30:03 +0000 (+0200)
Subject: fips: Drop the 02fips-aesni module
X-Git-Tag: 048~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0758c816849cd2acbe5e99e7f535091264e862d;p=thirdparty%2Fdracut.git

fips: Drop the 02fips-aesni module

The main 01fips module should always load all optimized/driver modules
of all relevant crypto algorithms (based on their aliases), so we can
drop this useless module.
---

diff --git a/dracut.spec b/dracut.spec
index ca8accb52..1d2226497 100644
--- a/dracut.spec
+++ b/dracut.spec
@@ -204,7 +204,6 @@ echo "DRACUT_VERSION=%{version}-%{release}" > $RPM_BUILD_ROOT/%{dracutlibdir}/dr
 
 %if 0%{?fedora} == 0 && 0%{?rhel} == 0 && 0%{?suse_version} == 0
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/01fips
-rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
 %if %{defined _unitdir}
@@ -401,7 +400,6 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
 %defattr(-,root,root,0755)
 %{dracutlibdir}/modules.d/01fips
-%{dracutlibdir}/modules.d/02fips-aesni
 %endif
 
 %files network
diff --git a/modules.d/02fips-aesni/module-setup.sh b/modules.d/02fips-aesni/module-setup.sh
deleted file mode 100755
index 08c49fad7..000000000
--- a/modules.d/02fips-aesni/module-setup.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
-    return 255
-}
-
-# called by dracut
-depends() {
-    return 0
-}
-
-# called by dracut
-installkernel() {
-    local _fipsmodules _mod
-    _fipsmodules="aesni-intel ghash_clmulni_intel"
-
-    mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
-
-    for _mod in $_fipsmodules; do
-        if instmods $_mod; then
-            echo $_mod >> "${initdir}/etc/fipsmodules"
-            echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf"
-        fi
-    done
-}
-
-# called by dracut
-install() {
-    return 0
-}
-