aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-08-16 15:42:09 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2021-08-16 15:42:09 -1000
commit794c7931a2428a656551f2179e6a093233a6e0aa (patch)
tree99dc8f78866384354c5d232fa2dbf9fc8dd62752
parenta2824f19e6065a0d3735acd9fe7155b104e7edf5 (diff)
parent5261cdf457ce3635bf18d393a3c1991dcfaf9d02 (diff)
downloadlinux-794c7931a2428a656551f2179e6a093233a6e0aa.tar.gz
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This contains a fix for a potential boot failure due to a missing Kconfig dependency for people upgrading with the DRBG enabled" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: drbg - select SHA512
-rw-r--r--crypto/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index ca3b02dcbbfac7..64b772c5d1c9b5 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1768,7 +1768,7 @@ config CRYPTO_DRBG_HMAC
bool
default y
select CRYPTO_HMAC
- select CRYPTO_SHA256
+ select CRYPTO_SHA512
config CRYPTO_DRBG_HASH
bool "Enable Hash DRBG"