]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2018 17:02:44 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2018 17:02:44 +0000 (10:02 -0700)
Pull crypto fixes from Herbert Xu:

 - crypto API regression that may cause sporadic alloc failures

 - double-free bug in drbg

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: drbg - set freed buffers to NULL
  crypto: api - fix finding algorithm currently being tested


Trivial merge