diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-20 15:15:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-20 15:15:16 -0800 |
| commit | ebe7acadf5a9c4b67475e766e0e80ae6a2a79c61 (patch) | |
| tree | b200c91bc4e77bb62163dde440791298b4137428 /crypto | |
| parent | ca7e1fd1026c5af6a533b4b5447e1d2f153e28f2 (diff) | |
| parent | 5780b9abd530982c2bb1018e2c52c05ab3c30b45 (diff) | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull IMA fixes from Mimi Zohar:
"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"
* 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
ima: add sm3 algorithm to hash algorithm configuration list
crypto: rename sm3-256 to sm3 in hash_algo_name
efi: Only print errors about failing to get certs if EFI vars are found
x86/ima: use correct identifier for SetupMode variable
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/hash_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/hash_info.c b/crypto/hash_info.c index c754cb75dd1a..a49ff96bde77 100644 --- a/crypto/hash_info.c +++ b/crypto/hash_info.c @@ -26,7 +26,7 @@ const char *const hash_algo_name[HASH_ALGO__LAST] = { [HASH_ALGO_TGR_128] = "tgr128", [HASH_ALGO_TGR_160] = "tgr160", [HASH_ALGO_TGR_192] = "tgr192", - [HASH_ALGO_SM3_256] = "sm3-256", + [HASH_ALGO_SM3_256] = "sm3", [HASH_ALGO_STREEBOG_256] = "streebog256", [HASH_ALGO_STREEBOG_512] = "streebog512", }; |