diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-06-29 11:09:56 -0400 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-06-29 11:09:56 -0400 |
| commit | 6b849f22a6c5faf9196930adf8415c303ba2175e (patch) | |
| tree | 699a486fcb65d35e8102bd60ec8f0333483ae895 | |
| parent | 631520c5f22f74215efe7d5a22189e8ce31fad33 (diff) | |
| download | kernel-6b849f22a6c5faf9196930adf8415c303ba2175e.tar.gz kernel-6b849f22a6c5faf9196930adf8415c303ba2175e.tar.xz kernel-6b849f22a6c5faf9196930adf8415c303ba2175e.zip | |
Cleanup - make crypto manager options match reality
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | config-generic | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index d5c87e027..2a459583a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ linux-*.tar.bz2 patch-*.bz2 clog *.rpm -kernel-3.*/ +kernel-[23].*/ 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 |