Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50af5544 authored by Dmitry Kasatkin's avatar Dmitry Kasatkin Committed by Mimi Zohar
Browse files

ima: rename hash calculation functions 



Rename hash calculation functions to reflect meaning
and change argument order in conventional way.

Signed-off-by: default avatarDmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent 76bb28f6

security/integrity/ima/ima.h

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 @@ int ima_calc_hash(struct file *file, char *digest) 
}



/*

 * 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)