[linux] 01/01: crypto: Change CRYPTO_SHA256 from module to built-in, as required by IMA

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux.

commit 38ea360ed40329336c8322b222751767f740829a
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue May 2 16:21:36 2017 +0100

    crypto: Change CRYPTO_SHA256 from module to built-in, as required by IMA
---
 debian/changelog                   | 1 +
 debian/config/armel/config.marvell | 1 +
 debian/config/config               | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 47bc7ce..9f63213 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -397,6 +397,7 @@ linux (4.9.25-1) UNRELEASED; urgency=medium
     reverted using the kernel parameter: checkreqprot=1
   * udeb: Move mfd-core to kernel-image, as both input-modules and
     mmc-modules need it
+  * crypto: Change CRYPTO_SHA256 from module to built-in, as required by IMA
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index bd0381c..c1ef082 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -119,6 +119,7 @@ CONFIG_SUN_PARTITION=y
 ## file: crypto/Kconfig
 ##
 # CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_SHA256=m
 
 ##
 ## file: drivers/ata/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 55df382..93b0e39 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -109,7 +109,8 @@ CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA1_MB is not set
-CONFIG_CRYPTO_SHA256=m
+#. Must be built-in for IMA_DEFAULT_HASH_SHA256
+CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git