summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_init.c
diff options
context:
space:
mode:
authorDmitry Kasatkin2012-06-08 09:42:30 +0200
committerMimi Zohar2013-02-06 16:41:12 +0100
commit76bb28f6126f20ee987b9d2570fa653d95d30ae9 (patch)
treed03a184b5fb611544519662784ec50fee55bac72 /security/integrity/ima/ima_init.c
parentima: add policy support for file system uuid (diff)
downloadkernel-qcow2-linux-76bb28f6126f20ee987b9d2570fa653d95d30ae9.tar.gz
kernel-qcow2-linux-76bb28f6126f20ee987b9d2570fa653d95d30ae9.tar.xz
kernel-qcow2-linux-76bb28f6126f20ee987b9d2570fa653d95d30ae9.zip
ima: use new crypto_shash API instead of old crypto_hash
Old crypto hash API internally uses shash API. Using shash API directly is more efficient. Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_init.c')
-rw-r--r--security/integrity/ima/ima_init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
index b5dfd534f13d..162ea723db3d 100644
--- a/security/integrity/ima/ima_init.c
+++ b/security/integrity/ima/ima_init.c
@@ -85,6 +85,9 @@ int __init ima_init(void)
if (!ima_used_chip)
pr_info("IMA: No TPM chip found, activating TPM-bypass!\n");
+ rc = ima_init_crypto();
+ if (rc)
+ return rc;
ima_add_boot_aggregate(); /* boot aggregate must be first entry */
ima_init_policy();