2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
linux-next/drivers/crypto
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
..
amcc crypto: crypto4xx - fix error return code 2012-09-27 13:32:15 +08:00
caam Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
nx crypto: nx - Remove virt_to_abs() usage in nx-842.c 2012-08-20 16:28:12 +08:00
ux500 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
atmel-aes-regs.h crypto: atmel - add Atmel AES driver 2012-07-11 11:07:40 +08:00
atmel-aes.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
atmel-sha-regs.h crypto: atmel - add Atmel SHA1/SHA256 driver 2012-07-11 11:08:28 +08:00
atmel-sha.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
atmel-tdes-regs.h crypto: atmel - add Atmel DES/TDES driver 2012-07-11 11:08:14 +08:00
atmel-tdes.c crypto: remove duplicated include 2012-09-07 04:17:03 +08:00
bfin_crc.c crypto: bfin_crc - CRC hardware driver for BF60x family processors. 2012-06-12 16:37:19 +08:00
geode-aes.c crypto: geode-aes - Use module_pci_driver 2012-09-07 04:17:03 +08:00
geode-aes.h [CRYPTO] geode: do not copy the IV too often 2008-01-11 08:16:26 +11:00
hifn_795x.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 2012-10-04 09:06:34 -07:00
ixp4xx_crypto.c crypto: ixp4xx - include fix 2012-04-05 20:34:21 +08:00
Kconfig crypto: atmel - Remove possible typo error 2012-08-20 16:28:13 +08:00
Makefile crypto: atmel - add Atmel SHA1/SHA256 driver 2012-07-11 11:08:28 +08:00
mv_cesa.c ARM: SoC fixes 2012-07-26 20:29:52 -07:00
mv_cesa.h crypto: mv_cesa - Add sha1 and hmac(sha1) async hash drivers 2010-04-13 16:50:49 +08:00
n2_asm.S crypto: n2 - Add Niagara2 crypto driver 2010-05-19 14:14:04 +10:00
n2_core.c sparc64: Adjust crypto priorities. 2012-09-15 09:06:30 -07:00
n2_core.h crypto: n2 - Add Niagara2 crypto driver 2010-05-19 14:14:04 +10:00
omap-aes.c crypto: drivers - remove cra_list initialization 2012-08-01 17:47:28 +08:00
omap-sham.c crypto: Add CRYPTO_ALG_KERN_DRIVER_ONLY flag 2012-01-13 16:38:40 +11:00
padlock-aes.c crypto: drivers - remove cra_list initialization 2012-08-01 17:47:28 +08:00
padlock-sha.c crypto: Add support for x86 cpuid auto loading for x86 crypto drivers 2012-01-26 16:48:10 -08:00
picoxcell_crypto_regs.h crypto: picoxcell - add support for the picoxcell crypto engines 2011-02-21 22:42:40 +11:00
picoxcell_crypto.c crypto: Add CRYPTO_ALG_KERN_DRIVER_ONLY flag 2012-01-13 16:38:40 +11:00
s5p-sss.c crypto: drivers - remove cra_list initialization 2012-08-01 17:47:28 +08:00
talitos.c crypto: talitos - add IPsec ESN support 2012-08-28 23:56:30 +08:00
talitos.h crypto: talitos - add sha224, sha384 and sha512 to existing AEAD algorithms 2012-07-11 11:08:29 +08:00
tegra-aes.c crypto: tegra-aes - fix error return code 2012-09-27 13:32:15 +08:00
tegra-aes.h crypto: driver for Tegra AES hardware 2012-01-13 16:38:37 +11:00