diff options
| author | Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-11-26 16:59:54 +0200 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-05-21 13:28:47 -0400 |
| commit | a18d0cbfabd1d17e11ec2ae54804284298462125 (patch) | |
| tree | ad60c90970345a957d180ee644ed63eba1178f56 | |
| parent | c68ed80c97d9720f51ef31fe91560fdd1e121533 (diff) | |
| download | linux-a18d0cbfabd1d17e11ec2ae54804284298462125.tar.gz linux-a18d0cbfabd1d17e11ec2ae54804284298462125.tar.bz2 linux-a18d0cbfabd1d17e11ec2ae54804284298462125.zip | |
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: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
| -rw-r--r-- | security/integrity/ima/ima_init.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index 5e4c29d174ee..0f4cffd76070 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -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 |