diff options
| author | Dmitry Kasatkin <dmitry.kasatkin@intel.com> | 2012-05-14 15:13:56 +0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2013-02-06 19:41:13 +0400 |
| commit | 50af554466804bf51a52fa3d1d0a76f96bd33929 (patch) | |
| tree | b7a3737c726a690ddefa60fdc01427d46d1d08b2 /security/integrity/ima/ima_crypto.c | |
| parent | 76bb28f6126f20ee987b9d2570fa653d95d30ae9 (diff) | |
| download | linux-50af554466804bf51a52fa3d1d0a76f96bd33929.tar.xz | |
ima: rename hash calculation functions
Rename hash calculation functions to reflect meaning
and change argument order in conventional way.
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_crypto.c')
| -rw-r--r-- | security/integrity/ima/ima_crypto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c index 920f49cfbf13..b691e0f3830c 100644 --- a/security/integrity/ima/ima_crypto.c +++ b/security/integrity/ima/ima_crypto.c @@ -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) |