From 2fe40f182b75deacf3689ae5c3de6783ef4b14cd Mon Sep 17 00:00:00 2001
From: zhangxinyu <zhangxinyu74@huawei.com>
Date: Mon, 3 Jul 2023 14:26:59 +0000
Subject: [PATCH] =?UTF-8?q?appverify=E4=BB=93=E8=B7=AF=E5=BE=84=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=BB=A3=E7=A0=81=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangxinyu <zhangxinyu74@huawei.com>
Change-Id: I4cd3447431069e438cecb7e049390ba7bf6ac3bf
---
 BUILD.gn                                      | 22 +++++++++++--------
 OAT.xml                                       |  4 ++--
 README.md                                     |  2 +-
 README_zh.md                                  |  2 +-
 bundle.json                                   | 16 +++++++-------
 interfaces/innerkits/appverify/BUILD.gn       |  2 +-
 .../innerkits/appverify/config/BUILD.gn       | 10 ++++-----
 interfaces/innerkits/appverify/test/BUILD.gn  |  9 ++++----
 interfaces/innerkits/appverify_lite/BUILD.gn  |  8 +++----
 .../appverify_lite/products/ipcamera/BUILD.gn |  4 ++--
 .../appverify_lite/unittest/BUILD.gn          |  4 ++--
 11 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 62d3d6d..0968a5e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -14,25 +14,29 @@
 group("testcase_packages") {
   testonly = true
   if (os_level == "standard") {
-    deps = [ "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/test:unittest" ]
+    deps = [
+      "//base/security/appverify/interfaces/innerkits/appverify/test:unittest",
+    ]
   } else if (os_level == "small") {
-    deps = [ "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/unittest:unittest" ]
+    deps = [ "//base/security/appverify/interfaces/innerkits/appverify_lite/unittest:unittest" ]
   }
 }
 
 group("appverify_components") {
   if (os_level == "standard") {
     deps = [
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify:libhapverify",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/config:trusted_apps_sources",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/config:trusted_apps_sources_test",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/config:trusted_root_ca",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/config:trusted_root_ca_test",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/config:trusted_tickets_sources",
+      "//base/security/appverify/interfaces/innerkits/appverify:libhapverify",
+      "//base/security/appverify/interfaces/innerkits/appverify/config:trusted_apps_sources",
+      "//base/security/appverify/interfaces/innerkits/appverify/config:trusted_apps_sources_test",
+      "//base/security/appverify/interfaces/innerkits/appverify/config:trusted_root_ca",
+      "//base/security/appverify/interfaces/innerkits/appverify/config:trusted_root_ca_test",
+      "//base/security/appverify/interfaces/innerkits/appverify/config:trusted_tickets_sources",
     ]
   } else {
     if (ohos_kernel_type != "liteos_m") {
-      deps = [ "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite:verify" ]
+      deps = [
+        "//base/security/appverify/interfaces/innerkits/appverify_lite:verify",
+      ]
     }
   }
 }
diff --git a/OAT.xml b/OAT.xml
index 9b1a723..690f793 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -42,8 +42,8 @@
             <filefilter name="readmeOpenSourcefileNamePolicyFilter" desc="Filters for README.OpenSource file policies">
             </filefilter>
             <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
-                <filteritem type="filepath" name="foundation/bundlemanager/appverify/figures/image_appverify.png" desc="Picture of module architecture in README"/>
-                <filteritem type="filepath" name="foundation/bundlemanager/appverify/figures/zh-cn_image_appverify.png" desc="Picture of module architecture in README"/>
+                <filteritem type="filepath" name="base/security/appverify/figures/image_appverify.png" desc="Picture of module architecture in README"/>
+                <filteritem type="filepath" name="base/security/appverify/figures/zh-cn_image_appverify.png" desc="Picture of module architecture in README"/>
             </filefilter>
 
         </filefilterlist>
diff --git a/README.md b/README.md
index 05d5f7c..2fd15e3 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ To ensure the integrity and trustworthiness of the applications to be installed
 ## Directory Structure<a name="section161941989596"></a>
 
 ```
-/foundation/bundlemanager/appverify
+/base/security/appverify
 ├── interfaces/innerkits/appverify         # Application integrity verification module
 │       ├── config                         # Application signature root certificates and configuration files for the trusted source list
 │       ├── include                        # Header files
diff --git a/README_zh.md b/README_zh.md
index c9c6910..51feaf4 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -33,7 +33,7 @@
 ## 目录<a name="section161941989596"></a>
 
 ```
-/foundation/bundlemanager/appverify
+/base/security/appverify
 ├── interfaces/innerkits/appverify         # 应用完整性校验模块代码
 │       ├── config                         # 应用签名根证书和可信源列表配置文件存放目录
 │       ├── include                        # 头文件存放目录
diff --git a/bundle.json b/bundle.json
index 966b71d..fccf599 100644
--- a/bundle.json
+++ b/bundle.json
@@ -5,13 +5,13 @@
     "license": "Apache License 2.0",
     "publishAs": "code-segment",
     "segment": {
-      "destPath": "foundation/bundlemanager/appverify"
+      "destPath": "base/security/appverify"
     },
     "dirs": {},
     "scripts": {},
     "component": {
       "name": "appverify",
-      "subsystem": "bundlemanager",
+      "subsystem": "security",
       "syscap": [],
       "features": [],
       "adapted_system_type": [
@@ -38,12 +38,12 @@
       },
       "build": {
         "sub_component": [
-          "//foundation/bundlemanager/appverify:appverify_components"
+          "//base/security/appverify:appverify_components"
         ],
         "inner_kits": [
           {
             "header": {
-              "header_base": "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/include",
+              "header_base": "//base/security/appverify/interfaces/innerkits/appverify/include",
               "header_files": [
                 "interfaces/hap_verify_result.h",
                 "interfaces/hap_verify.h",
@@ -52,20 +52,20 @@
                 "provision/provision_info.h"
               ]
             },
-            "name": "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify:libhapverify"
+            "name": "//base/security/appverify/interfaces/innerkits/appverify:libhapverify"
           },
           {
             "header": {
-              "header_base": "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/include",
+              "header_base": "//base/security/appverify/interfaces/innerkits/appverify_lite/include",
               "header_files": [
                 "app_verify_pub.h"
               ]
             },
-            "name": "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite:verify"
+            "name": "//base/security/appverify/interfaces/innerkits/appverify_lite:verify"
           }
        ],
        "test": [
-         "//foundation/bundlemanager/appverify:testcase_packages"
+         "//base/security/appverify:testcase_packages"
        ]
      }
     }
diff --git a/interfaces/innerkits/appverify/BUILD.gn b/interfaces/innerkits/appverify/BUILD.gn
index 096e2e3..43adb8e 100644
--- a/interfaces/innerkits/appverify/BUILD.gn
+++ b/interfaces/innerkits/appverify/BUILD.gn
@@ -81,7 +81,7 @@ if (os_level == "standard") {
 
     part_name = "appverify"
 
-    subsystem_name = "bundlemanager"
+    subsystem_name = "security"
     defines += [ "OPENSSL_SUPPRESS_DEPRECATED" ]
   }
 } else {
diff --git a/interfaces/innerkits/appverify/config/BUILD.gn b/interfaces/innerkits/appverify/config/BUILD.gn
index 024bd4b..9dd27f3 100644
--- a/interfaces/innerkits/appverify/config/BUILD.gn
+++ b/interfaces/innerkits/appverify/config/BUILD.gn
@@ -20,14 +20,14 @@ ohos_prebuilt_etc("trusted_apps_sources") {
     source = "trusted_apps_sources.json"
   }
   part_name = "appverify"
-  subsystem_name = "bundlemanager"
+  subsystem_name = "security"
   relative_install_dir = "security"
 }
 
 ohos_prebuilt_etc("trusted_apps_sources_test") {
   source = "trusted_apps_sources_test.json"
   part_name = "appverify"
-  subsystem_name = "bundlemanager"
+  subsystem_name = "security"
   relative_install_dir = "security"
 }
 
@@ -38,20 +38,20 @@ ohos_prebuilt_etc("trusted_root_ca") {
     source = "trusted_root_ca.json"
   }
   part_name = "appverify"
-  subsystem_name = "bundlemanager"
+  subsystem_name = "security"
   relative_install_dir = "security"
 }
 
 ohos_prebuilt_etc("trusted_root_ca_test") {
   source = "trusted_root_ca_test.json"
   part_name = "appverify"
-  subsystem_name = "bundlemanager"
+  subsystem_name = "security"
   relative_install_dir = "security"
 }
 
 ohos_prebuilt_etc("trusted_tickets_sources") {
   source = "trusted_tickets_sources.json"
   part_name = "appverify"
-  subsystem_name = "bundlemanager"
+  subsystem_name = "security"
   relative_install_dir = "security"
 }
diff --git a/interfaces/innerkits/appverify/test/BUILD.gn b/interfaces/innerkits/appverify/test/BUILD.gn
index d505eb7..d83d6bb 100644
--- a/interfaces/innerkits/appverify/test/BUILD.gn
+++ b/interfaces/innerkits/appverify/test/BUILD.gn
@@ -18,8 +18,8 @@ module_output_path = "appverify/verify"
 config("verify_test_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/test/unittest/include",
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify/include",
+    "//base/security/appverify/interfaces/innerkits/appverify/test/unittest/include",
+    "//base/security/appverify/interfaces/innerkits/appverify/include",
     "//third_party/openssl/include",
     "//third_party/json/single_include",
   ]
@@ -48,7 +48,7 @@ ohos_unittest("verify_test") {
 
   configs = [ ":verify_test_config" ]
   deps = [
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify:libhapverify",
+    "//base/security/appverify/interfaces/innerkits/appverify:libhapverify",
     "//third_party/googletest:gtest_main",
     "//third_party/openssl:libcrypto_static",
   ]
@@ -70,7 +70,8 @@ ohos_unittest("verify_test") {
     ]
   }
 
-  resource_config_file = "//foundation/bundlemanager/appverify/test/resource/appverify/ohos_test.xml"
+  resource_config_file =
+      "//base/security/appverify/test/resource/appverify/ohos_test.xml"
 }
 
 group("unittest") {
diff --git a/interfaces/innerkits/appverify_lite/BUILD.gn b/interfaces/innerkits/appverify_lite/BUILD.gn
index 2ddf519..50ab2a5 100644
--- a/interfaces/innerkits/appverify_lite/BUILD.gn
+++ b/interfaces/innerkits/appverify_lite/BUILD.gn
@@ -20,9 +20,9 @@ if (os_level == "small" || os_level == "mini") {
       "include",
       "//third_party/bounds_checking_function/include",
       "//third_party/cJSON",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/products/default",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/products/ipcamera",
+      "//base/security/appverify/interfaces/innerkits/appverify_lite",
+      "//base/security/appverify/interfaces/innerkits/appverify_lite/products/default",
+      "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera",
     ]
 
     cflags = [ "-Wno-int-conversion" ]
@@ -45,8 +45,8 @@ if (os_level == "small" || os_level == "mini") {
     ]
     configs += [ ":app_verify_config" ]
     public_deps = [
+      "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera:verify_base",
       "//build/lite/config/component/cJSON:cjson_shared",
-      "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/products/ipcamera:verify_base",
       "//third_party/bounds_checking_function:libsec_shared",
       "//third_party/mbedtls:mbedtls_shared",
     ]
diff --git a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn
index 80a1e75..0772cad 100644
--- a/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn
+++ b/interfaces/innerkits/appverify_lite/products/ipcamera/BUILD.gn
@@ -13,8 +13,8 @@
 
 config("verify_base_config") {
   include_dirs = [
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/include",
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/products/ipcamera",
+    "//base/security/appverify/interfaces/innerkits/appverify_lite/include",
+    "//base/security/appverify/interfaces/innerkits/appverify_lite/products/ipcamera",
     "//base/startup/init/interfaces/innerkits/include/syspara",
   ]
 }
diff --git a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
index 9a34717..8e64cf8 100644
--- a/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
+++ b/interfaces/innerkits/appverify_lite/unittest/BUILD.gn
@@ -36,14 +36,14 @@ unittest("app_verify_test") {
 
   include_dirs = [
     "src",
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite/include",
+    "//base/security/appverify/interfaces/innerkits/appverify_lite/include",
     "//third_party/bounds_checking_function/include",
     "//third_party/cJSON",
   ]
 
   deps = [
+    "//base/security/appverify/interfaces/innerkits/appverify_lite:verify",
     "//build/lite/config/component/cJSON:cjson_shared",
-    "//foundation/bundlemanager/appverify/interfaces/innerkits/appverify_lite:verify",
     "//third_party/bounds_checking_function:libsec_shared",
     "//third_party/mbedtls:mbedtls_shared",
   ]
-- 
Gitee