diff --git a/BUILD.gn b/BUILD.gn index 62d3d6d91dd84face2db2b9d58cccbaefcbbbba7..0968a5e4bb474d9459da3cd63c47fdad2c2e2d52 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 9b1a7235dac5d822f1d01555f1258544ff955fe4..690f79394f137dedf600909d39a5c9e1715bbf68 100644 --- a/OAT.xml +++ b/OAT.xml @@ -42,8 +42,8 @@ - - + + diff --git a/README.md b/README.md index 05d5f7cb639c4ea496d1444a68553c3514bf93be..2fd15e32da15ea27d045b7034dc1cd09ce8980de 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 ``` -/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 c9c69109e24feba708ce92ade2d1385f82e4dd5f..51feaf4c572cc135a93715fbe47c419d38b5a8d4 100644 --- a/README_zh.md +++ b/README_zh.md @@ -33,7 +33,7 @@ ## 目录 ``` -/foundation/bundlemanager/appverify +/base/security/appverify ├── interfaces/innerkits/appverify # 应用完整性校验模块代码 │ ├── config # 应用签名根证书和可信源列表配置文件存放目录 │ ├── include # 头文件存放目录 diff --git a/bundle.json b/bundle.json index 966b71d2785fb0f5ecbb5e193f6cbb3757af2f98..fccf599735548c22daa1a8ca936af4d236a20033 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 096e2e37993245487c2e67174ea7e6b0c7fe8776..43adb8e3914a932e894a1aeb411f3532f503c727 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 024bd4b709690795815e14e069afd8d4e0e76f59..9dd27f377f944b85c6c4fa0016d6a9fdc24aafa3 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 d505eb7046f60650f6d189bb6ac3e2ae649ffeca..d83d6bb2f31bf170e6d736bccd5133b1fb954db8 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 2ddf519cc281dbd96454ee3f1a5f1e8b4ae78e43..50ab2a5037602be2f36760584916125d15103947 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 80a1e754f7414798fc4ba26de91aae3d140b29b8..0772cad4d7527f60cb4f177ce84d4bd8cedb6e18 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 9a34717c8c35fb9924bed3b5373179160807d489..8e64cf81baf1c02fbf9bd5ce44379a13ab3aa111 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", ]