From dd9fe22f6d623c93c2df988209ed39010bf8a6e2 Mon Sep 17 00:00:00 2001 From: luhuaxin Date: Thu, 28 Jul 2022 00:34:58 +0800 Subject: [PATCH] fix sm3 algorithm name (cherry picked from commit 7707f0ea52ee82725172f85f64908b93ba65e52d) --- Fix-sm3-algorithm-name.patch | 26 ++++++++++++++++++++++++++ digest-list-tools.spec | 6 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Fix-sm3-algorithm-name.patch diff --git a/Fix-sm3-algorithm-name.patch b/Fix-sm3-algorithm-name.patch new file mode 100644 index 0000000..490f738 --- /dev/null +++ b/Fix-sm3-algorithm-name.patch @@ -0,0 +1,26 @@ +From 39c3519f6c6c3a71826762dff9736e00ca17fc2e Mon Sep 17 00:00:00 2001 +From: luhuaxin +Date: Thu, 28 Jul 2022 00:32:12 +0800 +Subject: [PATCH] fix sm3 algorithm name + +Signed-off-by: luhuaxin +--- + lib/kernel_lib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/kernel_lib.c b/lib/kernel_lib.c +index 2f0caff..d6733f2 100644 +--- a/lib/kernel_lib.c ++++ b/lib/kernel_lib.c +@@ -38,7 +38,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", + }; + + const int hash_digest_size[HASH_ALGO__LAST] = { +-- +2.33.0 + diff --git a/digest-list-tools.spec b/digest-list-tools.spec index ebf41ab..da8e6ec 100644 --- a/digest-list-tools.spec +++ b/digest-list-tools.spec @@ -1,6 +1,6 @@ name: digest-list-tools Version: 0.3.95 -Release: 5 +Release: 6 Summary: Utilities for IMA Digest Lists extension Source0: https://gitee.com/openeuler/%{name}/repository/archive/v%{version}.tar.gz @@ -12,6 +12,7 @@ Patch0: fix-multiple-definition-of-pgp_algo_mapping.patch Patch1: fix-digestlist-conf-warning.patch Patch2: fix-a-typo-in-kernel_lib.h.patch Patch3: fix-duplicated-kernel-parameters.patch +Patch4: Fix-sm3-algorithm-name.patch BuildRequires: autoconf automake libcurl-devel libtool rpm-devel dracut gzip BuildRequires: libcap-devel libcmocka-devel libselinux-devel @@ -123,6 +124,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/%{name}.1.gz %changelog +* Sat Jul 30 2022 luhuaxin - 0.3.95-6 +- Fix sm3 algorithm name + * Thu Dec 2 2021 Anakin Zhang - 0.3.95-5 - Fix typo and duplicated kernel parameters