summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-06-27 12:27:32 -0400
committerDave Jones <davej@redhat.com>2011-06-27 12:27:32 -0400
commit4e11b0fb25485c6bf67d405cb5fcf681622fd34d (patch)
treeddfc3572d09dd248d837cd964e3fe344b71828a1 /config-generic
parent4cc6bd7c83f6ea93fd81a1c2d0fe0ebcb89a3bba (diff)
downloadkernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.tar.gz
kernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.tar.xz
kernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.zip
Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index e7021fca8..909fff2af 100644
--- a/config-generic
+++ b/config-generic
@@ -3859,6 +3859,8 @@ CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=y
CONFIG_CRYPTO_MANAGER_TESTS=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