diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:30 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:30 +0800 |
| commit | 0e41cf483e97ab37b79bcb06eb6582b31404d3b2 (patch) | |
| tree | ae020208b928d0dc9d75e66ad57983a0450bf9ba /MAINTAINERS | |
| parent | 96f124e4180dc83550138ad9a3ebe33ec1b3e9ce (diff) | |
| parent | bb7f2bc98a3cf3f483d934d53871784b2bbe5204 (diff) | |
Merge branch 'keys/next' into next
* keys/next:
encrypted_keys: Adds support for secure key-type as master key.
security/keys/secure_key: Adds the secure key support based on CAAM.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 07cb4d674c93..1d34b2c07913 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9062,6 +9062,18 @@ F: include/keys/trusted-type.h F: security/keys/trusted.c F: include/keys/trusted.h +KEYS-SECURE +M: Udit Agarwal <udit.agarwal@nxp.com> +R: Sahil Malhotra <sahil.malhotra@nxp.com> +L: linux-security-module@vger.kernel.org +L: keyrings@vger.kernel.org +S: Supported +F: include/keys/secure-type.h +F: security/keys/secure_key.c +F: security/keys/securekey_desc.c +F: security/keys/securekey_desc.h +F: security/keys/encrypted-keys/masterkey_secure.c + KEYS/KEYRINGS: M: David Howells <dhowells@redhat.com> M: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> |