开源软件构建与测试

_service:tar_scm:ima-evm-utils.spec Changed

@@ -1,6 +1,6 @@
 Name:         ima-evm-utils
 Version:      1.3.2
-Release:      4
+Release:      9
 Summary:      IMA/EVM control utilities
 License:      GPLv2
 URL:          http://linux-ima.sourceforge.net/
@@ -10,6 +10,9 @@
 Patch6001:    ima-evm-utils-Fix-incorrect-algorithm-name-in-hash_i.patch
 
 Patch9000:    add-save-command-to-support-digest-list-building.patch
+Patch9001:    fix-caps-parameter-cannot-be-parsed.patch
+Patch9002:    add-sm3-option.patch
+Patch9003:    skip-test-error-in-docker.patch
 
 BuildRequires: autoconf automake libtool asciidoc vim-common
 BuildRequires: libxslt openssl openssl-devel keyutils-libs-devel tpm2-tss-devel
@@ -72,9 +75,29 @@
 %{_libdir}/*.so
 
 %files help
+%ifnarch i686
 %doc %{_mandir}/*/*
+%endif
 
 %changelog
+* Mon Feb 6 2023 gaoyusong <gaoyusong2@huawei.com> - 1.3.2-9
+- fix i686 build issue
+
+* Sat Oct 29 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.2-8
+- revert "update to 1.4"
+
+* Thu Oct 27 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.4-1
+- update to 1.4
+
+* Mon Sep 26 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.2-7
+- Skip test error in docker
+
+* Sun 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
+- Fix caps parameter cannot be parsed
+
 * Thu Jun 30 2022 luhuaxin <luhuaxin1@huawei.com> - 1.3.2-4
 - Support SM signature

_service:tar_scm:add-sm3-option.patch Added

_service:tar_scm:fix-caps-parameter-cannot-be-parsed.patch Added

@@ -0,0 +1,33 @@
+From 40602a7926ec13819a5926d4ac451becb44b7d98 Mon Sep 17 00:00:00 2001
+From: shenxiangwei <shenxiangwei1@huawei.com>
+Date: Fri, 19 Aug 2022 12:05:11 +0800
+Subject: PATCH fix caps parameter cannot be parsed
+
+Signed-off-by: shenxiangwei <shenxiangwei1@huawei.com>
+---
+ src/evmctl.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/evmctl.c b/src/evmctl.c
+index 28f4b8d..6ef2f68 100644
+--- a/src/evmctl.c
++++ b/src/evmctl.c
+@@ -440,13 +440,13 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
+ 		} else if (!strcmp(*xattrname, XATTR_NAME_CAPS) && (hmac_flags & HMAC_FLAG_CAPS_SET)) {
+ 			if (!caps_str)
+ 				continue;
+-			err = strlen(caps_str);
++			hex2bin(xattr_value, caps_str, strlen(caps_str) >> 1);
++			err = strlen(caps_str) >> 1;
+ 			if (err >= sizeof(xattr_value)) {
+ 				log_err("caps%u value is too long to fit into xattr%zu\n",
+ 					err + 1, sizeof(xattr_value));
+ 				return -1;
+ 			}
+-			strcpy(xattr_value, caps_str);
+ 		} else {
+ 			err = lgetxattr(file, *xattrname, xattr_value, sizeof(xattr_value));
+ 			if (err < 0) {
+-- 
+2.27.0
+

_service:tar_scm:skip-test-error-in-docker.patch Added

@@ -0,0 +1,57 @@
+From d3a4e24f6a2bac023f7e7c0eda403f0d8e25996d Mon Sep 17 00:00:00 2001
+From: shenxiangwei <shenxiangwei1@huawei.com>
+Date: Mon, 26 Sep 2022 19:36:25 +0800
+Subject: PATCH Skip test error in docker
+
+---
+ tests/ima_hash.test    |  5 +++++
+ tests/sign_verify.test | 10 ++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/tests/ima_hash.test b/tests/ima_hash.test
+index 8d66e59..cd97e1d 100644
+--- a/tests/ima_hash.test
++++ b/tests/ima_hash.test
+@@ -24,6 +24,11 @@ trap _report_exit EXIT
+ set -f # disable globbing
+ 
+ check() {
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if  `echo $?` -ne 0 ;then
++          return "$SKIP"
++  fi
++
+   local alg=$1 prefix=$2 chash=$3 hash
+   local file=$alg-hash.txt
+ 
+diff --git a/tests/sign_verify.test b/tests/sign_verify.test
+index 288e133..e1899df 100644
+--- a/tests/sign_verify.test
++++ b/tests/sign_verify.test
+@@ -130,6 +130,11 @@ check_sign() {
+   # PREFIX (signature header prefix in hex),
+   # OPTS (additional options for evmctl),
+   # FILE (working file to sign).
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if  `echo $?` -ne 0 ;then
++          return "$SKIP"
++  fi
++
+   local "$@"
+   local KEY=${KEY%.*}.key
+   local FILE=${FILE:-$ALG.txt}
+@@ -225,6 +230,11 @@ check_verify() {
+   # ALG (hash algo),
+   # OPTS (additional options for evmctl),
+   # FILE (filename to verify).
++  cat /proc/fs/ext4/sda1/options | grep xattr
++  if  `echo $?` -ne 0 ;then
++	  return "$SKIP"
++  fi
++
+   local "$@"
+ 
+   # shellcheck disable=SC2086
+-- 
+2.37.3.windows.1
+

_service Changed

Changes of Revision 2