projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()
[linux-2.6-microblaze.git]
/
security
/
integrity
/
ima
/
ima_crypto.c
diff --git
a/security/integrity/ima/ima_crypto.c
b/security/integrity/ima/ima_crypto.c
index
5201f5e
..
002fdf6
100644
(file)
--- a/
security/integrity/ima/ima_crypto.c
+++ b/
security/integrity/ima/ima_crypto.c
@@
-806,8
+806,8
@@
static void __init ima_pcrread(u32 idx, struct tpm_digest *d)
* hash algorithm for reading the TPM PCRs as for calculating the boot
* aggregate digest as stored in the measurement list.
*/
* hash algorithm for reading the TPM PCRs as for calculating the boot
* aggregate digest as stored in the measurement list.
*/
-static int
__init
ima_calc_boot_aggregate_tfm(char *digest, u16 alg_id,
-
struct crypto_shash *tfm)
+static int ima_calc_boot_aggregate_tfm(char *digest, u16 alg_id,
+ struct crypto_shash *tfm)
{
struct tpm_digest d = { .alg_id = alg_id, .digest = {0} };
int rc;
{
struct tpm_digest d = { .alg_id = alg_id, .digest = {0} };
int rc;
@@
-835,7
+835,7
@@
static int __init ima_calc_boot_aggregate_tfm(char *digest, u16 alg_id,
return rc;
}
return rc;
}
-int
__init
ima_calc_boot_aggregate(struct ima_digest_data *hash)
+int ima_calc_boot_aggregate(struct ima_digest_data *hash)
{
struct crypto_shash *tfm;
u16 crypto_id, alg_id;
{
struct crypto_shash *tfm;
u16 crypto_id, alg_id;