diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-06 09:05:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-06 09:05:03 -0800 |
| commit | af903dcd31e1b345d858ca2af9a84ed61c960b57 (patch) | |
| tree | d355ee40aa413a22e45df97ac1a3527aa8eacd37 /scripts | |
| parent | 39dae59d66acd86d1de24294bd2f343fd5e7a625 (diff) | |
| parent | 441f99c90497e15aa3ad1dbabd56187e29614348 (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 an unaligned panic in x86/sha-mb and a bug in ccm that
triggers with certain underlying implementations"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ccm - preserve the IV buffer
crypto: x86/sha1-mb - fix panic due to unaligned access
crypto: x86/sha256-mb - fix panic due to unaligned access
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions