summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorRoberto Sassu <roberto.sassu@polito.it>2013-11-08 19:21:35 +0100
committerMimi Zohar <zohar@linux.vnet.ibm.com>2014-01-03 07:42:57 -0500
commitc502c78ba7fb5b9cef71e2bd70f12c38ef26e5ab (patch)
treecd708ce3fe4a3bc149b1d507450601dec18f03ed /security
parent4482a44f6a3221cd0076eb6af65672a7e198d8da (diff)
downloadlinux-stable-c502c78ba7fb5b9cef71e2bd70f12c38ef26e5ab.tar.gz
linux-stable-c502c78ba7fb5b9cef71e2bd70f12c38ef26e5ab.tar.bz2
linux-stable-c502c78ba7fb5b9cef71e2bd70f12c38ef26e5ab.zip
ima: change the default hash algorithm to SHA1 in ima_eventdigest_ng_init()
Replace HASH_ALGO__LAST with HASH_ALGO_SHA1 as the initial value of the hash algorithm so that the prefix 'sha1:' is added to violation digests. Fix commit: 4d7aeee ima: define new template ima-ng and template fields d-ng and n-ng Signed-off-by: Roberto Sassu <roberto.sassu@polito.it> Cc: <stable@vger.kernel.org> # 3.13.x Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_template_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
index 6d66ad6ed265..c2ba481f0f39 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -251,7 +251,7 @@ int ima_eventdigest_ng_init(struct integrity_iint_cache *iint,
struct evm_ima_xattr_data *xattr_value,
int xattr_len, struct ima_field_data *field_data)
{
- u8 *cur_digest = NULL, hash_algo = HASH_ALGO__LAST;
+ u8 *cur_digest = NULL, hash_algo = HASH_ALGO_SHA1;
u32 cur_digestsize = 0;
/* If iint is NULL, we are recording a violation. */