[kernel/private-jcm-arm-nosmp-kallsyms-f17] hmac: remove hmac on ARM for testing

Jon Masters jcm at fedoraproject.org
Sun Mar 25 05:09:32 UTC 2012


commit 2aa8b80e6f43b6f64986a326879786c831bc5f30
Author: Jon Masters <jcm at redhat.com>
Date:   Sun Mar 25 01:08:27 2012 -0400

    hmac: remove hmac on ARM for testing
    
    Back out manually Josh's comment from Mar 21.
    
    Signed-off-by: Jon Masters <jcm at redhat.com>

 kernel.spec |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f818ab0..ff13ed9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -529,7 +529,7 @@ ExclusiveOS: Linux
 #
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
-BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config, hmaccalc
+BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 BuildRequires: net-tools
 BuildRequires: xmlto, asciidoc
 %if %{with_sparse}
@@ -1646,11 +1646,6 @@ BuildKernel() {
     		$RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
     chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
 
-    # hmac sign the kernel for FIPS
-    echo "Creating hmac file: $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac"
-    ls -l $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
-    sha512hmac $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer | sed -e "s,$RPM_BUILD_ROOT,," > $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac;
-
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer
     # Override $(mod-fw) because we don't want it to install any firmware
     # we'll get it from the linux-firmware package and we don't want conflicts
@@ -2272,7 +2267,6 @@ fi
 %{expand:%%files %{?2}}\
 %defattr(-,root,root)\
 /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
-/%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:.%{2}}.hmac \
 %attr(600,root,root) /boot/System.map-%{KVERREL}%{?2:.%{2}}\
 /boot/config-%{KVERREL}%{?2:.%{2}}\
 %dir /lib/modules/%{KVERREL}%{?2:.%{2}}\


More information about the scm-commits mailing list