diff options
| author | David Howells <dhowells@redhat.com> | 2017-04-03 17:17:09 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2017-04-03 17:17:09 +0100 |
| commit | 73cdd29044e081d56ef6b3186d22cdf25d9dd333 (patch) | |
| tree | 9f11c7810ac3c3e59e55e9dfde854ac68c625c51 /include/keys | |
| parent | ddb99e118e37f324a4be65a411bb60ae62795cf9 (diff) | |
| parent | 03bb79315ddc8972b1af71539799450acbc1be4f (diff) | |
| download | linux-73cdd29044e081d56ef6b3186d22cdf25d9dd333.tar.bz2 | |
Merge branch 'keys-blacklist' into keys-next
Diffstat (limited to 'include/keys')
| -rw-r--r-- | include/keys/system_keyring.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index fbd4647767e9..0d8762622ab9 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h @@ -33,6 +33,18 @@ extern int restrict_link_by_builtin_and_secondary_trusted( #define restrict_link_by_builtin_and_secondary_trusted restrict_link_by_builtin_trusted #endif +#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING +extern int mark_hash_blacklisted(const char *hash); +extern int is_hash_blacklisted(const u8 *hash, size_t hash_len, + const char *type); +#else +static inline int is_hash_blacklisted(const u8 *hash, size_t hash_len, + const char *type) +{ + return 0; +} +#endif + #ifdef CONFIG_IMA_BLACKLIST_KEYRING extern struct key *ima_blacklist_keyring; |