Linus Torvalds d66e6737d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 ... Pull crypto update from Herbert Xu: - Optimised AES/SHA1 for ARM. - IPsec ESN support in talitos and caam. - x86_64/avx implementation of cast5/cast6. - Add/use multi-algorithm registration helpers where possible. - Added IBM Power7+ in-Nest support. - Misc fixes. Fix up trivial conflicts in crypto/Kconfig due to the sparc64 crypto config options being added next to the new ARM ones. [ Side note: cut-and-paste duplicate help texts make those conflicts harder to read than necessary, thanks to git being smart about minimizing conflicts and maximizing the common parts... ] * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (71 commits) crypto: x86/glue_helper - fix storing of new IV in CBC encryption crypto: cast5/avx - fix storing of new IV in CBC encryption crypto: tcrypt - add missing tests for camellia and ghash crypto: testmgr - make test_aead also test 'dst != src' code paths crypto: testmgr - make test_skcipher also test 'dst != src' code paths crypto: testmgr - add test vectors for CTR mode IV increasement crypto: testmgr - add test vectors for partial ctr(cast5) and ctr(cast6) crypto: testmgr - allow non-multi page and multi page skcipher tests from same test template crypto: caam - increase TRNG clocks per sample crypto, tcrypt: remove local_bh_disable/enable() around local_irq_disable/enable() crypto: tegra-aes - fix error return code crypto: crypto4xx - fix error return code crypto: hifn_795x - fix error return code crypto: ux500 - fix error return code crypto: caam - fix error IDs for SEC v5.x RNG4 hwrng: mxc-rnga - Access data via structure hwrng: mxc-rnga - Adapt clocks to new i.mx clock framework crypto: caam - add IPsec ESN support crypto: 842 - remove .cra_list initialization Revert "[CRYPTO] cast6: inline bloat--" ...		2012-10-04 09:06:34 -07:00
..
async_tx
842.c	crypto: 842 - remove .cra_list initialization	2012-09-07 04:17:06 +08:00
ablkcipher.c
aead.c
aes_generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
af_alg.c
ahash.c
algapi.c
algboss.c
algif_hash.c
algif_skcipher.c
ansi_cprng.c	crypto: ansi_cprng - use crypto_[un]register_algs	2012-08-01 17:47:25 +08:00
anubis.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
api.c
arc4.c
authenc.c	crypto: authenc - Fix crash with zero-length assoc data	2012-09-11 12:05:45 +08:00
authencesn.c
blkcipher.c
blowfish_common.c
blowfish_generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
camellia_generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
cast5_generic.c	crypto: cast5 - prepare generic module for optimized implementations	2012-08-01 17:47:29 +08:00
cast6_generic.c	Revert "[CRYPTO] cast6: inline bloat--"	2012-09-07 04:17:06 +08:00
cbc.c
ccm.c
chainiv.c
cipher.c
compress.c
crc32c.c
cryptd.c
crypto_null.c	crypto: crypto_null - use crypto_[un]register_algs	2012-08-01 17:47:24 +08:00
crypto_user.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
crypto_wq.c
ctr.c
cts.c
deflate.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
des_generic.c	crypto: des - use crypto_[un]register_algs	2012-08-01 17:47:24 +08:00
ecb.c
eseqiv.c
fcrypt.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
fips.c
gcm.c
gf128mul.c
ghash-generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
hmac.c
internal.h
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2012-10-04 09:06:34 -07:00
khazad.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
krng.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
lrw.c
lzo.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
Makefile	powerpc/crypto: add 842 crypto driver	2012-08-01 17:47:56 +08:00
md4.c
md5.c
michael_mic.c
pcbc.c
pcompress.c
pcrypt.c
proc.c
ripemd.h
rmd128.c
rmd160.c
rmd256.c
rmd320.c
rng.c
salsa20_generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
scatterwalk.c
seed.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
seqiv.c
serpent_generic.c	crypto: serpent - use crypto_[un]register_algs	2012-08-01 17:47:25 +08:00
sha1_generic.c
sha256_generic.c	crypto: sha256 - use crypto_[un]register_shashes	2012-08-01 17:47:26 +08:00
sha512_generic.c	crypto: sha512 - use crypto_[un]register_shashes	2012-08-01 17:47:26 +08:00
shash.c	crypto: add crypto_[un]register_shashes for [un]registering multiple shash entries at once	2012-08-01 17:47:26 +08:00
tcrypt.c	crypto: tcrypt - add missing tests for camellia and ghash	2012-09-27 13:32:16 +08:00
tcrypt.h	crypto: testmgr - add larger cast5 testvectors	2012-08-01 17:47:29 +08:00
tea.c
testmgr.c	crypto: testmgr - make test_aead also test 'dst != src' code paths	2012-09-27 13:32:16 +08:00
testmgr.h	crypto: testmgr - add test vectors for CTR mode IV increasement	2012-09-27 13:32:16 +08:00
tgr192.c	crypto: tiger - use crypto_[un]register_shashes	2012-08-01 17:47:26 +08:00
twofish_common.c
twofish_generic.c	crypto: cleanup - remove unneeded crypto_alg.cra_list initializations	2012-08-01 17:47:27 +08:00
vmac.c	crypto: crypto_user - fix sparse warnings (symbol was not declared, should be static?)	2012-09-07 04:17:05 +08:00
wp512.c	crypto: whirlpool - use crypto_[un]register_shashes	2012-08-01 17:47:27 +08:00
xcbc.c
xor.c
xts.c
zlib.c