Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / include / keys / system_keyring.h

diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
index fbd4647767e9162f10c5741825796c5c2061cef0..0d8762622ab99dbe83dbeb87943712586ee52942 100644 (file)
--- 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;