| commit | 896a349228c494aa65279ccfc41d2395898f6f4d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 27 09:13:52 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 27 09:13:52 2018 -0700 |
| tree | 94e1de33c91a97cfaf69aca949959397afa88c94 | |
| parent | 3b41c3e28e9882760b78864487558b66aaa6261e [diff] | |
| parent | 3619dec5103dd999a777e3e4ea08c8f40a6ddc57 [diff] |
Merge branch 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull more security subsystem fixes from James Morris: "Two further fixes for the keys subsystem" * 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: dh key: fix rounding up KDF output length certs/blacklist: fix const confusion