Linus Torvalds 34ef7bd382 Revert "ima: define '_ima' as a builtin 'trusted' keyring" ... This reverts commit 217091dd7a, which caused the following build error: security/integrity/digsig.c:70:5: error: redefinition of ‘integrity_init_keyring’ security/integrity/integrity.h:149:12: note: previous definition of ‘integrity_init_keyring’ w security/integrity/integrity.h:149:12: warning: ‘integrity_init_keyring’ defined but not used reported by Krzysztof Kolasa. Mimi says: "I made the classic mistake of requesting this patch to be upstreamed at the last second, rather than waiting until the next open window. At this point, the best course would probably be to revert the two commits and fix them for the next open window" Reported-by: Krzysztof Kolasa <kkolasa@winsoft.pl> Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>		2013-11-23 16:36:35 -08:00
..
ima_api.c	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima_appraise.c	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
ima_crypto.c	ima: switch to new template management mechanism	2013-10-25 17:17:06 -04:00
ima_fs.c	ima: switch to new template management mechanism	2013-10-25 17:17:06 -04:00
ima_init.c	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima_main.c	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima_policy.c	Revert "ima: policy for RAMFS"	2013-10-25 13:17:19 -04:00
ima_queue.c	ima: pass the filename argument up to ima_add_template_entry()	2013-10-25 17:17:03 -04:00
ima_template_lib.c	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima_template_lib.h	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima_template.c	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
ima.h	ima: extend the measurement list to include the file signature	2013-10-31 20:19:35 -04:00
Kconfig	Revert "ima: define '_ima' as a builtin 'trusted' keyring"	2013-11-23 16:36:35 -08:00
Makefile	ima: define template fields library and new helpers	2013-10-25 17:17:05 -04:00