diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:35:19 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 15:35:19 -0500 |
| commit | 1ed55eac3b1fc30b29cdb52251e0f13b24fc344c (patch) | |
| tree | b7a4c67f2e29f8aa418708c5da871e64c511f3ff /drivers/crypto/Kconfig | |
| parent | 08242bc2210938761230f79c5288dbcf72e94808 (diff) | |
| parent | a2c0911c09190125f52c9941b9d187f601c2f7be (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto update from Herbert Xu:
- Added aesni/avx/x86_64 implementations for camellia.
- Optimised AVX code for cast5/serpent/twofish/cast6.
- Fixed vmac bug with unaligned input.
- Allow compression algorithms in FIPS mode.
- Optimised crc32c implementation for Intel.
- Misc fixes.
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (32 commits)
crypto: caam - Updated SEC-4.0 device tree binding for ERA information.
crypto: testmgr - remove superfluous initializers for xts(aes)
crypto: testmgr - allow compression algs in fips mode
crypto: testmgr - add larger crc32c test vector to test FPU path in crc32c_intel
crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
crypto: testmgr - remove fips_allowed flag from camellia-aesni null-tests
crypto: cast5/cast6 - move lookup tables to shared module
padata: use __this_cpu_read per-cpu helper
crypto: s5p-sss - Fix compilation error
crypto: picoxcell - Add terminating entry for platform_device_id table
crypto: omap-aes - select BLKCIPHER2
crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher
crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file
crypto: tcrypt - add async speed test for camellia cipher
crypto: tegra-aes - fix error-valued pointer dereference
crypto: tegra - fix missing unlock on error case
crypto: cast5/avx - avoid using temporary stack buffers
crypto: serpent/avx - avoid using temporary stack buffers
crypto: twofish/avx - avoid using temporary stack buffers
crypto: cast6/avx - avoid using temporary stack buffers
...
Diffstat (limited to 'drivers/crypto/Kconfig')
| -rw-r--r-- | drivers/crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index f6644f59fd9d..87ec4d027c25 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -254,6 +254,7 @@ config CRYPTO_DEV_OMAP_AES | |||
| 254 | tristate "Support for OMAP AES hw engine" | 254 | tristate "Support for OMAP AES hw engine" |
| 255 | depends on ARCH_OMAP2 || ARCH_OMAP3 | 255 | depends on ARCH_OMAP2 || ARCH_OMAP3 |
| 256 | select CRYPTO_AES | 256 | select CRYPTO_AES |
| 257 | select CRYPTO_BLKCIPHER2 | ||
| 257 | help | 258 | help |
| 258 | OMAP processors have AES module accelerator. Select this if you | 259 | OMAP processors have AES module accelerator. Select this if you |
| 259 | want to use the OMAP module for AES algorithms. | 260 | want to use the OMAP module for AES algorithms. |