summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2011-06-29 11:09:56 -0400
committerChuck Ebbert <cebbert@redhat.com>2011-06-29 11:09:56 -0400
commit6b849f22a6c5faf9196930adf8415c303ba2175e (patch)
tree699a486fcb65d35e8102bd60ec8f0333483ae895 /config-generic
parent631520c5f22f74215efe7d5a22189e8ce31fad33 (diff)
downloadkernel-6b849f22a6c5faf9196930adf8415c303ba2175e.tar.gz
kernel-6b849f22a6c5faf9196930adf8415c303ba2175e.tar.xz
kernel-6b849f22a6c5faf9196930adf8415c303ba2175e.zip
Cleanup - make crypto manager options match reality
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic3
1 files changed, 1 insertions, 2 deletions
diff --git a/config-generic b/config-generic
index 909fff2af..c286c540d 100644
--- a/config-generic
+++ b/config-generic
@@ -3858,12 +3858,11 @@ CONFIG_CRYPTO=y
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
-CONFIG_CRYPTO_MANAGER_TESTS=y
+CONFIG_CRYPTO_MANAGER=y
# Note, CONFIG_CRYPTO_MANAGER_DISABLE_TESTS needs to be unset, or FIPS will be disabled.
# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_MANAGER=m
# CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ARC4=m