diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-12-26 16:06:53 +1100 |
| commit | 3cb92fe48138d225b8d0ceedf148642f9103f841 (patch) | |
| tree | cbb877002d9d39777be13df3876e05f2542da234 /include/keys | |
| parent | 5beb0c435bdde35a09376566b0e28f7df87c9f68 (diff) | |
| parent | 0112721df4edbdd07b800813300d76811572f080 (diff) | |
| download | linux-3cb92fe48138d225b8d0ceedf148642f9103f841.tar.gz linux-3cb92fe48138d225b8d0ceedf148642f9103f841.tar.bz2 linux-3cb92fe48138d225b8d0ceedf148642f9103f841.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/system_keyring.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index b20cd885c1fd..39fd38cfa8c9 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h @@ -35,4 +35,28 @@ extern int system_verify_data(const void *data, unsigned long len, enum key_being_used_for usage); #endif +#ifdef CONFIG_IMA_MOK_KEYRING +extern struct key *ima_mok_keyring; +extern struct key *ima_blacklist_keyring; + +static inline struct key *get_ima_mok_keyring(void) +{ + return ima_mok_keyring; +} +static inline struct key *get_ima_blacklist_keyring(void) +{ + return ima_blacklist_keyring; +} +#else +static inline struct key *get_ima_mok_keyring(void) +{ + return NULL; +} +static inline struct key *get_ima_blacklist_keyring(void) +{ + return NULL; +} +#endif /* CONFIG_IMA_MOK_KEYRING */ + + #endif /* _KEYS_SYSTEM_KEYRING_H */ |