!775 modify device auth feature name

Merge pull request !775 from 何寅燊/master
2026-08-25 09:19:33 -04:00 · 2024-08-16 07:06:40 +00:00
parent b81244d5df 8f83288586
commit b952face14
43 changed files with 55 additions and 51 deletions
@@ -26,7 +26,11 @@
        "device_auth_p2p_standard_protocol_enabled",
        "device_auth_p2p_lite_protocol_legacy_enabled",
        "device_auth_account_lite_protocol_enabled",
-        "device_auth_account_standard_protocol_enabled"
+        "device_auth_account_standard_protocol_enabled",
+        "device_auth_storage_path",
+        "device_auth_hichain_thread_stack_size",
+        "device_auth_enable_posix_interface",
+        "device_auth_enable_soft_bus_channel"
      ],
      "hisysevent_config": [
          "//base/security/device_auth/hisysevent.yaml"
@@ -16,7 +16,7 @@ declare_args() {
  enable_session_v1 = true
  enable_extend_plugin = false
  enable_account = false
-  enable_posix_interface = false
+  device_auth_enable_posix_interface = false
  enable_pseudonym = false

  enable_p2p_bind_lite_protocol = true
@@ -35,5 +35,5 @@ declare_args() {
  enable_key_agree_pake_ec_prime_x25519 = true

  max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 8192
+  device_auth_hichain_thread_stack_size = 8192
 }
@@ -34,5 +34,5 @@ declare_args() {
  enable_key_agree_pake_ec_prime_x25519 = true

  max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 102400
+  device_auth_hichain_thread_stack_size = 102400
 }
@@ -34,5 +34,5 @@ declare_args() {
  enable_key_agree_pake_ec_prime_x25519 = true

  max_auth_session_count = 10
-  deviceauth_hichain_thread_stack_size = 102400
+  device_auth_hichain_thread_stack_size = 102400
 }
@@ -44,14 +44,14 @@ if (defined(ohos_lite)) {
        "${os_adapter_path}/impl/src/liteos/mini/hc_init_protection.c",
      ]

-      if (enable_posix_interface) {
+      if (device_auth_enable_posix_interface) {
        sources += [ "${os_adapter_path}/impl/src/liteos/mini/hc_file_posix.c" ]
      } else {
        sources += [ "${os_adapter_path}/impl/src/liteos/mini/hc_file.c" ]
      }

      cflags = [ "-DHILOG_ENABLE" ]
-      cflags += [ "-DAUTH_STORAGE_PATH=\"${deviceauth_storage_path}\"" ]
+      cflags += [ "-DAUTH_STORAGE_PATH=\"${device_auth_storage_path}\"" ]
      if (board_toolchain_type == "iccarm") {
        cflags += [
          "--diag_suppress",
@@ -14,7 +14,7 @@
 import("//base/security/device_auth/deviceauth_env.gni")

 declare_args() {
-  deviceauth_storage_path = ""
+  device_auth_storage_path = ""
 }

 if (target_os == "liteos" ||
@@ -24,7 +24,7 @@ services_path = "${deviceauth_path}/services"

 declare_args() {
  deviceauth_feature_config = "//base/security/device_auth/default_config"
-  enable_soft_bus_channel = true
+  device_auth_enable_soft_bus_channel = true
 }

 build_flags = [
@@ -49,7 +49,7 @@ if (defined(ohos_lite)) {
  } else {
    import("${deviceauth_feature_config}/small/config.gni")
  }
-  enable_soft_bus_channel = false
+  device_auth_enable_soft_bus_channel = false
 } else {
  import("${deviceauth_feature_config}/standard/config.gni")
 }
@@ -43,7 +43,7 @@ if (os_level == "mini" || os_level == "small") {
      "//build/lite/config/component/cJSON:cjson_shared",
      "//commonlibrary/utils_lite:utils",
    ]
-    if (enable_soft_bus_channel) {
+    if (device_auth_enable_soft_bus_channel) {
      deps += [ "//foundation/communication/dsoftbus/sdk:softbus_client" ]
    }
    if (enable_extend_plugin) {
@@ -69,7 +69,7 @@ if (os_level == "mini" || os_level == "small") {
      cflags = build_flags
    }
    cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
      "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
    ]
    if (ohos_kernel_type == "linux" || ohos_kernel_type == "liteos_a") {
@@ -187,7 +187,7 @@ if (os_level == "mini" || os_level == "small") {
    defines += [ "DEV_AUTH_HIVIEW_ENABLE" ]
    cflags = build_flags
    cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
      "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
    ]
    if (target_cpu == "arm") {
@@ -389,7 +389,7 @@ if (enable_extend_plugin) {
  deviceauth_files += account_auth_plugin_mock_files
 }

-if (enable_soft_bus_channel == true) {
+if (device_auth_enable_soft_bus_channel == true) {
  deviceauth_files += soft_bus_channel_files
 } else {
  deviceauth_files += soft_bus_channel_mock_files
@@ -57,7 +57,7 @@ ohos_fuzztest("IsoAuthTaskFuzzTest") {
  ]
  cflags += build_flags
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]
  if (target_cpu == "arm") {
@@ -59,7 +59,7 @@ ohos_fuzztest("StandardExchangeTaskFuzzTest") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]
  deps = [ "${deps_adapter_path}:${hal_module_name}" ]
@@ -75,7 +75,7 @@ ohos_fuzztest("CredsManagerFuzzTest") {
  ]
  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -60,7 +60,7 @@ ohos_fuzztest("DevAuthFuzzTest") {
  ]
  cflags += build_flags
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]
  sanitize = {
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAddMemberToGroupFuzzTest") {
  sources = [ "devauthservaddmembertogroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAddMultiMembersToGroupFuzzTest") {
  sources = [ "devauthservaddmultimemberstogroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServAuthDeviceFuzzTest") {
  sources = [ "devauthservauthdevice_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCancelAuthRequestFuzzTest") {
  sources = [ "devauthservcancelauthrequest_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCancelBindRequestFuzzTest") {
  sources = [ "devauthservcancelbindrequest_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCheckAccessToGroupFuzzTest") {
  sources = [ "devauthservcheckaccesstogroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServCreateGroupFuzzTest") {
  sources = [ "devauthservcreategroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteGroupFuzzTest") {
  sources = [ "devauthservdeletegroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteMemberFromGroupFuzzTest") {
  sources = [ "devauthservdeletememberfromgroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServDeleteMultiMembersFromGroupFuzzTest") {
  sources = [ "devauthservdeletemultimembersfromgroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetDeviceInfoByIdFuzzTest") {
  sources = [ "devauthservgetdeviceinfobyid_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoFuzzTest") {
  sources = [ "devauthservgetgroupinfo_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetGroupInfoByIdFuzzTest") {
  sources = [ "devauthservgetgroupinfobyid_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetJoinedGroupsFuzzTest") {
  sources = [ "devauthservgetjoinedgroups_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetPkInfoListFuzzTest") {
  sources = [ "devauthservgetpkinfolist_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetRegisterInfoFuzzTest") {
  sources = [ "devauthservgetregisterinfo_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetRelatedGroupsFuzzTest") {
  sources = [ "devauthservgetrelatedgroups_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServGetTrustedDevicesFuzzTest") {
  sources = [ "devauthservgettrusteddevices_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServIsDeviceInGroupFuzzTest") {
  sources = [ "devauthservisdeviceingroup_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServProcessAuthDataFuzzTest") {
  sources = [ "devauthservprocessauthdata_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServProcessBindDataFuzzTest") {
  sources = [ "devauthservprocessbinddata_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServRegCallbackFuzzTest") {
  sources = [ "devauthservregcallback_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServRegDataChangeListenerFuzzTest") {
  sources = [ "devauthservregdatachangelistener_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServUnregCallbackFuzzTest") {
  sources = [ "devauthservunregcallback_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -32,7 +32,7 @@ ohos_fuzztest("DevAuthServUnregDataChangeListenerFuzzTest") {
  sources = [ "devauthservunregdatachangelistener_fuzzer.cpp" ]
  sources += deviceauth_files
  sources += hiview_adapter_files
-  if (enable_soft_bus_channel == true) {
+  if (device_auth_enable_soft_bus_channel == true) {
    sources -= soft_bus_channel_files
    sources += soft_bus_channel_mock_files
  }
@@ -110,7 +110,7 @@ ohos_fuzztest("AccountRelatedGroupAuthFuzzTest") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE = ${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE = ${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT = ${max_auth_session_count}",
  ]

@@ -68,7 +68,7 @@ ohos_fuzztest("GroupOperationCommonFuzzTest") {
  ]
  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -120,7 +120,7 @@ ohos_unittest("deviceauth_llt") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -248,7 +248,7 @@ ohos_unittest("device_auth_func_test") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -366,7 +366,7 @@ ohos_unittest("device_auth_interface_test") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -483,7 +483,7 @@ ohos_unittest("deviceauth_unit_test") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -65,7 +65,7 @@ ohos_unittest("creds_manager_test") {

  cflags = [ "-DHILOG_ENABLE" ]
  cflags += [
-    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+    "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
    "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
  ]

@@ -58,7 +58,7 @@ if (support_os_account) {

    cflags = [ "-DHILOG_ENABLE" ]
    cflags += [
-      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${deviceauth_hichain_thread_stack_size}",
+      "-DDEV_AUTH_WORK_THREAD_STACK_SIZE=${device_auth_hichain_thread_stack_size}",
      "-DMAX_AUTH_SESSION_COUNT=${max_auth_session_count}",
    ]
    if (target_cpu == "arm") {