summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-03-25 10:48:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-03-25 10:48:23 -0700
commit174fdc93a241af54772ae3e745ec719e9f6cebfc (patch)
treeafdc8399f4a17c763966e0dc25b671af24570485 /kernel
parent4cece764965020c22cff7665b18a012006359095 (diff)
parent5a7e89d3315d1be86aff8a8bf849023cda6547f7 (diff)
downloadlwn-174fdc93a241af54772ae3e745ec719e9f6cebfc.tar.gz
lwn-174fdc93a241af54772ae3e745ec719e9f6cebfc.zip
Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This fixes a regression that broke iwd as well as a divide by zero in iaa" * tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: iaa - Fix nr_cpus < nr_iaa case Revert "crypto: pkcs7 - remove sha1 support"
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/module/Kconfig b/kernel/module/Kconfig
index c3ced519e14b..f3e0329337f6 100644
--- a/kernel/module/Kconfig
+++ b/kernel/module/Kconfig
@@ -236,6 +236,10 @@ choice
possible to load a signed module containing the algorithm to check
the signature on that module.
+config MODULE_SIG_SHA1
+ bool "Sign modules with SHA-1"
+ select CRYPTO_SHA1
+
config MODULE_SIG_SHA256
bool "Sign modules with SHA-256"
select CRYPTO_SHA256
@@ -265,6 +269,7 @@ endchoice
config MODULE_SIG_HASH
string
depends on MODULE_SIG || IMA_APPRAISE_MODSIG
+ default "sha1" if MODULE_SIG_SHA1
default "sha256" if MODULE_SIG_SHA256
default "sha384" if MODULE_SIG_SHA384
default "sha512" if MODULE_SIG_SHA512