tree 5d6be67fd6d49870710736e935a0c6af9b122226
parent 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36
parent ecaaab5649781c5a0effdaf298a925063020500e
author Linus Torvalds <torvalds@linux-foundation.org> 1513038765 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1513038765 -0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This push fixes the following issues:

   - buffer overread in RSA

   - potential use after free in algif_aead.

   - error path null pointer dereference in af_alg

   - forbid combinations such as hmac(hmac(sha3)) which may crash

   - crash in salsa20 due to incorrect API usage"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: salsa20 - fix blkcipher_walk API usage
  crypto: hmac - require that the underlying hash algorithm is unkeyed
  crypto: af_alg - fix NULL pointer dereference in
  crypto: algif_aead - fix reference counting of null skcipher
  crypto: rsa - fix buffer overread when stripping leading zeroes