summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-13 14:17:39 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-13 14:17:39 -0800
commit64ae1342f8980d05c3df414a022b8123aa76c56b (patch)
tree12b208c5811a699c18b2fc67e9a1f61d65febca2 /crypto
parent0bf999f9c5e74c7ecf9dafb527146601e5c848b9 (diff)
parent2343d1529aff8b552589f622c23932035ed7a05d (diff)
downloadlinux-64ae1342f8980d05c3df414a022b8123aa76c56b.tar.gz
linux-64ae1342f8980d05c3df414a022b8123aa76c56b.tar.bz2
linux-64ae1342f8980d05c3df414a022b8123aa76c56b.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 'crypto')
-rw-r--r--crypto/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index cdb51d4272d0..c24a47406f8f 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