From 20000f7d7459b12648e84fd92562454e3e754217 Mon Sep 17 00:00:00 2001 From: zhenghui Date: Tue, 20 Aug 2024 20:23:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?keyenable=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhenghui --- test/unittest/key_enable_utils_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/unittest/key_enable_utils_test.cpp b/test/unittest/key_enable_utils_test.cpp index 73e81c8..825d934 100644 --- a/test/unittest/key_enable_utils_test.cpp +++ b/test/unittest/key_enable_utils_test.cpp @@ -49,7 +49,7 @@ HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0001, TestSize.Level0) /** * @tc.name: KeyEnableUtilsTest_0002 - * @tc.desc: check efuse status + * @tc.desc: check efuse status buf is nullptr * @tc.type: Func * @tc.require: issueI8FCGF */ @@ -62,12 +62,12 @@ HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0002, TestSize.Level0) } /** - * @tc.name: KeyEnableUtilsTest_0002 + * @tc.name: KeyEnableUtilsTest_0003 * @tc.desc: check efuse status * @tc.type: Func * @tc.require: issueI8FCGF */ -HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0002, TestSize.Level0) +HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0003, TestSize.Level0) { std::string str = "efuse_status=1"; char *buf = const_cast(str.c_str()); -- Gitee From 1b19c03d04740a59d9cc41943c12dec3fb3424f5 Mon Sep 17 00:00:00 2001 From: zhenghui Date: Wed, 21 Aug 2024 17:54:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhenghui --- services/local_code_sign/src/local_sign_key.cpp | 2 +- test/unittest/BUILD.gn | 4 ++++ test/unittest/code_sign_utils_test.cpp | 12 ++++++++++-- test/unittest/key_enable_utils_test.cpp | 3 ++- test/unittest/local_code_sign_utils_mock_test.cpp | 6 +++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/services/local_code_sign/src/local_sign_key.cpp b/services/local_code_sign/src/local_sign_key.cpp index 24412ec..bc17c5a 100644 --- a/services/local_code_sign/src/local_sign_key.cpp +++ b/services/local_code_sign/src/local_sign_key.cpp @@ -297,7 +297,7 @@ bool LocalSignKey::SignByHUKS(const struct HksBlob *inData, struct HksBlob *outD if (ret != HKS_SUCCESS) { LOG_ERROR("HksUpdate Failed."); free(tmpOutData.data); - return CS_ERR_PARAM_INVALID; + return false; } // third stage: finish, get signature from HUKS diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 4c9e6ba..f5cb2e8 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -83,6 +83,10 @@ ohos_unittest("code_sign_attr_utils_unittest") { deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils" ] + if(is_asan && !use_clang_coverage){ + defines = [ "NO_USE_CLANG_COVERAGE" ] + } + include_dirs = [ "utils/include", "${code_signature_root_dir}/interfaces/innerkits/common/include", diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp index 7871079..a5bed3b 100644 --- a/test/unittest/code_sign_utils_test.cpp +++ b/test/unittest/code_sign_utils_test.cpp @@ -812,7 +812,11 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0034, TestSize.Level0) std::string bundleName = ""; const ByteBuffer profileBuffer; int32_t ret = CodeSignUtils::EnableKeyInProfile(bundleName, profileBuffer); - EXPECT_EQ(ret, 0); +#ifdef NO_USE_CLANG_COVERAGE + EXPECT_EQ(ret, CS_ERR_PROFILE); +#else + EXPECT_EQ(ret, CS_SUCCESS); +#endif } /** @@ -825,7 +829,11 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0035, TestSize.Level0) { std::string bundleName = ""; int32_t ret = CodeSignUtils::RemoveKeyInProfile(bundleName); - EXPECT_EQ(ret, 0); +#ifdef NO_USE_CLANG_COVERAGE + EXPECT_EQ(ret, CS_ERR_PROFILE); +#else + EXPECT_EQ(ret, CS_SUCCESS); +#endif } /** diff --git a/test/unittest/key_enable_utils_test.cpp b/test/unittest/key_enable_utils_test.cpp index 825d934..c9f2105 100644 --- a/test/unittest/key_enable_utils_test.cpp +++ b/test/unittest/key_enable_utils_test.cpp @@ -55,7 +55,8 @@ HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0001, TestSize.Level0) */ HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0002, TestSize.Level0) { - char *buf = nullptr; + std::string str = "efuse_status=0"; + char *buf = const_cast(str.c_str()); ssize_t bunLen = 0; int32_t ret = CheckEfuseStatus(buf, bunLen); EXPECT_EQ(ret, false); diff --git a/test/unittest/local_code_sign_utils_mock_test.cpp b/test/unittest/local_code_sign_utils_mock_test.cpp index 6b2261d..0e81435 100644 --- a/test/unittest/local_code_sign_utils_mock_test.cpp +++ b/test/unittest/local_code_sign_utils_mock_test.cpp @@ -170,7 +170,7 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0006, TestSize.L const HksCertChain *certChain = LocalSignKey::GetInstance().GetCertChain(); std::unique_ptr buffer = GetRandomChallenge(); bool bRet = OHOS::Security::CodeSign::FormattedCertChain(certChain, *buffer); - EXPECT_EQ(bRet, false); + EXPECT_EQ(bRet, true); } /** @@ -208,7 +208,7 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0008, TestSize.L */ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0009, TestSize.Level0) { - EXPECT_EQ(IsDeveloperModeOn(), false); + EXPECT_EQ(IsDeveloperModeOn(), true); } /** @@ -219,7 +219,7 @@ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0009, TestSize.L */ HWTEST_F(LocalCodeSignUtilsMockTest, LocalCodeSignUtilsMockTest_0010, TestSize.Level0) { - EXPECT_EQ(CodeSignGetUdid(nullptr), false); + EXPECT_EQ(CodeSignGetUdid(nullptr), -1); } } // namespace CodeSign } // namespace Security -- Gitee From 9ab8e7a1be91b9b8ebb250fbdeda7d503fabca41 Mon Sep 17 00:00:00 2001 From: zhenghui Date: Thu, 22 Aug 2024 09:30:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhenghui --- test/unittest/BUILD.gn | 8 ++++---- test/unittest/key_enable_utils_test.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index f5cb2e8..abdcf51 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -64,6 +64,10 @@ ohos_unittest("code_sign_utils_unittest") { "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", ] + if (!is_asan && !use_clang_coverage) { + defines = [ "NO_USE_CLANG_COVERAGE" ] + } + include_dirs = [ "utils/include", "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", @@ -83,10 +87,6 @@ ohos_unittest("code_sign_attr_utils_unittest") { deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils" ] - if(is_asan && !use_clang_coverage){ - defines = [ "NO_USE_CLANG_COVERAGE" ] - } - include_dirs = [ "utils/include", "${code_signature_root_dir}/interfaces/innerkits/common/include", diff --git a/test/unittest/key_enable_utils_test.cpp b/test/unittest/key_enable_utils_test.cpp index c9f2105..e10f744 100644 --- a/test/unittest/key_enable_utils_test.cpp +++ b/test/unittest/key_enable_utils_test.cpp @@ -49,7 +49,7 @@ HWTEST_F(KeyEnableUtilsTest, KeyEnableUtilsTest_0001, TestSize.Level0) /** * @tc.name: KeyEnableUtilsTest_0002 - * @tc.desc: check efuse status buf is nullptr + * @tc.desc: check efuse status * @tc.type: Func * @tc.require: issueI8FCGF */ -- Gitee