diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 19:38:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-13 19:38:13 +0200 |
| commit | c024814828f72b1ae9cc2c338997b2d9826c80f6 (patch) | |
| tree | 5498b816df7b6d094c8994abeed82f1d77cb12cb /MAINTAINERS | |
| parent | Merge tag 'slab-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/vb... (diff) | |
| parent | docs: trusted-encrypted: add DCP as new trust source (diff) | |
| download | linux-c024814828f72b1ae9cc2c338997b2d9826c80f6.tar.xz linux-c024814828f72b1ae9cc2c338997b2d9826c80f6.zip | |
Merge tag 'keys-trusted-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull trusted keys updates from Jarkko Sakkinen:
"This contains a new key type for the Data Co-Processor (DCP), which is
an IP core built into many NXP SoCs such as i.mx6ull"
* tag 'keys-trusted-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
docs: trusted-encrypted: add DCP as new trust source
docs: document DCP-backed trusted keys kernel params
MAINTAINERS: add entry for DCP-based trusted keys
KEYS: trusted: Introduce NXP DCP-backed trusted keys
KEYS: trusted: improve scalability of trust source config
crypto: mxs-dcp: Add support for hardware-bound keys
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3ae91a5185d5..c52d553dc292 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12037,6 +12037,15 @@ S: Maintained F: include/keys/trusted_caam.h F: security/keys/trusted-keys/trusted_caam.c +KEYS-TRUSTED-DCP +M: David Gstir <david@sigma-star.at> +R: sigma star Kernel Team <upstream+dcp@sigma-star.at> +L: linux-integrity@vger.kernel.org +L: keyrings@vger.kernel.org +S: Supported +F: include/keys/trusted_dcp.h +F: security/keys/trusted-keys/trusted_dcp.c + KEYS-TRUSTED-TEE M: Sumit Garg <sumit.garg@linaro.org> L: linux-integrity@vger.kernel.org |