]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge tag 'integrity-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Oct 2025 17:48:33 +0000 (10:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Oct 2025 17:48:33 +0000 (10:48 -0700)
Pull integrity updates from Mimi Zohar:
 "Just a couple of changes: crypto code cleanup and a IMA xattr bug fix"

* tag 'integrity-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  ima: don't clear IMA_DIGSIG flag when setting or removing non-IMA xattr
  lib/digsig: Use SHA-1 library instead of crypto_shash
  integrity: Select CRYPTO from INTEGRITY_ASYMMETRIC_KEYS

1  2 
lib/digsig.c

diff --cc lib/digsig.c
Simple merge