Commit 794c7931 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a2824f19 5261cdf4

crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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"