Linus Torvalds 1ed55eac3b 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 ...		2012-12-15 12:35:19 -08:00
..
ablk_helper.c	crypto: aes_ni - change to use shared ablk_* functions	2012-06-27 14:42:01 +08:00
aes_glue.c	crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
aes-i586-asm_32.S	crypto: aes - Export x86 AES encrypt/decrypt functions	2009-02-18 16:48:05 +08:00
aes-x86_64-asm_64.S	crypto: aes - Export x86 AES encrypt/decrypt functions	2009-02-18 16:48:05 +08:00
aesni-intel_asm.S	crypto: aesni-intel - fix unaligned cbc decrypt for x86-32	2012-05-31 20:53:22 +10:00
aesni-intel_glue.c	crypto: aesni - fix XTS mode on x86-32, add wrapper function for asmlinkage aesni_enc()	2012-10-18 14:01:33 -07:00
blowfish_glue.c	crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
blowfish-x86_64-asm_64.S	crypto: blowfish-x86_64 - improve x86_64 blowfish 4-way performance	2011-10-21 14:23:07 +02:00
camellia_aesni_avx_glue.c	crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher	2012-11-09 17:32:32 +08:00
camellia_glue.c	crypto: camellia-x86_64 - share common functions and move structures and function definitions to header file	2012-11-09 17:32:31 +08:00
camellia-aesni-avx-asm_64.S	crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher	2012-11-09 17:32:32 +08:00
camellia-x86_64-asm_64.S	crypto: camellia - add assembler implementation for x86_64	2012-03-14 17:25:56 +08:00
cast5_avx_glue.c	crypto: cast5/avx - avoid using temporary stack buffers	2012-10-24 21:10:55 +08:00
cast5-avx-x86_64-asm_64.S	crypto: cast5/cast6 - move lookup tables to shared module	2012-12-06 17:16:26 +08:00
cast6_avx_glue.c	crypto: cast6/avx - avoid using temporary stack buffers	2012-10-24 21:10:54 +08:00
cast6-avx-x86_64-asm_64.S	crypto: cast5/cast6 - move lookup tables to shared module	2012-12-06 17:16:26 +08:00
crc32c-intel_glue.c	crypto: crc32c - Optimize CRC32C calculation with PCLMULQDQ instruction	2012-10-15 22:18:24 +08:00
crc32c-pcl-intel-asm_64.S	crypto: crc32c - Optimize CRC32C calculation with PCLMULQDQ instruction	2012-10-15 22:18:24 +08:00
fpu.c	crypto: aesni-intel - Merge with fpu.ko	2011-05-16 15:12:47 +10:00
ghash-clmulni-intel_asm.S	crypto: ghash-clmulni-intel - Put proper .data section in place	2009-11-23 20:19:47 +08:00
ghash-clmulni-intel_glue.c	crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
glue_helper-asm-avx.S	crypto: cast6/avx - avoid using temporary stack buffers	2012-10-24 21:10:54 +08:00
glue_helper.c	crypto: x86/glue_helper - use le128 instead of u128 for CTR mode	2012-10-24 21:10:54 +08:00
Makefile	crypto: camellia - add AES-NI/AVX/x86_64 assembler implementation of camellia cipher	2012-11-09 17:32:32 +08:00
salsa20_glue.c	crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
salsa20-i586-asm_32.S	[CRYPTO] salsa20_i586: Salsa20 stream cipher algorithm (i586 version)	2008-01-11 08:16:57 +11:00
salsa20-x86_64-asm_64.S	[CRYPTO] salsa20: Add x86-64 assembly version	2008-01-11 08:16:57 +11:00
serpent_avx_glue.c	crypto: serpent/avx - avoid using temporary stack buffers	2012-10-24 21:10:55 +08:00
serpent_sse2_glue.c	crypto: x86/glue_helper - use le128 instead of u128 for CTR mode	2012-10-24 21:10:54 +08:00
serpent-avx-x86_64-asm_64.S	crypto: serpent/avx - avoid using temporary stack buffers	2012-10-24 21:10:55 +08:00
serpent-sse2-i586-asm_32.S	crypto: serpent-sse2 - change transpose_4x4 to only use integer instructions	2012-01-13 16:38:40 +11:00
serpent-sse2-x86_64-asm_64.S	crypto: serpent-sse2 - change transpose_4x4 to only use integer instructions	2012-01-13 16:38:40 +11:00
sha1_ssse3_asm.S	crypto: sha1 - use Kbuild supplied flags for AVX test	2012-06-12 16:37:16 +08:00
sha1_ssse3_glue.c	crypto: sha1 - use Kbuild supplied flags for AVX test	2012-06-12 16:37:16 +08:00
twofish_avx_glue.c	crypto: twofish/avx - avoid using temporary stack buffers	2012-10-24 21:10:55 +08:00
twofish_glue_3way.c	crypto: x86/glue_helper - use le128 instead of u128 for CTR mode	2012-10-24 21:10:54 +08:00
twofish_glue.c	crypto: arch/x86 - cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
twofish-avx-x86_64-asm_64.S	crypto: twofish/avx - avoid using temporary stack buffers	2012-10-24 21:10:55 +08:00
twofish-i586-asm_32.S	crypto: twofish-x86-asm - make assembler functions use twofish_ctx instead of crypto_tfm	2011-10-21 14:23:08 +02:00
twofish-x86_64-asm_64-3way.S	crypto: twofish - add 3-way parallel x86_64 assembler implemention	2011-10-21 14:23:08 +02:00
twofish-x86_64-asm_64.S	crypto: twofish-x86-asm - make assembler functions use twofish_ctx instead of crypto_tfm	2011-10-21 14:23:08 +02:00