diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-04 08:53:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-04 08:53:09 -0800 |
commit | fdf7102b0226e5aa354940fc5e79832f9416921d (patch) | |
tree | 4942186d50e6cc5ce979886822773ca7d5775b81 /crypto/michael_mic.c | |
parent | 3f65553e044900229be7035fcc7afe6a4a894106 (diff) | |
parent | cf0acf8791d9d67787193f6534534528ef624f57 (diff) | |
download | linux-crypto-fdf7102b0226e5aa354940fc5e79832f9416921d.tar.gz linux-crypto-fdf7102b0226e5aa354940fc5e79832f9416921d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This push fixes a number of crashes triggered by a previous crypto
self-test update. It also fixes a build problem in the caam driver,
as well as a concurrency issue in s390.
Finally there is a pair of fixes to bugs in the crypto scatterwalk
code and authenc that may lead to crashes"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: testmgr - fix sglen in test_aead for case 'dst != src'
crypto: talitos - fix aead sglen for case 'dst != src'
crypto: caam - fix aead sglen for case 'dst != src'
crypto: ccm - Fix handling of zero plaintext when computing mac
crypto: s390 - Fix aes-xts parameter corruption
crypto: talitos - corrrectly handle zero-length assoc data
crypto: scatterwalk - Set the chain pointer indication bit
crypto: authenc - Find proper IV address in ablkcipher callback
crypto: caam - Add missing Job Ring include
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions