summaryrefslogtreecommitdiff
path: root/include/keys
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2013-08-13 16:47:43 +0400
committerMimi Zohar <zohar@linux.vnet.ibm.com>2014-07-17 17:35:17 +0400
commit7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778 (patch)
treec1f4eb6fc931d72fee23716bb08c345b18d7576a /include/keys
parent32c4741cb66703a3c282f41d77deff4afd93342a (diff)
downloadlinux-7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778.tar.xz
ima: define '.ima' as a builtin 'trusted' keyring
Require all keys added to the IMA keyring be signed by an existing trusted key on the system trusted keyring. Changelog v6: - remove ifdef CONFIG_IMA_TRUSTED_KEYRING in C code - Dmitry - update Kconfig dependency and help - select KEYS_DEBUG_PROC_KEYS - Dmitry Changelog v5: - Move integrity_init_keyring() to init_ima() - Dmitry - reset keyring[id] on failure - Dmitry Changelog v1: - don't link IMA trusted keyring to user keyring Changelog: - define stub integrity_init_keyring() function (reported-by Fengguang Wu) - differentiate between regular and trusted keyring names. - replace printk with pr_info (D. Kasatkin) - only make the IMA keyring a trusted keyring (reported-by D. Kastatkin) - define stub integrity_init_keyring() definition based on CONFIG_INTEGRITY_SIGNATURE, not CONFIG_INTEGRITY_ASYMMETRIC_KEYS. (reported-by Jim Davis) Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Acked-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions