diff options
| author |   Dmitry Kasatkin <dmitry.kasatkin@huawei.com> | 2015-10-22 21:26:21 +0300 |
|---|---|---|
| committer |   Mimi Zohar <zohar@linux.vnet.ibm.com> | 2015-12-15 08:31:19 -0500 |
| commit | 2ce523eb8976a12de1a4fb6fe8ad0b09b5dafb31 (patch) | |
| tree | 45b99ce12be798b8d4d75eadefd576d2aa430efe /security/integrity/integrity.h | |
| parent | integrity: define '.evm' as a builtin 'trusted' keyring (diff) | |
| download | linux-dev-2ce523eb8976a12de1a4fb6fe8ad0b09b5dafb31.tar.xz linux-dev-2ce523eb8976a12de1a4fb6fe8ad0b09b5dafb31.zip | |
evm: load an x509 certificate from the kernel
This patch defines a configuration option and the evm_load_x509() hook
to load an X509 certificate onto the EVM trusted kernel keyring.
Changes in v4:
* Patch description updated
Changes in v3:
* Removed EVM_X509_PATH definition. CONFIG_EVM_X509_PATH is used
directly.
Changes in v2:
* default key patch changed to /etc/keys
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to '')
| -rw-r--r-- | security/integrity/integrity.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 07726a731727..5efe2ecc538d 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -170,6 +170,14 @@ static inline void ima_load_x509(void) } #endif +#ifdef CONFIG_EVM_LOAD_X509 +void __init evm_load_x509(void); +#else +static inline void evm_load_x509(void) +{ +} +#endif + #ifdef CONFIG_INTEGRITY_AUDIT /* declarations */ void integrity_audit_msg(int audit_msgno, struct inode *inode, |