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

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

ima: remove definition of IMA_X509_PATH 



CONFIG_IMA_X509_PATH is always defined.  This patch removes the
IMA_X509_PATH definition and uses CONFIG_IMA_X509_PATH.

Signed-off-by: default avatarDmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
parent c68ed80c

security/integrity/ima/ima_init.c

+1 −7
Original line number Diff line number Diff line
@@ -24,12 +24,6 @@ 
#include <crypto/hash_info.h>

#include "ima.h"



#ifdef CONFIG_IMA_X509_PATH

#define IMA_X509_PATH	CONFIG_IMA_X509_PATH

#else

#define IMA_X509_PATH	"/etc/keys/x509_ima.der"

#endif



/* name for boot aggregate entry */

static const char *boot_aggregate_name = "boot_aggregate";

int ima_used_chip;
@@ -103,7 +97,7 @@ void __init ima_load_x509(void) 
	int unset_flags = ima_policy_flag & IMA_APPRAISE;



	ima_policy_flag &= ~unset_flags;

	integrity_load_x509(INTEGRITY_KEYRING_IMA, IMA_X509_PATH);

	integrity_load_x509(INTEGRITY_KEYRING_IMA, CONFIG_IMA_X509_PATH);

	ima_policy_flag |= unset_flags;

}

#endif