diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp b/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp index edec29f14ea18e98181d4c73aa9f87ffdc34ee10..762526473d86e93c47ac414ff77902249660947a 100644 --- a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp +++ b/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp @@ -267,7 +267,7 @@ int32_t CodeSignUtils::EnforceCodeSignForAppWithOwnerId(const std::string &owner ShowCodeSignInfo(targetFile, arg); if (!CheckFilePathValid(targetFile, Constants::ENABLE_APP_BASE_PATH)) { - return CS_ERR_TARGET_FILE_PATH; + return CS_ERR_FILE_PATH; } multiTask.AddTaskData(targetFile, arg); } while (ret == CS_SUCCESS); diff --git a/interfaces/innerkits/common/include/errcode.h b/interfaces/innerkits/common/include/errcode.h index 4dab36406d852cdc593c8d89f61b3bdb9303090e..848e7e2568758e6296525e6946628627bb439ee8 100644 --- a/interfaces/innerkits/common/include/errcode.h +++ b/interfaces/innerkits/common/include/errcode.h @@ -95,6 +95,5 @@ enum SignBlockErrCode { CS_ERR_SO_SIGN_SIZE = -0x620, CS_ERR_SIGN_ADDR_ALIGN = -0x621, CS_ERR_SIGN_EXTENSION_OFFSET_ALIGN = -0x622, - CS_ERR_TARGET_FILE_PATH = -0x623, }; #endif diff --git a/test/unittest/code_sign_utils_test.cpp b/test/unittest/code_sign_utils_test.cpp index a6a8c1733080cf7f8510fb37d11de7792c4542b6..be9b131bfd1407a95612840620025d9d69d14529 100644 --- a/test/unittest/code_sign_utils_test.cpp +++ b/test/unittest/code_sign_utils_test.cpp @@ -469,7 +469,7 @@ HWTEST_F(CodeSignUtilsTest, CodeSignUtilsTest_0016, TestSize.Level0) EXPECT_EQ(ret, CS_SUCCESS); ret = utils.EnforceCodeSignForApp(hapRealPath, entryMap, FILE_ALL); - EXPECT_EQ(ret, CS_ERR_TARGET_FILE_PATH); + EXPECT_EQ(ret, CS_ERR_FILE_PATH); } /** diff --git a/test/unittest/enable_verity_test.cpp b/test/unittest/enable_verity_test.cpp index be5c8507994cfae1c3e70b192ee33767d504a287..acf1aef10c0e1b6e2ef2411b9b48f0769b28a212 100644 --- a/test/unittest/enable_verity_test.cpp +++ b/test/unittest/enable_verity_test.cpp @@ -78,6 +78,10 @@ public: g_isXpmOn = AllocXpmRegion(); SaveStringToFile(SELINUX_MODE_PATH, PERMISSIVE_MODE); SaveStringToFile(XPM_DEBUG_FS_MODE_PATH, ENFORCE_MODE); + if (g_isXpmOn) { + std::string realPath; + g_isXpmOn = OHOS::PathToRealPath(XPM_DEBUG_FS_MODE_PATH, realPath); + } }; static void TearDownTestCase() { diff --git a/test/unittest/utils/include/xpm_common.h b/test/unittest/utils/include/xpm_common.h index 23be215bcb7514dce22ea0495440e6aeee0d1642..067fcbf0986473c1b1813161eb8b4cc47720fbea 100644 --- a/test/unittest/utils/include/xpm_common.h +++ b/test/unittest/utils/include/xpm_common.h @@ -29,7 +29,7 @@ constexpr unsigned long MAP_XPM = 0x40; const unsigned long PAGE_SIZE = (sysconf(_SC_PAGESIZE)); const unsigned long PAGE_MASK = ~(PAGE_SIZE - 1); -const std::string XPM_DEBUG_FS_MODE_PATH = "/sys/kernel/debug/xpm/xpm_mode"; +const std::string XPM_DEBUG_FS_MODE_PATH = "/proc/sys/kernel/xpm/xpm_mode"; const std::string SELINUX_MODE_PATH = "/sys/fs/selinux/enforce"; const std::string PERMISSIVE_MODE = "0"; const std::string ENFORCE_MODE = "1";