summaryrefslogtreecommitdiff
path: root/include/crypto/serpent.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:54:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:54:15 -0800
commit7a308bb3016f57e5be11a677d15b821536419d36 (patch)
treefe38c83c49dfd568b540666948ef78cb9d082c38 /include/crypto/serpent.h
parent095cbe66973771fecd8e8b1e8763181363ef703e (diff)
Linux 4.10-rc5
Diffstat (limited to 'include/crypto/serpent.h')
0 files changed, 0 insertions, 0 deletions
i/linux/net-next.git/diff/tools/perf/Documentation/perf-archive.txt?h=nds-private-remove&id=045169816b31b10faed984b01c390db1b32ee4c1&id2=678b5c6b22fed89a13d5b2267f423069a9b11c80'>diff)
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 'tools/perf/Documentation/perf-archive.txt')