openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/crypto/caam
History
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
..
Kconfig crypto: caam - disable IRQ coalescing by default 2012-06-27 14:42:06 +08:00
Makefile crypto: caam - hwrng support 2012-06-27 14:42:06 +08:00
caamalg.c crypto: caam - add IPsec ESN support 2012-09-07 04:17:07 +08:00
caamhash.c crypto: caam - coccicheck fixes 2012-09-07 04:17:03 +08:00
caamrng.c crypto: caam - set descriptor sharing type to SERIAL 2012-08-01 17:47:31 +08:00
compat.h crypto: caam - add IPsec ESN support 2012-09-07 04:17:07 +08:00
ctrl.c crypto: caam - increase TRNG clocks per sample 2012-09-27 13:32:15 +08:00
ctrl.h crypto: caam - ERA retrieval and printing for SEC device 2012-07-11 11:06:11 +08:00
desc.h crypto: caam - add support for SEC v5.x RNG4 2012-06-27 14:42:06 +08:00
desc_constr.h crypto: caam - support external seq in/out lengths 2012-06-27 14:42:04 +08:00
error.c crypto: caam - fix error IDs for SEC v5.x RNG4 2012-09-27 13:32:14 +08:00
error.h crypto: caam - fix printk recursion for long error texts 2011-05-04 15:15:06 +10:00
intern.h crypto: caam - one tasklet per job ring 2012-06-27 14:42:07 +08:00
jr.c crypto: caam - fix possible deadlock condition 2012-08-20 16:35:40 +08:00
jr.h crypto: caam - Add support for the Freescale SEC4/CAAM 2011-03-27 10:45:16 +08:00
key_gen.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
key_gen.h crypto: caam - refactor key_gen, sg 2012-06-27 14:42:05 +08:00
pdb.h crypto: caam - add PDB (Protocol Descriptor Block) definitions 2012-06-27 14:42:04 +08:00
regs.h crypto: caam - ERA retrieval and printing for SEC device 2012-07-11 11:06:11 +08:00
sg_sw_sec4.h crypto: caam - chaining support 2012-06-27 14:42:05 +08:00