diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 02:26:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-24 02:26:27 +0200 |
| commit | 3159ee58d2133fbf9a710c21201ce717a8cf61a0 (patch) | |
| tree | 2c1cbf7507dd9299c3f957299eef4cc59d0f2bd6 /MAINTAINERS | |
| parent | Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | Merge tag 'keys-next-20160511' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-3159ee58d2133fbf9a710c21201ce717a8cf61a0.tar.xz linux-3159ee58d2133fbf9a710c21201ce717a8cf61a0.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull more security subsystem updates from James Morris:
"Minor updates for the keys code"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
MAINTAINERS: Update keyrings record and add asymmetric keys record
lib: asn1_decoder - add MODULE_LICENSE("GPL")
KEYS: The PKCS#7 test key type should use the secondary keyring
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ee7fb1668c15..f27ff1b32757 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1951,6 +1951,16 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/asus-wireless.c +ASYMMETRIC KEYS +M: David Howells <dhowells@redhat.com> +L: keyrings@vger.kernel.org +S: Maintained +F: Documentation/crypto/asymmetric-keys.txt +F: include/linux/verification.h +F: include/crypto/public_key.h +F: include/crypto/pkcs7.h +F: crypto/asymmetric_keys/ + ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API R: Dan Williams <dan.j.williams@intel.com> W: http://sourceforge.net/projects/xscaleiop @@ -6557,6 +6567,8 @@ S: Maintained F: Documentation/security/keys.txt F: include/linux/key.h F: include/linux/key-type.h +F: include/linux/keyctl.h +F: include/uapi/linux/keyctl.h F: include/keys/ F: security/keys/ |