From 158aa183ececf95bbe5444f3612670ccd17bbd5e Mon Sep 17 00:00:00 2001 From: zfeixiang Date: Fri, 22 Aug 2025 06:26:30 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=97=B6=20huks=20=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E7=BB=88=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zfeixiang --- services/local_code_sign/src/local_sign_key.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/local_code_sign/src/local_sign_key.cpp b/services/local_code_sign/src/local_sign_key.cpp index 4d4fcd5..836b794 100644 --- a/services/local_code_sign/src/local_sign_key.cpp +++ b/services/local_code_sign/src/local_sign_key.cpp @@ -329,12 +329,14 @@ bool LocalSignKey::SignByHUKS(const struct HksBlob *inData, struct HksBlob *outD tmpOutData.data = static_cast(malloc(tmpOutData.size)); if (tmpOutData.data == nullptr) { LOG_ERROR("Alloc memory for blob failed."); + HksAbort(&handle, paramSet.GetParamSet()); return false; } ret = HksUpdate(&handle, paramSet.GetParamSet(), inData, &tmpOutData); if (ret != HKS_SUCCESS) { LOG_ERROR("HksUpdate Failed."); free(tmpOutData.data); + HksAbort(&handle, paramSet.GetParamSet()); return false; } // third stage: finish, get signature from HUKS -- Gitee From 09c8ed9e415e6bf120957f890d1ecfcc8f83c1de Mon Sep 17 00:00:00 2001 From: zfeixiang Date: Fri, 22 Aug 2025 06:57:11 +0000 Subject: [PATCH 2/2] add test mock Signed-off-by: zfeixiang --- test/unittest/mock/include/hks_api.h | 2 ++ test/unittest/mock/src/hks_api.cpp | 6 ++++++ test/unittest/mock/src/hks_api_mock_test.cpp | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/test/unittest/mock/include/hks_api.h b/test/unittest/mock/include/hks_api.h index a783ee3..2573798 100644 --- a/test/unittest/mock/include/hks_api.h +++ b/test/unittest/mock/include/hks_api.h @@ -47,6 +47,8 @@ int32_t HksUpdate(const struct HksBlob *handle, const struct HksParamSet *paramS int32_t HksFinish(const struct HksBlob *handle, const struct HksParamSet *paramSet, const struct HksBlob *inData, struct HksBlob *outData); + +int32_t HksAbort(const struct HksBlob *handle, const struct HksParamSet *paramSet); } } } diff --git a/test/unittest/mock/src/hks_api.cpp b/test/unittest/mock/src/hks_api.cpp index 828acb3..da4b1c3 100644 --- a/test/unittest/mock/src/hks_api.cpp +++ b/test/unittest/mock/src/hks_api.cpp @@ -67,6 +67,12 @@ int32_t HksFinish(const struct HksBlob *handle, const struct HksParamSet *paramS LOG_INFO("Mock HksFinish"); return HKS_SUCCESS; } + +int32_t HksAbort(const struct HksBlob *handle, const struct HksParamSet *paramSet) +{ + LOG_INFO("Mock HksAbort"); + return HKS_SUCCESS; +} } } } \ No newline at end of file diff --git a/test/unittest/mock/src/hks_api_mock_test.cpp b/test/unittest/mock/src/hks_api_mock_test.cpp index 74df370..91e10fc 100644 --- a/test/unittest/mock/src/hks_api_mock_test.cpp +++ b/test/unittest/mock/src/hks_api_mock_test.cpp @@ -89,6 +89,12 @@ int32_t HksFinish(const struct HksBlob *handle, const struct HksParamSet *paramS } return HKS_SUCCESS; } + +int32_t HksAbort(const struct HksBlob *handle, const struct HksParamSet *paramSet) +{ + LOG_INFO("Mock HksAbort"); + return HKS_SUCCESS; +} } } } \ No newline at end of file -- Gitee