diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-10 09:47:13 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-10 09:47:13 -0800 |
commit | 3e39d71f9e785538cfb91cd75e7f169bb2a34d5b (patch) | |
tree | 9c40e598432f5c8f3360dffc20abcea287c4045d /crypto/async_tx/async_memcpy.c | |
parent | d3372436ebe3fbf2b1e407ad3e0c04b2ce5de675 (diff) | |
parent | 336a64fc952cbf5d06a66daa30de4f3993725002 (diff) | |
download | linux-crypto-3e39d71f9e785538cfb91cd75e7f169bb2a34d5b.tar.gz linux-crypto-3e39d71f9e785538cfb91cd75e7f169bb2a34d5b.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes the following issues:
- Fix pointer size when caam is used with AArch64 boot loader on
AArch32 kernel.
- Fix ahash state corruption in marvell driver.
- Fix buggy algif_aed tag handling.
- Prevent mcryptd from being used with incompatible algorithms which
can cause crashes"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: algif_aead - fix uninitialized variable warning
crypto: mcryptd - Check mcryptd algorithm compatibility
crypto: algif_aead - fix AEAD tag memory handling
crypto: caam - fix pointer size for AArch64 boot loader, AArch32 kernel
crypto: marvell - Don't corrupt state of an STD req for re-stepped ahash
crypto: marvell - Don't copy hash operation twice into the SRAM
Diffstat (limited to 'crypto/async_tx/async_memcpy.c')
0 files changed, 0 insertions, 0 deletions