summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/Kconfig
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2013-07-23 17:15:00 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2013-11-01 01:19:35 +0100
commitbcbc9b0cf6d8f340a1d166e414f4612b353f7a9b (patch)
treecd728f166ccf86137a7a8a7847ce962488ff86e2 /security/integrity/ima/Kconfig
parentMerge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dh... (diff)
downloadlinux-bcbc9b0cf6d8f340a1d166e414f4612b353f7a9b.tar.xz
linux-bcbc9b0cf6d8f340a1d166e414f4612b353f7a9b.zip
ima: extend the measurement list to include the file signature
This patch defines a new template called 'ima-sig', which includes the file signature in the template data, in addition to the file's digest and pathname. A template is composed of a set of fields. Associated with each field is an initialization and display function. This patch defines a new template field called 'sig', the initialization function ima_eventsig_init(), and the display function ima_show_template_sig(). This patch modifies the .field_init() function definition to include the 'security.ima' extended attribute and length. Changelog: - remove unused code (Dmitry Kasatkin) - avoid calling ima_write_template_field_data() unnecesarily (Roberto Sassu) - rename DATA_FMT_SIG to DATA_FMT_HEX - cleanup ima_eventsig_init() based on Roberto's comments Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Signed-off-by: Roberto Sassu <roberto.sassu@polito.it>
Diffstat (limited to 'security/integrity/ima/Kconfig')
-rw-r--r--security/integrity/ima/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 351a58ed56ab..81a27971d884 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -63,6 +63,8 @@ choice
bool "ima"
config IMA_NG_TEMPLATE
bool "ima-ng (default)"
+ config IMA_SIG_TEMPLATE
+ bool "ima-sig"
endchoice
config IMA_DEFAULT_TEMPLATE
@@ -70,6 +72,7 @@ config IMA_DEFAULT_TEMPLATE
depends on IMA
default "ima" if IMA_TEMPLATE
default "ima-ng" if IMA_NG_TEMPLATE
+ default "ima-sig" if IMA_SIG_TEMPLATE
choice
prompt "Default integrity hash algorithm"