Cleanup - make crypto manager options match reality

This commit is contained in:
Chuck Ebbert 2011-06-29 11:09:56 -04:00
parent 631520c5f2
commit 6b849f22a6
2 changed files with 2 additions and 3 deletions

2
.gitignore vendored
View File

@ -2,4 +2,4 @@ linux-*.tar.bz2
patch-*.bz2 patch-*.bz2
clog clog
*.rpm *.rpm
kernel-3.*/ kernel-[23].*/

View File

@ -3858,12 +3858,11 @@ CONFIG_CRYPTO=y
CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_USER_API_HASH=y CONFIG_CRYPTO_USER_API_HASH=y
CONFIG_CRYPTO_USER_API_SKCIPHER=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. # 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_MANAGER_DISABLE_TESTS is not set
CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_BLKCIPHER=y CONFIG_CRYPTO_BLKCIPHER=y
CONFIG_CRYPTO_MANAGER=m
# CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_CRYPTD is not set
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_ARC4=m