diff --git a/README.md b/README.md index 30036034..091c8b4c 100755 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ In the architecture: ## Directory Structure ``` -/base/security/deviceauth +/base/security/device_auth ├── frameworks # Device authentication framework code ├── hals # HAL code for the tool library │ ├── inc # Tool library header files diff --git a/README_zh.md b/README_zh.md index 9b293b6e..e0986ac2 100755 --- a/README_zh.md +++ b/README_zh.md @@ -32,7 +32,7 @@ ## 目录 ``` -/base/security/deviceauth +/base/security/device_auth ├── frameworks # 设备互信认证IPC代码 ├── interfaces # 对外接口目录 ├── test # 设备互信认证的接口测试用例 diff --git a/bundle.json b/bundle.json index f1746e1b..21bf3fee 100644 --- a/bundle.json +++ b/bundle.json @@ -4,7 +4,7 @@ "description": "The device authentication module belongs to the security subsystem of OpenHarmony. It manages the entire lifecycle of trust relationships between devices.", "publishAs": "code-segment", "segment": { - "destPath": "base/security/deviceauth" + "destPath": "base/security/device_auth" }, "dirs": {}, "scripts": {}, @@ -12,7 +12,7 @@ "repository": "", "license": "Apache License 2.0", "component": { - "name": "deviceauth_standard", + "name": "device_auth", "subsystem": "security", "syscap": [ "SystemCapability.Security.DeviceAuth" ], "features": [], @@ -43,26 +43,26 @@ }, "build": { "sub_component": [ - "//base/security/deviceauth:deviceauth_sdk_build", - "//base/security/deviceauth:deviceauth_service_build", - "//base/security/deviceauth:deviceauth_build", - "//base/security/deviceauth/frameworks/deviceauth_lite:hichainsdk" + "//base/security/device_auth:deviceauth_sdk_build", + "//base/security/device_auth:deviceauth_service_build", + "//base/security/device_auth:deviceauth_build", + "//base/security/device_auth/frameworks/deviceauth_lite:hichainsdk" ], "inner_kits": [ { - "name": "//base/security/deviceauth/services:deviceauth_sdk", + "name": "//base/security/device_auth/services:deviceauth_sdk", "header": { "header_files": [ "device_auth_defines.h", "device_auth.h" ], - "header_base": "//base/security/deviceauth/interfaces/innerkits" + "header_base": "//base/security/device_auth/interfaces/innerkits" } } ], "test": [ - "//base/security/deviceauth:deviceauth_test_build", - "//base/security/deviceauth/frameworks/deviceauth_lite:deviceauth_lite_test_build" + "//base/security/device_auth:deviceauth_test_build", + "//base/security/device_auth/frameworks/deviceauth_lite:deviceauth_lite_test_build" ] } } diff --git a/deps_adapter/BUILD.gn b/deps_adapter/BUILD.gn index 1dd7c92b..db42f16c 100644 --- a/deps_adapter/BUILD.gn +++ b/deps_adapter/BUILD.gn @@ -23,7 +23,7 @@ if (defined(ohos_lite)) { static_library("deviceauth_hal_liteos") { include_dirs = hals_inc_path include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//third_party/cJSON", "//utils/native/lite/include", "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog_lite", @@ -56,7 +56,7 @@ if (defined(ohos_lite)) { static_library("deviceauth_hal_linux") { include_dirs = hals_inc_path include_dirs += [ - "//base/security/deviceauth/interfaces/innerkits", + "//base/security/device_auth/interfaces/innerkits", "//third_party/cJSON", "//utils/native/lite/include", "//base/security/huks/interfaces/innerkits/huks_standard/main/include", diff --git a/deps_adapter/deviceauth_hals.gni b/deps_adapter/deviceauth_hals.gni index 82b1b96d..d242f185 100644 --- a/deps_adapter/deviceauth_hals.gni +++ b/deps_adapter/deviceauth_hals.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/deviceauth_env.gni") +import("//base/security/device_auth/deviceauth_env.gni") declare_args() { deviceauth_storage_path = "" diff --git a/deviceauth_env.gni b/deviceauth_env.gni index 5d148856..5a9a743f 100644 --- a/deviceauth_env.gni +++ b/deviceauth_env.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -deviceauth_path = "//base/security/deviceauth" +deviceauth_path = "//base/security/device_auth" common_lib_path = "${deviceauth_path}/common_lib" deps_adapter_path = "${deviceauth_path}/deps_adapter" key_management_adapter_path = @@ -23,7 +23,7 @@ frameworks_path = "${deviceauth_path}/frameworks" services_path = "${deviceauth_path}/services" declare_args() { - deviceauth_feature_config = "//base/security/deviceauth/default_config" + deviceauth_feature_config = "//base/security/device_auth/default_config" enable_soft_bus_channel = true } diff --git a/frameworks/deviceauth_lite/BUILD.gn b/frameworks/deviceauth_lite/BUILD.gn index 532254cb..0f6fbdf1 100644 --- a/frameworks/deviceauth_lite/BUILD.gn +++ b/frameworks/deviceauth_lite/BUILD.gn @@ -18,9 +18,7 @@ import("//build/ohos.gni") group("hichainsdk") { deps = [] if (os_level == "mini" || os_level == "small") { - deps += [ - "//base/security/deviceauth/frameworks/deviceauth_lite/source:hichainsdk", - ] + deps += [ "//base/security/device_auth/frameworks/deviceauth_lite/source:hichainsdk" ] } } @@ -28,6 +26,6 @@ group("deviceauth_lite_test_build") { testonly = true deps = [] if (os_level == "small") { - deps += [ "//base/security/deviceauth/frameworks/deviceauth_lite/unittest:deviceauth_test" ] + deps += [ "//base/security/device_auth/frameworks/deviceauth_lite/unittest:deviceauth_test" ] } } diff --git a/frameworks/deviceauth_lite/source/BUILD.gn b/frameworks/deviceauth_lite/source/BUILD.gn index 67162263..3bb78581 100755 --- a/frameworks/deviceauth_lite/source/BUILD.gn +++ b/frameworks/deviceauth_lite/source/BUILD.gn @@ -63,7 +63,7 @@ hichian_sources = [ config("hichain_config") { include_dirs = [ "//third_party/bounds_checking_function/include", - "//base/security/deviceauth/interfaces/innerkits/deviceauth_lite", + "//base/security/device_auth/interfaces/innerkits/deviceauth_lite", "//third_party/cJSON", "base", "huks_adapter", @@ -88,9 +88,8 @@ if (ohos_kernel_type == "liteos_m") { static_library("hichainsdk") { sources = hichian_sources public_configs = [ ":hichain_config" ] - deps = [ - "//base/security/huks/interfaces/innerkits/huks_lite:huks_3.0_sdk" - ] + deps = + [ "//base/security/huks/interfaces/innerkits/huks_lite:huks_3.0_sdk" ] } } else { shared_library("hichainsdk") { diff --git a/frameworks/deviceauth_lite/unittest/BUILD.gn b/frameworks/deviceauth_lite/unittest/BUILD.gn index aa3ed03e..ba3058c4 100755 --- a/frameworks/deviceauth_lite/unittest/BUILD.gn +++ b/frameworks/deviceauth_lite/unittest/BUILD.gn @@ -18,14 +18,11 @@ import("//build/lite/config/test.gni") unittest("deviceauth_test") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/security" - sources = [ - "deviceauth_test.cpp" - ] - include_dirs = [ - "//base/security/deviceauth/interfaces/innerkits/deviceauth_lite" - ] + sources = [ "deviceauth_test.cpp" ] + include_dirs = + [ "//base/security/device_auth/interfaces/innerkits/deviceauth_lite" ] deps = [ - "//base/security/deviceauth/frameworks/deviceauth_lite/source:hichainsdk", - "//base/security/huks/interfaces/innerkits/huks_lite:huks_3.0_sdk" + "//base/security/device_auth/frameworks/deviceauth_lite/source:hichainsdk", + "//base/security/huks/interfaces/innerkits/huks_lite:huks_3.0_sdk", ] } diff --git a/services/BUILD.gn b/services/BUILD.gn index fa21db5b..ce214f3c 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -11,12 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/deps_adapter/deviceauth_hals.gni") +import("//base/security/device_auth/deps_adapter/deviceauth_hals.gni") import("//build/ohos.gni") import("deviceauth.gni") config("deviceauth_config") { - include_dirs = [ "//base/security/deviceauth/interfaces/innerkits" ] + include_dirs = [ "//base/security/device_auth/interfaces/innerkits" ] } include_dirs = inc_path + hals_inc_path if (os_level == "mini" || os_level == "small") { @@ -135,7 +135,7 @@ if (os_level == "mini" || os_level == "small") { } else { ohos_static_library("deviceauth") { subsystem_name = "security" - part_name = "deviceauth_standard" + part_name = "device_auth" include_dirs += [ "//third_party/cJSON", "${frameworks_path}/inc/standard", @@ -171,7 +171,7 @@ if (os_level == "mini" || os_level == "small") { source = "${frameworks_path}/src/standard/deviceauth_service.cfg" relative_install_dir = "init" subsystem_name = "security" - part_name = "deviceauth_standard" + part_name = "device_auth" } group("etc") { @@ -180,7 +180,7 @@ if (os_level == "mini" || os_level == "small") { ohos_executable("deviceauth_service") { subsystem_name = "security" - part_name = "deviceauth_standard" + part_name = "device_auth" install_enable = true include_dirs += [ @@ -217,7 +217,7 @@ if (os_level == "mini" || os_level == "small") { ohos_shared_library("deviceauth_sdk") { subsystem_name = "security" - part_name = "deviceauth_standard" + part_name = "device_auth" public_configs = [ ":deviceauth_config" ] include_dirs += [ diff --git a/services/deviceauth.gni b/services/deviceauth.gni index 22d919b2..009f78eb 100644 --- a/services/deviceauth.gni +++ b/services/deviceauth.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/deviceauth_env.gni") +import("//base/security/device_auth/deviceauth_env.gni") group_auth_path = "${services_path}/group_auth" authenticators_path = "${services_path}/authenticators" @@ -279,12 +279,12 @@ if (enable_p2p_auth_standard_protocol == true) { } if (enable_group == true && enable_account == true) { - import("//base/security/deviceauth/services/deviceauth_account.gni") + import("//base/security/device_auth/services/deviceauth_account.gni") deviceauth_defines += account_related_defines inc_path += account_related_inc_path deviceauth_files += account_related_files + bind_peer_files } else if (enable_group == false && enable_account == true) { - import("//base/security/deviceauth/services/deviceauth_account.gni") + import("//base/security/device_auth/services/deviceauth_account.gni") deviceauth_defines += account_related_defines inc_path += account_related_inc_path deviceauth_files += diff --git a/services/deviceauth_account.gni b/services/deviceauth_account.gni index 163f95af..2f16a30c 100644 --- a/services/deviceauth_account.gni +++ b/services/deviceauth_account.gni @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/deviceauth_env.gni") +import("//base/security/device_auth/deviceauth_env.gni") account_related_defines = [] account_related_inc_path = [] diff --git a/test/fuzztest/group_auth/authdevice_fuzzer/BUILD.gn b/test/fuzztest/group_auth/authdevice_fuzzer/BUILD.gn index 550cc22c..f22f6eb6 100644 --- a/test/fuzztest/group_auth/authdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/group_auth/authdevice_fuzzer/BUILD.gn @@ -11,19 +11,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_auth" +module_output_path = "device_auth/group_auth" ##############################fuzztest########################################## ohos_fuzztest("AuthDeviceFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/security/deviceauth/test/fuzztest/group_auth/authdevice_fuzzer" + "//base/security/device_auth/test/fuzztest/group_auth/authdevice_fuzzer" include_dirs = inc_path sources = [ "authdevice_fuzzer.cpp" ] cflags = [ @@ -37,7 +37,7 @@ ohos_fuzztest("AuthDeviceFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_auth/processauthdata_fuzzer/BUILD.gn b/test/fuzztest/group_auth/processauthdata_fuzzer/BUILD.gn index 99911b03..44d7f5e7 100644 --- a/test/fuzztest/group_auth/processauthdata_fuzzer/BUILD.gn +++ b/test/fuzztest/group_auth/processauthdata_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_auth" +module_output_path = "device_auth/group_auth" ##############################fuzztest########################################## ohos_fuzztest("ProcessAuthDataFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_auth/processauthdata_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_auth/processauthdata_fuzzer" include_dirs = inc_path sources = [ "processauthdata_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("ProcessAuthDataFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/addmember_fuzzer/BUILD.gn b/test/fuzztest/group_manage/addmember_fuzzer/BUILD.gn index 0525534c..89708f70 100644 --- a/test/fuzztest/group_manage/addmember_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/addmember_fuzzer/BUILD.gn @@ -11,19 +11,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("AddMemberFuzzTest") { module_out_path = module_output_path fuzz_config_file = - "//base/security/deviceauth/test/fuzztest/group_manage/addmember_fuzzer" + "//base/security/device_auth/test/fuzztest/group_manage/addmember_fuzzer" include_dirs = inc_path sources = [ "addmember_fuzzer.cpp" ] cflags = [ @@ -37,7 +37,7 @@ ohos_fuzztest("AddMemberFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/checkaccess_fuzzer/BUILD.gn b/test/fuzztest/group_manage/checkaccess_fuzzer/BUILD.gn index f6084280..ca0094b1 100644 --- a/test/fuzztest/group_manage/checkaccess_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/checkaccess_fuzzer/BUILD.gn @@ -11,19 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("CheckAccessFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/security/deviceauth/test/fuzztest/group_manage/checkaccess_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/checkaccess_fuzzer" include_dirs = inc_path sources = [ "checkaccess_fuzzer.cpp" ] cflags = [ @@ -37,7 +36,7 @@ ohos_fuzztest("CheckAccessFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/creategroup_fuzzer/BUILD.gn b/test/fuzztest/group_manage/creategroup_fuzzer/BUILD.gn index ead7fc6f..10d9e60f 100644 --- a/test/fuzztest/group_manage/creategroup_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/creategroup_fuzzer/BUILD.gn @@ -11,19 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("CreateGroupFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/security/deviceauth/test/fuzztest/group_manage/creategroup_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/creategroup_fuzzer" include_dirs = inc_path sources = [ "creategroup_fuzzer.cpp" ] cflags = [ @@ -37,7 +36,7 @@ ohos_fuzztest("CreateGroupFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/deletegroup_fuzzer/BUILD.gn b/test/fuzztest/group_manage/deletegroup_fuzzer/BUILD.gn index 1bbdf22a..9b9f12da 100644 --- a/test/fuzztest/group_manage/deletegroup_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/deletegroup_fuzzer/BUILD.gn @@ -11,19 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("DeleteGroupFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "//base/security/deviceauth/test/fuzztest/group_manage/deletegroup_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/deletegroup_fuzzer" include_dirs = inc_path sources = [ "deletegroup_fuzzer.cpp" ] cflags = [ @@ -37,7 +36,7 @@ ohos_fuzztest("DeleteGroupFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/deletemember_fuzzer/BUILD.gn b/test/fuzztest/group_manage/deletemember_fuzzer/BUILD.gn index a5094b12..352410e0 100644 --- a/test/fuzztest/group_manage/deletemember_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/deletemember_fuzzer/BUILD.gn @@ -11,19 +11,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("DeleteMemberFuzzTest") { module_out_path = module_output_path include_dirs = inc_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/deletemember_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/deletemember_fuzzer" sources = [ "deletemember_fuzzer.cpp" ] cflags = [ "-g", @@ -36,7 +36,7 @@ ohos_fuzztest("DeleteMemberFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer/BUILD.gn index ef24f7aa..3ee21709 100644 --- a/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetDeviceInfoByIdFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getdeviceinfobyid_fuzzer" include_dirs = inc_path sources = [ "getdeviceinfobyid_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetDeviceInfoByIdFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getgroupinfo_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getgroupinfo_fuzzer/BUILD.gn index 38c1c207..00cc9466 100644 --- a/test/fuzztest/group_manage/getgroupinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getgroupinfo_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetGroupInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getgroupinfo_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getgroupinfo_fuzzer" include_dirs = inc_path sources = [ "getgroupinfo_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetGroupInfoFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getgroupinfobyid_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getgroupinfobyid_fuzzer/BUILD.gn index a1bbb80e..3e26bdc8 100644 --- a/test/fuzztest/group_manage/getgroupinfobyid_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getgroupinfobyid_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetGroupInfoByIdFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getgroupinfobyid_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getgroupinfobyid_fuzzer" include_dirs = inc_path sources = [ "getgroupinfobyid_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetGroupInfoByIdFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getjoinedgroups_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getjoinedgroups_fuzzer/BUILD.gn index b9def924..6e9fab16 100644 --- a/test/fuzztest/group_manage/getjoinedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getjoinedgroups_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetJoinedGroupsFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getjoinedgroups_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getjoinedgroups_fuzzer" include_dirs = inc_path sources = [ "getjoinedgroups_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetJoinedGroupsFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getpkinfolist_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getpkinfolist_fuzzer/BUILD.gn index b95fd54b..df0ca9cf 100644 --- a/test/fuzztest/group_manage/getpkinfolist_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getpkinfolist_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetPkgInfoListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getpkinfolist_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getpkinfolist_fuzzer" include_dirs = inc_path sources = [ "getpkinfolist_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetPkgInfoListFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getregisterinfo_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getregisterinfo_fuzzer/BUILD.gn index c9d400b0..5c479cd7 100644 --- a/test/fuzztest/group_manage/getregisterinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getregisterinfo_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetRegisterInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getregisterinfo_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getregisterinfo_fuzzer" include_dirs = inc_path sources = [ "getregisterinfo_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetRegisterInfoFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/getrelatedgroups_fuzzer/BUILD.gn b/test/fuzztest/group_manage/getrelatedgroups_fuzzer/BUILD.gn index eeafbe12..603d7859 100644 --- a/test/fuzztest/group_manage/getrelatedgroups_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/getrelatedgroups_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetRelatedGroupsFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/getrelatedgroups_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/getrelatedgroups_fuzzer" include_dirs = inc_path sources = [ "getrelatedgroups_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetRelatedGroupsFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/gettrusteddevices_fuzzer/BUILD.gn b/test/fuzztest/group_manage/gettrusteddevices_fuzzer/BUILD.gn index 41e5e5ee..00a9c669 100644 --- a/test/fuzztest/group_manage/gettrusteddevices_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/gettrusteddevices_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("GetTrustedDevicesFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/gettrusteddevices_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/gettrusteddevices_fuzzer" include_dirs = inc_path sources = [ "gettrusteddevices_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("GetTrustedDevicesFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/isdeviceingroup_fuzzer/BUILD.gn b/test/fuzztest/group_manage/isdeviceingroup_fuzzer/BUILD.gn index 0065cb35..6b50a9db 100644 --- a/test/fuzztest/group_manage/isdeviceingroup_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/isdeviceingroup_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("IsDeviceInGroupFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/isdeviceingroup_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/isdeviceingroup_fuzzer" include_dirs = inc_path sources = [ "isdeviceingroup_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("IsDeviceInGroupFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/processbinddata_fuzzer/BUILD.gn b/test/fuzztest/group_manage/processbinddata_fuzzer/BUILD.gn index 56d6ec09..4c36146d 100644 --- a/test/fuzztest/group_manage/processbinddata_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/processbinddata_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("ProcessBindDataFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/processbinddata_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/processbinddata_fuzzer" include_dirs = inc_path sources = [ "processbinddata_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("ProcessBindDataFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/registercallback_fuzzer/BUILD.gn b/test/fuzztest/group_manage/registercallback_fuzzer/BUILD.gn index d0c1157f..78ccc6b3 100644 --- a/test/fuzztest/group_manage/registercallback_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/registercallback_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("RegisterCallbackFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/registercallback_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/registercallback_fuzzer" include_dirs = inc_path sources = [ "registercallback_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/registerdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/group_manage/registerdatachangelistener_fuzzer/BUILD.gn index 6b9e9755..a9f81c3c 100644 --- a/test/fuzztest/group_manage/registerdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/registerdatachangelistener_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("RegisterDataChangeListenerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/registerdatachangelistener_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/registerdatachangelistener_fuzzer" include_dirs = inc_path sources = [ "registerdatachangelistener_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("RegisterDataChangeListenerFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/unregistercallback_fuzzer/BUILD.gn b/test/fuzztest/group_manage/unregistercallback_fuzzer/BUILD.gn index a35d102f..c04b0362 100644 --- a/test/fuzztest/group_manage/unregistercallback_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/unregistercallback_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("UnregisterCallbackFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/unregistercallback_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/unregistercallback_fuzzer" include_dirs = inc_path sources = [ "unregistercallback_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("UnregisterCallbackFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer/BUILD.gn b/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer/BUILD.gn index 0cf43cc3..8dfb5d39 100644 --- a/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer/BUILD.gn +++ b/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer/BUILD.gn @@ -11,18 +11,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/services/deviceauth.gni") #####################hydra-fuzz################### import("//build/config/features.gni") import("//build/ohos.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/group_manage" +module_output_path = "device_auth/group_manage" ##############################fuzztest########################################## ohos_fuzztest("UnregisterDataChangeListenerFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "//base/security/deviceauth/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer" + fuzz_config_file = "//base/security/device_auth/test/fuzztest/group_manage/unregisterdatachangelistener_fuzzer" include_dirs = inc_path sources = [ "unregisterdatachangelistener_fuzzer.cpp" ] cflags = [ @@ -36,7 +36,7 @@ ohos_fuzztest("UnregisterDataChangeListenerFuzzTest") { cflags += [ "-DBINDER_IPC_32BIT" ] } - deps = [ "//base/security/deviceauth/services:deviceauth_sdk" ] + deps = [ "//base/security/device_auth/services:deviceauth_sdk" ] } ############################################################################### diff --git a/test/unittest/deviceauth/BUILD.gn b/test/unittest/deviceauth/BUILD.gn index 7fccc388..06594029 100644 --- a/test/unittest/deviceauth/BUILD.gn +++ b/test/unittest/deviceauth/BUILD.gn @@ -11,11 +11,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -import("//base/security/deviceauth/deps_adapter/deviceauth_hals.gni") -import("//base/security/deviceauth/services/deviceauth.gni") +import("//base/security/device_auth/deps_adapter/deviceauth_hals.gni") +import("//base/security/device_auth/services/deviceauth.gni") import("//build/test.gni") -module_output_path = "deviceauth_standard/deviceauth_test" +module_output_path = "device_auth/deviceauth_test" ohos_unittest("deviceauth_llt") { module_out_path = module_output_path diff --git a/test/unittest/deviceauth/source/deviceauth_standard_test.cpp b/test/unittest/deviceauth/source/deviceauth_standard_test.cpp index b2b89c48..a7fac7a4 100644 --- a/test/unittest/deviceauth/source/deviceauth_standard_test.cpp +++ b/test/unittest/deviceauth/source/deviceauth_standard_test.cpp @@ -800,4 +800,4 @@ HWTEST_F(GaProcessDataTest, GaProcessDataTest002, TestSize.Level0) EXPECT_NE(ga, nullptr); int32_t ret = ga->processData(TEST_REQ_ID, NULL, 0, NULL); EXPECT_NE(ret, HC_SUCCESS); -} \ No newline at end of file +}