diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-13 14:17:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-13 14:17:39 -0800 |
commit | 2cb79a97f16471fdf8ba8b96a2aac069efaf45cb (patch) | |
tree | 32fb58f3a7eb9776425b301e086a1b41015e7014 /crypto | |
parent | 7f9d45f5936dcb2664148abb79ff8419c99e889b (diff) | |
parent | da1db20dc7675041106813bea44ce06e74c9a588 (diff) | |
download | linux-crypto-2cb79a97f16471fdf8ba8b96a2aac069efaf45cb.tar.gz linux-crypto-2cb79a97f16471fdf8ba8b96a2aac069efaf45cb.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
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
Diffstat (limited to '')
-rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index cdb51d42..c24a4740 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -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 |