diff --git a/services/local_code_sign/src/local_sign_key.cpp b/services/local_code_sign/src/local_sign_key.cpp index 24412ec72e306ad4619b720fb23ccc2a2835b21f..bc17c5a27e56161646bc37249df8bacabbc4a4b1 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 4c9e6ba0fd40bda2368a96d99d9515973d5fb015..abdcf5117bae25fb60e83cc8c477e2a889398a37 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", diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp index 787107956c7890b1b955570785e63031e5e7747a..a5bed3bef54c2cba04ebd1b06286f2819a6b0b4b 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 73e81c8ad490bc95ef061ae87fb1c4cf49f5b723..e10f7442a647e65235789ba3484889e905d06cfd 100644 --- a/test/unittest/key_enable_utils_test.cpp +++ b/test/unittest/key_enable_utils_test.cpp @@ -55,19 +55,20 @@ 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); } /** - * @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()); diff --git a/test/unittest/local_code_sign_utils_mock_test.cpp b/test/unittest/local_code_sign_utils_mock_test.cpp index 6b2261d3b2755517ed2c8343ba6a5faa4910ca20..0e814352507ed858180873841ba9cc2c3193cba3 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