[kernel/f15] Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)

[Dave Jones]

commit 8bc042555b9e7dee3a95afc10fca06ff76010fed
Author: Dave Jones <davej at redhat.com>
Date:   Mon Jun 27 12:30:45 2011 -0400

    Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)

 Makefile       |    2 --
 config-debug   |    2 --
 config-generic |    2 ++
 config-nodebug |    2 --
 kernel.spec    |    3 +++
 5 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/Makefile b/Makefile
index 705670f..7bc3839 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,6 @@ debug:
 	@perl -pi -e 's/# CONFIG_KDB_KEYBOARD is not set/CONFIG_KDB_KEYBOARD=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set/CONFIG_CPU_NOTIFIER_ERROR_INJECT=m/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_PER_CPU_MAPS is not set/CONFIG_DEBUG_PER_CPU_MAPS=y/' config-nodebug
-	@perl -pi -e 's/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/' config-nodebug
 	#@perl -pi -e 's/# CONFIG_PCI_DEFAULT_USE_CRS is not set/CONFIG_PCI_DEFAULT_USE_CRS=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_TEST_LIST_SORT is not set/CONFIG_TEST_LIST_SORT=y/' config-nodebug
@@ -168,7 +167,6 @@ release:
 	#@perl -pi -e 's/CONFIG_KGDB_KDB=y/# CONFIG_KGDB_KDB is not set/' config-nodebug
 	#@perl -pi -e 's/CONFIG_KDB_KEYBOARD=y/# CONFIG_KDB_KEYBOARD is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_PER_CPU_MAPS=y/# CONFIG_DEBUG_PER_CPU_MAPS is not set/' config-nodebug
-	@perl -pi -e 's/# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set/CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y/' config-nodebug
 	#@perl -pi -e 's/CONFIG_PCI_DEFAULT_USE_CRS=y/# CONFIG_PCI_DEFAULT_USE_CRS is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y/# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_TEST_LIST_SORT=y/# CONFIG_TEST_LIST_SORT is not set/' config-nodebug
diff --git a/config-debug b/config-debug
index 86aa2cc..7301794 100644
--- a/config-debug
+++ b/config-debug
@@ -88,8 +88,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_CEPH_LIB_PRETTYDEBUG=y
 CONFIG_QUOTA_DEBUG=y
 
-# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-
 CONFIG_PCI_DEFAULT_USE_CRS=y
 
 CONFIG_KGDB_KDB=y
diff --git a/config-generic b/config-generic
index d9a6444..14d4e37 100644
--- a/config-generic
+++ b/config-generic
@@ -3734,6 +3734,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
diff --git a/config-nodebug b/config-nodebug
index c81b03b..7510184 100644
--- a/config-nodebug
+++ b/config-nodebug
@@ -88,8 +88,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
 # CONFIG_QUOTA_DEBUG is not set
 
-CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-
 CONFIG_PCI_DEFAULT_USE_CRS=y
 
 CONFIG_KGDB_KDB=y
diff --git a/kernel.spec b/kernel.spec
index 885f708..5211df6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2065,6 +2065,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 27 2011 Dave Jones <davej at redhat.com>
+- Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)
+
 * Sat Jun 25 2011 Chuck Ebbert <cebbert at redhat.com>
 - Intel IOMMU fixes from 2.6.39.2
 - drm-i915-apply-hwstam-workaround-for-bsd-ring-on-sandybridge.patch: