diff options
| author |   Dmitry Kasatkin <d.kasatkin@samsung.com> | 2014-11-05 17:01:13 +0200 |
|---|---|---|
| committer |   Mimi Zohar <zohar@linux.vnet.ibm.com> | 2014-11-17 23:11:59 -0500 |
| commit | 65d543b2335ede80e5e66bc4f559f62db5f469bd (patch) | |
| tree | 846bf4fd2bcb05ec85e27bcf70b817476ab4bba0 /security/integrity/integrity.h | |
| parent | integrity: define a new function integrity_read_file() (diff) | |
| download | linux-dev-65d543b2335ede80e5e66bc4f559f62db5f469bd.tar.xz linux-dev-65d543b2335ede80e5e66bc4f559f62db5f469bd.zip | |
integrity: provide a function to load x509 certificate from the kernel
Provide the function to load x509 certificates from the kernel into the
integrity kernel keyring.
Changes in v2:
* configuration option removed
* function declared as '__init'
Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to '')
| -rw-r--r-- | security/integrity/integrity.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h index 20d220481025..1057abbd31cd 100644 --- a/security/integrity/integrity.h +++ b/security/integrity/integrity.h @@ -134,6 +134,7 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen, const char *digest, int digestlen); int __init integrity_init_keyring(const unsigned int id); +int __init integrity_load_x509(const unsigned int id, char *path); #else static inline int integrity_digsig_verify(const unsigned int id, @@ -147,6 +148,7 @@ static inline int integrity_init_keyring(const unsigned int id) { return 0; } + #endif /* CONFIG_INTEGRITY_SIGNATURE */ #ifdef CONFIG_INTEGRITY_ASYMMETRIC_KEYS |