Skip to contentSkip to conversation

integrity subsystem fixes for v5.6

GIT PULL Merged Mimi Zohar 2 participants 2 messages Feb 20, 2020 – Feb 21, 2020 Keys-trusted

lore
Share & tools
lore

Mimi Zohar

author
#0 lore raw

Hi Linus,

Here are two bug fixes and an associated change for each.  The one that adds SM3 to the IMA list of supported hash algorithms is a simple change, but could be considered a new feature.

thanks,

Mimi

The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9:

Linux 5.6-rc1 (2020-02-09 16:08:48 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git next-integrity

for you to fetch changes up to 5780b9abd530982c2bb1018e2c52c05ab3c30b45:

ima: add sm3 algorithm to hash algorithm configuration list (2020-02-18 07:35:49 -0500)

----------------------------------------------------------------
Ard Biesheuvel (1):
x86/ima: use correct identifier for SetupMode variable

Javier Martinez Canillas (1):
efi: Only print errors about failing to get certs if EFI vars are found

Tianjia Zhang (2):
crypto: rename sm3-256 to sm3 in hash_algo_name
ima: add sm3 algorithm to hash algorithm configuration list

 arch/x86/kernel/ima_arch.c                    |  6 ++--
 crypto/hash_info.c                            |  2 +-
 security/integrity/ima/Kconfig                |  5 ++++
 security/integrity/platform_certs/load_uefi.c | 40 +++++++++++++++++----------
 4 files changed, 34 insertions(+), 19 deletions(-)
merge bot Merged
#1 lore raw
The pull request you sent on Thu, 20 Feb 2020 14:46:03 -0500:

The pull request you sent on Thu, 20 Feb 2020 14:46:03 -0500:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git next-integrity

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker