diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-23 06:47:17 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-01-23 06:47:17 +0300 |
| commit | 9cb2bf599b2ce832127fa61fb430cc00a724d371 (patch) | |
| tree | f16f481b89e9bdd9c3f612332745745e2b8c8d55 /include | |
| parent | 7004a2e46d1693848370809aa3d9c340a209edbb (diff) | |
| parent | e8d9fab39d1f87b52932646b2f1e7877aa3fc0f4 (diff) | |
| download | linux-9cb2bf599b2ce832127fa61fb430cc00a724d371.tar.xz | |
Merge tag 'keys-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull keys updates from Jarkko Sakkinen.
Avoid using stack addresses for sg lists. And a cleanup.
* tag 'keys-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
KEYS: trusted: dcp: fix improper sg use with CONFIG_VMAP_STACK=y
keys: drop shadowing dead prototype
Diffstat (limited to 'include')
| -rw-r--r-- | include/keys/system_keyring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h index 8365adf842ef..a6c2897bcc63 100644 --- a/include/keys/system_keyring.h +++ b/include/keys/system_keyring.h @@ -73,7 +73,6 @@ static inline void __init set_machine_trusted_keys(struct key *keyring) } #endif -extern struct pkcs7_message *pkcs7; #ifdef CONFIG_SYSTEM_BLACKLIST_KEYRING extern int mark_hash_blacklisted(const u8 *hash, size_t hash_len, enum blacklist_hash_type hash_type); @@ -93,6 +92,7 @@ static inline int is_binary_blacklisted(const u8 *hash, size_t hash_len) } #endif +struct pkcs7_message; #ifdef CONFIG_SYSTEM_REVOCATION_LIST extern int add_key_to_revocation_list(const char *data, size_t size); extern int is_key_on_revocation_list(struct pkcs7_message *pkcs7); |