From 8556b3ccf83badf933ec86decd00954f9ed031e8 Mon Sep 17 00:00:00 2001 From: zhengxiaoxiao Date: Fri, 14 Jun 2024 14:48:51 +0800 Subject: [PATCH] add backport-Correct-the-error-in-the-comment.patch --- ...ort-Correct-the-error-in-the-comment.patch | 26 +++++++++++++++++++ secGear.spec | 6 ++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 backport-Correct-the-error-in-the-comment.patch diff --git a/backport-Correct-the-error-in-the-comment.patch b/backport-Correct-the-error-in-the-comment.patch new file mode 100644 index 0000000..4af968d --- /dev/null +++ b/backport-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/secGear.spec b/secGear.spec index 4b2bd95..75e4348 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 41 +Release: 42 Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -82,6 +82,7 @@ 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-init-attestation.patch +Patch72: backport-Correct-the-error-in-the-comment.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ openssl-libs openssl-devel @@ -252,6 +253,9 @@ popd systemctl restart rsyslog %changelog +* Fri Jun 14 2024 zhengxiaoxiao - 0.1.0-42 +- add backport-Correct-the-error-in-the-comment.patch + * Thu Jun 13 2024 zhengxiaoxiao - 0.1.0-41 - Judgment of added challenge length -- Gitee