diff options
| author | Dave Jones <davej@redhat.com> | 2011-06-27 12:27:32 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-06-27 12:27:32 -0400 |
| commit | 4e11b0fb25485c6bf67d405cb5fcf681622fd34d (patch) | |
| tree | ddfc3572d09dd248d837cd964e3fe344b71828a1 | |
| parent | 4cc6bd7c83f6ea93fd81a1c2d0fe0ebcb89a3bba (diff) | |
| download | kernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.tar.gz kernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.tar.xz kernel-4e11b0fb25485c6bf67d405cb5fcf681622fd34d.zip | |
Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)
| -rw-r--r-- | config-debug | 2 | ||||
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | kernel.spec | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/config-debug b/config-debug index a1b0ee034..7bbaa0b59 100644 --- a/config-debug +++ b/config-debug @@ -89,8 +89,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 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 diff --git a/config-nodebug b/config-nodebug index 0cf211082..5730cd1b2 100644 --- a/config-nodebug +++ b/config-nodebug @@ -89,8 +89,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/kernel.spec b/kernel.spec index 953731923..db9792daa 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1878,6 +1878,9 @@ fi # and build. %changelog +* Mon Jun 27 2011 Dave Jones <davej@redhat.com> +- Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942) + * Thu Jun 23 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc4.git3.1 - Linux 3.0-rc4-git3 - Drop linux-3.0-fix-uts-release.patch, and instead just perl the Makefile |