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 | 577ef62b7c7c672f6632626daa2e83fc2018aa26 (patch) | |
| tree | 98eb9edbfe5e7b9d147d51d926960de03b3525bc /crypto/geniv.c | |
| parent | 663ee6ea266a69160a6fb2007371d8db570584ff (diff) | |
| parent | af7038fa796262e9884103ef5d4fe37bd9dbd44b (diff) | |
| download | linux-crypto-577ef62b7c7c672f6632626daa2e83fc2018aa26.tar.gz linux-crypto-577ef62b7c7c672f6632626daa2e83fc2018aa26.zip | |
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/geniv.c')
0 files changed, 0 insertions, 0 deletions