diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 13:10:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 13:10:49 -0700 |
commit | ae8766042beee814c9e16e9ae1e84cd6eaa7ffaa (patch) | |
tree | 8b1932b18bcfb1856b27e32d326d500ccaad218b /crypto/scompress.c | |
parent | 01047631df813f6247185547c3778c80af088a20 (diff) | |
parent | 7829a0c1cb9c80debfb4fdb49b4d90019f2ea1ac (diff) | |
download | linux-ae8766042beee814c9e16e9ae1e84cd6eaa7ffaa.tar.bz2 |
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 regression that breaks the jitterentropy RNG and a
potential memory leak in hmac"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: hmac - fix memory leak in hmac_init_tfm()
crypto: jitterentropy - change back to module_init()
Diffstat (limited to 'crypto/scompress.c')
0 files changed, 0 insertions, 0 deletions