Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2021 20:05:11 +0000 (12:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2021 20:05:11 +0000 (12:05 -0800)
commitea1c87c156d94dd78b4f5267ec40c403b2da7e14
tree84a8227bbcc316a022f3d58d09ac1a165b0c76e2
parentef0ba05538299f1391cbe097de36895bb36ecfe6
parent0aa171e9b267ce7c52d3a3df7bc9c1fc0203dec5
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a functional bug in arm/chacha-neon as well as a potential
  buffer overflow in ecdh"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: ecdh - avoid buffer overflow in ecdh_set_secret()
  crypto: arm/chacha-neon - add missing counter increment