Commit 59ecc26004e77e100c700b1d0da7502b0fdadb46
Exists in
master
and in
13 other branches
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu:
"Here is the crypto update for 3.15:
- Added 3DES driver for OMAP4/AM43xx
- Added AVX2 acceleration for SHA
- Added hash-only AEAD algorithms in caam
- Removed tegra driver as it is not functioning and the hardware is
too slow
- Allow blkcipher walks over AEAD (needed for ARM)
- Fixed unprotected FPU/SSE access in ghash-clmulni-intel
- Fixed highmem crash in omap-sham
- Add (zero entropy) randomness when initialising hardware RNGs
- Fixed unaligned ahash comletion functions
- Added soft module depedency for crc32c for initrds that use crc32c"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (60 commits)
crypto: ghash-clmulni-intel - use C implementation for setkey()
crypto: x86/sha1 - reduce size of the AVX2 asm implementation
crypto: x86/sha1 - fix stack alignment of AVX2 variant
crypto: x86/sha1 - re-enable the AVX variant
crypto: sha - SHA1 transform x86_64 AVX2
crypto: crypto_wq - Fix late crypto work queue initialization
crypto: caam - add missing key_dma unmap
crypto: caam - add support for aead null encryption
crypto: testmgr - add aead null encryption test vectors
crypto: export NULL algorithms defines
crypto: caam - remove error propagation handling
crypto: hash - Simplify the ahash_finup implementation
crypto: hash - Pull out the functions to save/restore request
crypto: hash - Fix the pointer voodoo in unaligned ahash
crypto: caam - Fix first parameter to caam_init_rng
crypto: omap-sham - Map SG pages if they are HIGHMEM before accessing
crypto: caam - Dynamic memory allocation for caam_rng_ctx object
crypto: allow blkcipher walks over AEAD data
crypto: remove direct blkcipher_walk dependency on transform
hwrng: add randomness to system from rng sources
...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 52 changed files Side-by-side Diff
- arch/x86/crypto/Makefile
- arch/x86/crypto/blowfish_glue.c
- arch/x86/crypto/cast5_avx_glue.c
- arch/x86/crypto/ghash-clmulni-intel_asm.S
- arch/x86/crypto/ghash-clmulni-intel_glue.c
- arch/x86/crypto/sha1_avx2_x86_64_asm.S
- arch/x86/crypto/sha1_ssse3_glue.c
- crypto/Kconfig
- crypto/Makefile
- crypto/ahash.c
- crypto/blkcipher.c
- crypto/crc32c.c
- crypto/crc32c_generic.c
- crypto/crypto_null.c
- crypto/crypto_wq.c
- crypto/tcrypt.c
- crypto/testmgr.c
- crypto/testmgr.h
- drivers/char/hw_random/atmel-rng.c
- drivers/char/hw_random/core.c
- drivers/char/hw_random/nomadik-rng.c
- drivers/char/hw_random/omap3-rom-rng.c
- drivers/char/hw_random/picoxcell-rng.c
- drivers/char/hw_random/timeriomem-rng.c
- drivers/crypto/Kconfig
- drivers/crypto/Makefile
- drivers/crypto/bfin_crc.c
- drivers/crypto/caam/caamalg.c
- drivers/crypto/caam/caamrng.c
- drivers/crypto/caam/compat.h
- drivers/crypto/caam/ctrl.c
- drivers/crypto/caam/ctrl.h
- drivers/crypto/caam/desc_constr.h
- drivers/crypto/caam/regs.h
- drivers/crypto/ccp/ccp-crypto-main.c
- drivers/crypto/ccp/ccp-crypto-sha.c
- drivers/crypto/ccp/ccp-crypto.h
- drivers/crypto/ccp/ccp-dev.c
- drivers/crypto/ccp/ccp-ops.c
- drivers/crypto/mxs-dcp.c
- drivers/crypto/omap-aes.c
- drivers/crypto/omap-des.c
- drivers/crypto/omap-sham.c
- drivers/crypto/picoxcell_crypto.c
- drivers/crypto/s5p-sss.c
- drivers/crypto/sahara.c
- drivers/crypto/talitos.c
- drivers/crypto/tegra-aes.c
- drivers/crypto/tegra-aes.h
- include/crypto/algapi.h
- include/crypto/null.h
- include/linux/ccp.h