diff --git a/backport-use-memset-instead-of-explicit_bzero.patch b/0072-use-memset-instead-of-explicit_bzero.patch similarity index 100% rename from backport-use-memset-instead-of-explicit_bzero.patch rename to 0072-use-memset-instead-of-explicit_bzero.patch diff --git a/backport-memset-no-optimize.patch b/0073-memset-no-optimize.patch similarity index 100% rename from backport-memset-no-optimize.patch rename to 0073-memset-no-optimize.patch diff --git a/0074-add-codegen-compile-marco.patch b/0074-add-codegen-compile-marco.patch new file mode 100644 index 0000000000000000000000000000000000000000..97af32f9637cf365502aa46880f43334c8256d6e --- /dev/null +++ b/0074-add-codegen-compile-marco.patch @@ -0,0 +1,29 @@ +From 088eca103708b2d54c4fe46f6dc2da7a21f4f0da Mon Sep 17 00:00:00 2001 +From: houmingyong +Date: Thu, 7 Dec 2023 14:08:36 +0800 +Subject: [PATCH] add codegen compile marco + +Reference:https://gitee.com/openeuler/secGear/commit/088eca103708b2d54c4fe46f6dc2da7a21f4f0da +Conflict:Deleted the PL part from the patch. +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25e6381..8a6f22b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,7 +74,10 @@ if(${ENCLAVE} STREQUAL "SGX") + set(CC_SGX ON) + endif() + +-add_subdirectory(tools/codegener) ++option(CODEGEN "default off" ON) ++if(CODEGEN) ++ add_subdirectory(tools/codegener) ++endif() + + add_subdirectory(src) + add_subdirectory(component) +-- +2.33.0 diff --git a/0075-Correct-the-error-in-the-comment.patch b/0075-Correct-the-error-in-the-comment.patch new file mode 100644 index 0000000000000000000000000000000000000000..4af968d5e68f2b0b72b8d34a464fd3ea313c71b8 --- /dev/null +++ b/0075-Correct-the-error-in-the-comment.patch @@ -0,0 +1,26 @@ +From 985be3c3b4947d1a304ff9171c74ca3fe77a86bf Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiaoGitee +Date: Mon, 1 Apr 2024 17:05:10 +0800 +Subject: [PATCH] Correct the error in the comment. + +Reference:https://gitee.com/openeuler/secGear/commit/985be3c3b4947d1a304ff9171c74ca3fe77a86bf +Conflict:NA +--- + inc/host_inc/status.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inc/host_inc/status.h b/inc/host_inc/status.h +index 7a7920b..c0ff6c7 100644 +--- a/inc/host_inc/status.h ++++ b/inc/host_inc/status.h +@@ -179,7 +179,7 @@ typedef enum _enclave_result_t + CC_CLIENT_INTR = 0xFFFF4000, /* Interrupted by CFC. Broken control flow is detected. */ + CC_ERROR_TIME_NOT_SET = 0xFFFF5000, /* *< 时间未设置 */ + CC_ERROR_TIME_NEEDS_RESET = 0xFFFF5001, /* *< 时间需要重置 */ +- CC_FAIL = 0xFFFF5002, /* *< 时间需要重置 */ ++ CC_FAIL = 0xFFFF5002, /* *< 操作失败 */ + CC_ERROR_TIMER = 0xFFFF6000, + CC_ERROR_TIMER_CREATE_FAILED, + CC_ERROR_TIMER_DESTORY_FAILED, +-- +2.33.0 diff --git a/0076-change-log-file-permission-0400.patch b/0076-change-log-file-permission-0400.patch new file mode 100644 index 0000000000000000000000000000000000000000..ebdd183d2f3dc1a9898cd8208b03f05457dcd6b3 --- /dev/null +++ b/0076-change-log-file-permission-0400.patch @@ -0,0 +1,24 @@ +From 1b2de0be8912fb1b705454011ed6190f52199f60 Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiao +Date: Sat, 11 Jun 2022 12:17:18 +0800 +Subject: [PATCH] change log file permission 0400 + +--- + conf/logrotate.d/secgear | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/conf/logrotate.d/secgear b/conf/logrotate.d/secgear +index 92da41e..f88bb59 100644 +--- a/conf/logrotate.d/secgear ++++ b/conf/logrotate.d/secgear +@@ -5,4 +5,7 @@ + nocompress + copytruncate + size 2048k ++ lastaction ++ chmod 0400 /var/log/secgear/secgear.log.* ++ endscript + } +-- +2.27.0 + diff --git a/secGear.spec b/secGear.spec index bf7b51ad9ea2ed55ab56cdae6cd083736a4709ce..cc8cea2a64c5e0e7061d02f1d123a4484e6f1f00 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 39 +Release: 40 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -80,8 +80,12 @@ Patch67: 0068-bugfix-when-input-empty-hash.patch Patch68: 0069-adapt-sign-tool-to-pass-API_LEVEL.patch Patch69: 0070-sign-tool-add-invalid-param-verify.patch Patch70: 0071-adapt-report-with-request-key.patch -Patch71: backport-use-memset-instead-of-explicit_bzero.patch -Patch72: backport-memset-no-optimize.patch +Patch71: 0072-use-memset-instead-of-explicit_bzero.patch +Patch72: 0073-memset-no-optimize.patch +Patch73: 0074-add-codegen-compile-marco.patch +Patch74: 0075-Correct-the-error-in-the-comment.patch +Patch75: 0076-change-log-file-permission-0400.patch + BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ compat-openssl11-libs compat-openssl11-devel @@ -213,6 +217,9 @@ popd systemctl restart rsyslog %changelog +* Thu Jun 20 2024 houmingyong - 0.1.0-40 +- synchoronous features + * Wed Mar 27 2024 zhengxiaoxiao - 0.1.0-39 - use memset instead of explicit_bzero