You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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--" ...		13 years ago
..
Kconfig	crypto: caam - disable IRQ coalescing by default	13 years ago
Makefile	crypto: caam - hwrng support	13 years ago
caamalg.c	crypto: caam - add IPsec ESN support	13 years ago
caamhash.c	crypto: caam - coccicheck fixes	13 years ago
caamrng.c	crypto: caam - set descriptor sharing type to SERIAL	13 years ago
compat.h	crypto: caam - add IPsec ESN support	13 years ago
ctrl.c	crypto: caam - increase TRNG clocks per sample	13 years ago
ctrl.h	crypto: caam - ERA retrieval and printing for SEC device	13 years ago
desc.h	crypto: caam - add support for SEC v5.x RNG4	13 years ago
desc_constr.h	crypto: caam - support external seq in/out lengths	13 years ago
error.c	crypto: caam - fix error IDs for SEC v5.x RNG4	13 years ago
error.h	…
intern.h	crypto: caam - one tasklet per job ring	13 years ago
jr.c	crypto: caam - fix possible deadlock condition	13 years ago
jr.h	…
key_gen.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	13 years ago
key_gen.h	crypto: caam - refactor key_gen, sg	13 years ago
pdb.h	crypto: caam - add PDB (Protocol Descriptor Block) definitions	13 years ago
regs.h	crypto: caam - ERA retrieval and printing for SEC device	13 years ago
sg_sw_sec4.h	crypto: caam - chaining support	13 years ago