ima: use new crypto_shash API instead of old crypto_hash
Subsystems (3)
PATCH 1/2 ima: use new crypto_shash API instead of old crypto_hash
From: Dmitry Kasatkin <[email protected]>
Old crypto hash API internally uses shash API.
Using shash API directly is more efficient.
Signed-off-by Dmitry Kasatkin <[email protected]>
Signed-off-by Mimi Zohar <[email protected]>
--- security/integrity/ima/ima.h | 1 + security/integrity/ima/ima_crypto.c | 75 ++++++++++++++++++------------------- security/integrity/ima/ima_init.c | 3 ++ 3 files changed, 41 insertions(+), 38 deletions(-)
security/integrity/ima/ima.h +1 -0
@@ -89,6 +89,7 @@ int ima_calc_template_hash(int template_len, void *template, char *digest);int ima_calc_boot_aggregate (char *digest);void ima_add_violation (struct inode *inode,const unsigned char *filename,const char *op,const char *cause); +int ima_init_crypto (void );/* * used to protect h_table and sha_table
security/integrity/ima/ima_crypto.c +37 -38
136 lines not on this page · raw message
security/integrity/ima/ima_init.c +3 -0
@@ -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 ();
Signature · 1 line
1.8.1.rc3
PATCH 2/2 ima: rename hash calculation functions
From: Dmitry Kasatkin <[email protected]>
Rename hash calculation functions to reflect meaning and change argument order in conventional way.
Signed-off-by Dmitry Kasatkin <[email protected]>
Signed-off-by Mimi Zohar <[email protected]>
--- security/integrity/ima/ima.h | 4 ++-- security/integrity/ima/ima_api.c | 6 +++--- security/integrity/ima/ima_crypto.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-)
security/integrity/ima/ima.h +2 -2
@@ -84,8 +84,8 @@ void ima_fs_cleanup(void);int ima_inode_alloc (struct inode *inode);int ima_add_template_entry (struct ima_template_entry *entry,int violation,const char *op,struct inode *inode); -int ima_calc_hash (struct file *file,char *digest); -int ima_calc_template_hash (int template_len,void *template,char *digest); +int ima_calc_file_hash (struct file *file,char *digest); +int ima_calc_buffer_hash (const void *data,int len,char *digest);int ima_calc_boot_aggregate (char *digest);void ima_add_violation (struct inode *inode,const unsigned char *filename,const char *op,const char *cause);
security/integrity/ima/ima_api.c +3 -3
@@ -50,8 +50,8 @@ int ima_store_template(struct ima_template_entry *entry, entry->template_len =sizeof (entry->template);if (!violation) { - result =ima_calc_template_hash (entry->template_len, - &entry->template, + result =ima_calc_buffer_hash (&entry->template, + entry->template_len, entry->digest);if (result <0 ) { integrity_audit_msg(AUDIT_INTEGRITY_PCR, inode,
@@ -148,7 +148,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,u64 i_version = file->f_dentry->d_inode->i_version; iint->ima_xattr.type =IMA_XATTR_DIGEST ; - result =ima_calc_hash (file, iint->ima_xattr.digest); + result =ima_calc_file_hash (file, iint->ima_xattr.digest);if (!result) { iint->version = i_version; iint->flags |=IMA_COLLECTED ;
security/integrity/ima/ima_crypto.c +4 -4
@@ -40,7 +40,7 @@ int ima_init_crypto(void)/* * Calculate the MD5/SHA1 file digest */ -int ima_calc_hash (struct file *file,char *digest) +int ima_calc_file_hash (struct file *file,char *digest) {loff_t i_size, offset =0 ;char *rbuf;
@@ -93,9 +93,9 @@ out: }/* -* Calculate the hash of a given template +* Calculate the hash of a given buffer */ -int ima_calc_template_hash (int template_len,void *template,char *digest) +int ima_calc_buffer_hash (const void *data,int len,char *digest) {struct {struct shash_desc shash;
@@ -105,7 +105,7 @@ int ima_calc_template_hash(int template_len, void *template, char *digest) desc.shash.tfm = ima_shash_tfm; desc.shash.flags =0 ; -return crypto_shash_digest (&desc.shash, template, template_len, digest); +return crypto_shash_digest (&desc.shash, data, len, digest); }static void __init ima_pcrread (int idx,u8 *pcr)
Signature · 1 line
1.8.1.rc3