Skip to content

Commit 5f56d41

Browse files
cgzonesjarkkojs
authored andcommitted
keys: drop shadowing dead prototype
The global variable pkcs7 does not exist. Drop the variable declaration, but keep the struct prototype needed for is_key_on_revocation_list(). Reported by clang: ./include/keys/system_keyring.h:104:67: warning: declaration shadows a variable in the global scope [-Wshadow] 104 | static inline int is_key_on_revocation_list(struct pkcs7_message *pkcs7) | ^ ./include/keys/system_keyring.h:76:30: note: previous declaration is here 76 | extern struct pkcs7_message *pkcs7; | ^ Fixes: 56c5812 ("certs: Add EFI_CERT_X509_GUID support for dbx entries") Signed-off-by: Christian Göttsche <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]>
1 parent 95ec54a commit 5f56d41

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/keys/system_keyring.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ static inline void __init set_machine_trusted_keys(struct key *keyring)
7373
}
7474
#endif
7575

76-
extern struct pkcs7_message *pkcs7;
7776
#ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING
7877
extern int mark_hash_blacklisted(const u8 *hash, size_t hash_len,
7978
enum blacklist_hash_type hash_type);
@@ -93,6 +92,7 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len)
9392
}
9493
#endif
9594

95+
struct pkcs7_message;
9696
#ifdef CONFIG_SYSTEM_REVOCATION_LIST
9797
extern int add_key_to_revocation_list(const char *data, size_t size);
9898
extern int is_key_on_revocation_list(struct pkcs7_message *pkcs7);

0 commit comments

Comments
 (0)