diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 10:26:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 10:26:01 -0700 |
| commit | 24f772dec31591f9268a9c9e4943dc5dc47eaf9b (patch) | |
| tree | 5486a518da7193d242ed7a5009dd7d2eed863d4a /include/linux | |
| parent | 5c36498d06b9b00393c2f35edbf16b28194375fa (diff) | |
| parent | 558bdc45dfb2669e1741384a0c80be9c82fa052c (diff) | |
Merge tag 'keys-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull key updates from Jarkko Sakkinen:
"The bulk of this is OpenSSL 3.0 compatibility fixes for the signing
and certificates"
* tag 'keys-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
sign-file,extract-cert: move common SSL helper functions to a header
KEYS: prevent NULL pointer dereference in find_asymmetric_key()
KEYS: Remove unused declarations
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/key.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/key.h b/include/linux/key.h index 943a432da3ae..074dca3222b9 100644 --- a/include/linux/key.h +++ b/include/linux/key.h @@ -436,9 +436,6 @@ extern key_ref_t keyring_search(key_ref_t keyring, const char *description, bool recurse); -extern int keyring_add_key(struct key *keyring, - struct key *key); - extern int keyring_restrict(key_ref_t keyring, const char *type, const char *restriction); |