Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (64ae1342) · Commits · 戴 / test

Pull crypto fix from Herbert Xu: "This fixes a Kconfig anomaly when lib/crypto is enabled without Crypto API" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: Kconfig - allow tests to be disabled when manager is disabled

crypto/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -136,8 +136,6 @@ config CRYPTO_USER
		Userspace configuration for cryptographic instantiations such as
		cbc(aes).

		if CRYPTO_MANAGER2

		config CRYPTO_MANAGER_DISABLE_TESTS
		bool "Disable run-time self tests"
		default y
		@@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
		This is intended for developer use only, as these tests take much
		longer to run than the normal self tests.

		endif # if CRYPTO_MANAGER2

		config CRYPTO_GF128MUL
		tristate

Admin message