ima: rename _sig and _digest printing functions to _hex
Rename hex printing function to corresponding name.
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 86f11eb..d2c01cd 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -117,7 +117,7 @@
const char *op, const char *cause);
int ima_init_crypto(void);
void ima_putc(struct seq_file *m, void *data, int datalen);
-void ima_print_digest(struct seq_file *m, u8 *digest, u32 size);
+void ima_print_hex(struct seq_file *m, u8 *digest, u32 size);
struct ima_template_desc *ima_template_desc_current(void);
int ima_init_template(void);
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index 25cf565..3306879 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -190,7 +190,7 @@
.release = seq_release,
};
-void ima_print_digest(struct seq_file *m, u8 *digest, u32 size)
+void ima_print_hex(struct seq_file *m, u8 *digest, u32 size)
{
u32 i;
@@ -219,7 +219,7 @@
seq_printf(m, "%2d ", CONFIG_IMA_MEASURE_PCR_IDX);
/* 2nd: SHA1 template hash */
- ima_print_digest(m, e->digest, TPM_DIGEST_SIZE);
+ ima_print_hex(m, e->digest, TPM_DIGEST_SIZE);
/* 3th: template name */
seq_printf(m, " %s", template_name);
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c
index febd12e..cf10db9 100644
--- a/security/integrity/ima/ima_template.c
+++ b/security/integrity/ima/ima_template.c
@@ -35,7 +35,7 @@
{.field_id = "n-ng", .field_init = ima_eventname_ng_init,
.field_show = ima_show_template_string},
{.field_id = "sig", .field_init = ima_eventsig_init,
- .field_show = ima_show_template_sig},
+ .field_show = ima_show_template_hex},
};
static struct ima_template_desc *ima_template;
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
index f9bae04..1f74511 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -85,7 +85,7 @@
case DATA_FMT_HEX:
if (!buflen)
break;
- ima_print_digest(m, buf_ptr, buflen);
+ ima_print_hex(m, buf_ptr, buflen);
break;
case DATA_FMT_STRING:
seq_printf(m, "%s", buf_ptr);
@@ -150,7 +150,7 @@
ima_show_template_field_data(m, show, DATA_FMT_STRING, field_data);
}
-void ima_show_template_sig(struct seq_file *m, enum ima_show_type show,
+void ima_show_template_hex(struct seq_file *m, enum ima_show_type show,
struct ima_field_data *field_data)
{
ima_show_template_field_data(m, show, DATA_FMT_HEX, field_data);
diff --git a/security/integrity/ima/ima_template_lib.h b/security/integrity/ima/ima_template_lib.h
index c344530..46e3f4d 100644
--- a/security/integrity/ima/ima_template_lib.h
+++ b/security/integrity/ima/ima_template_lib.h
@@ -24,7 +24,7 @@
struct ima_field_data *field_data);
void ima_show_template_string(struct seq_file *m, enum ima_show_type show,
struct ima_field_data *field_data);
-void ima_show_template_sig(struct seq_file *m, enum ima_show_type show,
+void ima_show_template_hex(struct seq_file *m, enum ima_show_type show,
struct ima_field_data *field_data);
int ima_eventdigest_init(struct ima_event_data *event_data,
struct ima_field_data *field_data);
