]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
Merge tag 'keys-next-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Sep 2024 17:26:01 +0000 (10:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Sep 2024 17:26:01 +0000 (10:26 -0700)
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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge