!40 add sm3 option

From: @godvi 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
This commit is contained in:
openeuler-ci-bot 2022-08-25 07:26:41 +00:00 committed by Gitee
commit 12e0948576
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 1 deletions

26
add-sm3-option.patch Normal file
View File

@ -0,0 +1,26 @@
From 3fe53a713f32c28841e7f5efd4afb397b6d7e154 Mon Sep 17 00:00:00 2001
From: shenxiangwei <shenxiangwei1@huawei.com>
Date: Wed, 24 Aug 2022 08:26:49 +0800
Subject: [PATCH] add sm3 option
Signed-off-by: shenxiangwei <shenxiangwei1@huawei.com>
---
src/evmctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/evmctl.c b/src/evmctl.c
index 28f4b8d..bce4b91 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -2489,7 +2489,7 @@ static void usage(void)
printf(
"\n"
- " -a, --hashalgo sha1 (default), sha224, sha256, sha384, sha512, streebog256, streebog512\n"
+ " -a, --hashalgo sha1 (default), sha224, sha256, sha384, sha512, streebog256, streebog512, sm3\n"
" -s, --imasig make IMA signature\n"
" -d, --imahash make IMA hash\n"
" -f, --sigfile store IMA signature in .sig file instead of xattr\n"
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: ima-evm-utils Name: ima-evm-utils
Version: 1.3.2 Version: 1.3.2
Release: 5 Release: 6
Summary: IMA/EVM control utilities Summary: IMA/EVM control utilities
License: GPLv2 License: GPLv2
URL: http://linux-ima.sourceforge.net/ URL: http://linux-ima.sourceforge.net/
@ -11,6 +11,7 @@ Patch6001: ima-evm-utils-Fix-incorrect-algorithm-name-in-hash_i.patch
Patch9000: add-save-command-to-support-digest-list-building.patch Patch9000: add-save-command-to-support-digest-list-building.patch
Patch9001: fix-caps-parameter-cannot-be-parsed.patch Patch9001: fix-caps-parameter-cannot-be-parsed.patch
Patch9002: add-sm3-option.patch
BuildRequires: autoconf automake libtool asciidoc vim-common BuildRequires: autoconf automake libtool asciidoc vim-common
BuildRequires: libxslt openssl openssl-devel keyutils-libs-devel tpm2-tss-devel BuildRequires: libxslt openssl openssl-devel keyutils-libs-devel tpm2-tss-devel
@ -76,6 +77,9 @@ make check
%doc %{_mandir}/*/* %doc %{_mandir}/*/*
%changelog %changelog
* Wed Aug 14 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.2-6
- Add sm3 option
* Fri Aug 19 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.2-5 * Fri Aug 19 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.2-5
- Fix caps parameter cannot be parsed - Fix caps parameter cannot be parsed