diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-18 15:46:03 -0800 |
| commit | 0eddf038adc8dff78efe86b71284e3f52b7cef27 (patch) | |
| tree | 0b1521e7117b36f315ad1c4d9a4a3175da80cfd8 /crypto/Kconfig | |
| parent | 86b7cbc9d3f7b357dbd4f22779c5df375eb76c46 (diff) | |
| parent | c8620c2590f43eff864fe597fcbe5b72ab7a7b94 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] null: Add missing Kconfig dependency on BLKCIPHER
[CRYPTO] tcrypt: Add missing Kconfig dependency on BLKCIPHER
[HIFN]: Fix invalid config ifdefs for RNG support
Diffstat (limited to 'crypto/Kconfig')
| -rw-r--r-- | crypto/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index c3166a1a5bb..898acc5c196 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -74,6 +74,7 @@ config CRYPTO_XCBC config CRYPTO_NULL tristate "Null algorithms" select CRYPTO_ALGAPI + select CRYPTO_BLKCIPHER help These are 'Null' algorithms, used by IPsec, which do nothing. @@ -567,6 +568,7 @@ config CRYPTO_TEST depends on m select CRYPTO_ALGAPI select CRYPTO_AEAD + select CRYPTO_BLKCIPHER help Quick & dirty crypto test module. |