diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 10:27:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-04 10:27:07 -0700 |
| commit | a484a497c98a0447aca2d70de19d11b1d66e6ef7 (patch) | |
| tree | 2236437e31f5e84398b767d4d1c571bd7c7538fc /security/Makefile | |
| parent | 38b3a5aaf2fd35e997550b855cfb7460b077236a (diff) | |
| parent | b6f61c31464940513ef4eccb3a030a405b4256d6 (diff) | |
Merge tag 'keys-next-20200602' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull keyring updates from David Howells:
- Fix a documentation warning.
- Replace a zero-length array with a flexible one
- Make the big_key key type use ChaCha20Poly1305 and use the crypto
algorithm directly rather than going through the crypto layer.
- Implement the update op for the big_key type.
* tag 'keys-next-20200602' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
keys: Implement update for the big_key type
security/keys: rewrite big_key crypto to use library interface
KEYS: Replace zero-length array with flexible-array
Documentation: security: core.rst: add missing argument
Diffstat (limited to 'security/Makefile')
0 files changed, 0 insertions, 0 deletions