appverify仓路径移动代码回退

Signed-off-by: zhangxinyu <zhangxinyu74@huawei.com>
Change-Id: I4cd3447431069e438cecb7e049390ba7bf6ac3bf
This commit is contained in:
zhangxinyu 2023-07-03 14:26:59 +00:00
parent 5b1b2257af
commit 2fe40f182b
11 changed files with 44 additions and 39 deletions

View File

@ -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",
]
}
}
}

View File

@ -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>

View File

@ -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

View File

@ -33,7 +33,7 @@
## 目录<a name="section161941989596"></a>
```
/foundation/bundlemanager/appverify
/base/security/appverify
├── interfaces/innerkits/appverify # 应用完整性校验模块代码
│ ├── config # 应用签名根证书和可信源列表配置文件存放目录
│ ├── include # 头文件存放目录

View File

@ -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"
]
}
}

View File

@ -81,7 +81,7 @@ if (os_level == "standard") {
part_name = "appverify"
subsystem_name = "bundlemanager"
subsystem_name = "security"
defines += [ "OPENSSL_SUPPRESS_DEPRECATED" ]
}
} else {

View File

@ -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"
}

View File

@ -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") {

View File

@ -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",
]

View File

@ -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",
]
}

View File

@ -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",
]