tree 3db8274e509dded5e864b4af9154ffd2b4f0a846
parent 8ff77206aa36949afab46be43a3d14af75a4e270
parent 2db34e78f126c6001d79d3b66ab1abb482dc7caa
author Linus Torvalds <torvalds@linux-foundation.org> 1474315114 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1474315114 -0700

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 a potential weakness in IPsec CBC IV generation, as well as
  a number of issues that arose out of an OOM crash on ARM with CTR-mode
  AES"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: arm64/aes-ctr - fix NULL dereference in tail processing
  crypto: arm/aes-ctr - fix NULL dereference in tail processing
  crypto: skcipher - Fix blkcipher walk OOM crash
  crypto: echainiv - Replace chaining with multiplication