From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Mar 2024 17:48:23 +0000 (-0700)
Subject: Merge tag 'v6.9-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v6.9-rc2~41
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/174fdc93a241af54772ae3e745ec719e9f6cebfc?hp=-c

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"
---

174fdc93a241af54772ae3e745ec719e9f6cebfc
diff --combined kernel/module/Kconfig
index c3ced519e14b,28db5b7589eb..f3e0329337f6
--- a/kernel/module/Kconfig
+++ b/kernel/module/Kconfig
@@@ -236,6 -236,10 +236,10 @@@ choic
  	  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 +269,7 @@@ endchoic
  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
@@@ -362,7 -367,8 +367,7 @@@ config MODPROBE_PAT
  	  userspace can still load modules explicitly).
  
  config TRIM_UNUSED_KSYMS
 -	bool "Trim unused exported kernel symbols" if EXPERT
 -	depends on !COMPILE_TEST
 +	bool "Trim unused exported kernel symbols"
  	help
  	  The kernel and some modules make many symbols available for
  	  other modules to use via EXPORT_SYMBOL() and variants. Depending