diff --git a/BUILD.gn b/BUILD.gn index 278ada686ae2e6719cc9bba20e5c3b1602ecad34..873deb422c9ea67ff5b0e2fd013b92c779e35f3a 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,7 +16,7 @@ import("//build/ohos/sa_profile/sa_profile.gni") import("code_signature.gni") config("common_public_config") { - include_dirs = [ "interfaces/innerkits/common/include" ] + include_dirs = [ "interfaces/inner_api/common/include" ] } config("common_utils_config") { @@ -25,10 +25,10 @@ config("common_utils_config") { group("subcomponents") { deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign:libjit_code_sign", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/frameworks/inner_api/jit_code_sign:libjit_code_sign", + "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk", "${code_signature_root_dir}/services/local_code_sign:liblocal_code_sign", "${code_signature_root_dir}/services/local_code_sign:local_code_sign_configs", ] diff --git a/README.md b/README.md index 3ddba11ec37968cbb5f8315859fc4a80b9e81bdd..1ed8173dafd5f2d8ead727d7119d90bf9663dfce 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,13 @@ The code signature component provides the following functions: ``` /base/security/code_signature ├── interfaces # Interface layer -│ └── innerkits # +│ └── inner_api # │ ├── code_sign_attr_utils # APIs for setting code signing attributes │ ├── code_sign_utils # APIs for enabling code signing │ ├── common # Common basic capacities │ └── local_code_sign # APIs for local code signing +├── frameworks # Source of interfaces +│ └── inner_api # ├── services # Service layer │ ├── key_enable # Certificate initialization │ └── local_code_sign # Local code signing service diff --git a/README_zh.md b/README_zh.md index aaa6d986983fd2033fa72f6f9c2de6e17ba1d86b..97e632aabda8989092f0c8fcccd70d7adde866dd 100644 --- a/README_zh.md +++ b/README_zh.md @@ -21,12 +21,14 @@ ``` /base/security/code_signature ├── interfaces # 接口层 -│ └── innerkits # +│ └── inner_api # │ ├── code_sign_attr_utils # 属性设置接口 │ ├── code_sign_utils # 使能接口 │ ├── common # 公共基础能力 │ ├── jit_code_sign # JIT代码签名 │ └── local_code_sign # 本地签名 +├── frameworks # 接口实现 +│ └── inner_api # ├── services # 服务层 │ ├── key_enable # 证书初始化 │ └── local_code_sign # 本地签名服务 diff --git a/bundle.json b/bundle.json index 55047c6f28450b98d54125f4487ca1d848da0eb5..57509367fdfeeafe2d949bfa370bdbe63552de4d 100644 --- a/bundle.json +++ b/bundle.json @@ -55,31 +55,31 @@ ], "inner_kits": [ { - "name" : "//base/security/code_signature/interfaces/innerkits/code_sign_utils:libcode_sign_utils", + "name" : "//base/security/code_signature/frameworks/inner_api/code_sign_utils:libcode_sign_utils", "header": { "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/code_sign_utils/include" + "header_base": "//base/security/code_signature/interfaces/inner_api/code_sign_utils/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "name" : "//base/security/code_signature/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk", "header": { "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/local_code_sign/include" + "header_base": "//base/security/code_signature/interfaces/inner_api/local_code_sign/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", + "name" : "//base/security/code_signature/frameworks/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", "header": { "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/code_sign_attr_utils/include" + "header_base": "//base/security/code_signature/interfaces/inner_api/code_sign_attr_utils/include" } }, { - "name" : "//base/security/code_signature/interfaces/innerkits/jit_code_sign:libjit_code_sign", + "name" : "//base/security/code_signature/frameworks/inner_api/jit_code_sign:libjit_code_sign", "header": { "header_files": [], - "header_base": "//base/security/code_signature/interfaces/innerkits/jit_code_sign/include" + "header_base": "//base/security/code_signature/interfaces/inner_api/jit_code_sign/include" } } ], diff --git a/code_signature.gni b/code_signature.gni index cb5eae75c575f49b4d75336d51357400dcdcbc10..8b1c240a66638bb224075b616f6ea18f3a5d41c8 100644 --- a/code_signature.gni +++ b/code_signature.gni @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -13,6 +13,8 @@ fuzz_module_output_path = "code_signature/code_signature" code_signature_root_dir = "//base/security/code_signature" +code_signature_inner_api_dir = + "//base/security/code_signature/interfaces/inner_api" fsverity_utils_dir = "//third_party/fsverity-utils" openssl_dir = "//third_party/openssl" rust_openssl_dir = "//third_party/rust/crates/rust-openssl" diff --git a/interfaces/innerkits/code_sign_attr_utils/BUILD.gn b/frameworks/inner_api/code_sign_attr_utils/BUILD.gn similarity index 89% rename from interfaces/innerkits/code_sign_attr_utils/BUILD.gn rename to frameworks/inner_api/code_sign_attr_utils/BUILD.gn index cdac4be899c5f83c773be8ec8c58b24a11d73ee2..e75b068d69317a885e23634332bec27bd9c17da0 100755 --- a/interfaces/innerkits/code_sign_attr_utils/BUILD.gn +++ b/frameworks/inner_api/code_sign_attr_utils/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("../../../code_signature.gni") config("public_attr_utils_configs") { - include_dirs = [ "include" ] + include_dirs = [ "${code_signature_inner_api_dir}/code_sign_attr_utils/include" ] } ohos_static_library("libcode_sign_attr_utils") { diff --git a/interfaces/innerkits/code_sign_attr_utils/src/code_sign_attr_utils.c b/frameworks/inner_api/code_sign_attr_utils/src/code_sign_attr_utils.c similarity index 98% rename from interfaces/innerkits/code_sign_attr_utils/src/code_sign_attr_utils.c rename to frameworks/inner_api/code_sign_attr_utils/src/code_sign_attr_utils.c index 04a39fbacd9bae3309c3dd66d965e6dd27ed6e24..eb18dde55a80ecefbad0f2c57c8f08f321a3422a 100755 --- a/interfaces/innerkits/code_sign_attr_utils/src/code_sign_attr_utils.c +++ b/frameworks/inner_api/code_sign_attr_utils/src/code_sign_attr_utils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/code_sign_attr_utils/src/ownerid_utils.cpp b/frameworks/inner_api/code_sign_attr_utils/src/ownerid_utils.cpp similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/src/ownerid_utils.cpp rename to frameworks/inner_api/code_sign_attr_utils/src/ownerid_utils.cpp diff --git a/interfaces/innerkits/code_sign_utils/BUILD.gn b/frameworks/inner_api/code_sign_utils/BUILD.gn similarity index 96% rename from interfaces/innerkits/code_sign_utils/BUILD.gn rename to frameworks/inner_api/code_sign_utils/BUILD.gn index 2388b49d18515b96f4cdb2c586a98d36b483f04d..124aba193a248eefcf9e7ebdb8f450aea9a508e9 100644 --- a/interfaces/innerkits/code_sign_utils/BUILD.gn +++ b/frameworks/inner_api/code_sign_utils/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("../../../code_signature.gni") config("public_code_sign_utils_configs") { - include_dirs = [ "include" ] + include_dirs = [ "${code_signature_inner_api_dir}/code_sign_utils/include" ] } ohos_shared_library("libcode_sign_utils") { diff --git a/interfaces/innerkits/code_sign_utils/libcode_sign_utils.versionscript b/frameworks/inner_api/code_sign_utils/libcode_sign_utils.versionscript similarity index 100% rename from interfaces/innerkits/code_sign_utils/libcode_sign_utils.versionscript rename to frameworks/inner_api/code_sign_utils/libcode_sign_utils.versionscript diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_enable_multi_task.cpp b/frameworks/inner_api/code_sign_utils/src/code_sign_enable_multi_task.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_enable_multi_task.cpp rename to frameworks/inner_api/code_sign_utils/src/code_sign_enable_multi_task.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_helper.cpp b/frameworks/inner_api/code_sign_utils/src/code_sign_helper.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_helper.cpp rename to frameworks/inner_api/code_sign_utils/src/code_sign_helper.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp b/frameworks/inner_api/code_sign_utils/src/code_sign_utils.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_utils.cpp rename to frameworks/inner_api/code_sign_utils/src/code_sign_utils.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/code_sign_utils_in_c.cpp b/frameworks/inner_api/code_sign_utils/src/code_sign_utils_in_c.cpp similarity index 100% rename from interfaces/innerkits/code_sign_utils/src/code_sign_utils_in_c.cpp rename to frameworks/inner_api/code_sign_utils/src/code_sign_utils_in_c.cpp diff --git a/interfaces/innerkits/code_sign_utils/src/stat_utils.cpp b/frameworks/inner_api/code_sign_utils/src/stat_utils.cpp similarity index 91% rename from interfaces/innerkits/code_sign_utils/src/stat_utils.cpp rename to frameworks/inner_api/code_sign_utils/src/stat_utils.cpp index 3ec110a480ea289d1d85906b0840100c83d55e48..13beafefb4bff37c162229a3db73399031584dc0 100644 --- a/interfaces/innerkits/code_sign_utils/src/stat_utils.cpp +++ b/frameworks/inner_api/code_sign_utils/src/stat_utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/jit_code_sign/BUILD.gn b/frameworks/inner_api/jit_code_sign/BUILD.gn similarity index 96% rename from interfaces/innerkits/jit_code_sign/BUILD.gn rename to frameworks/inner_api/jit_code_sign/BUILD.gn index 2a28441dfe112a38f2e0f8dd0d31937e918ddf3d..00ea0d1fd3dac20005d910c9e5b2260b88fe2f6d 100644 --- a/interfaces/innerkits/jit_code_sign/BUILD.gn +++ b/frameworks/inner_api/jit_code_sign/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("../../../code_signature.gni") config("public_jit_code_sign_configs") { - include_dirs = [ "include" ] + include_dirs = [ "${code_signature_inner_api_dir}/jit_code_sign/include" ] } config("private_jit_code_sign_configs") { diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp b/frameworks/inner_api/jit_code_sign/src/jit_code_signer_base.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_base.cpp rename to frameworks/inner_api/jit_code_sign/src/jit_code_signer_base.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_factory.cpp b/frameworks/inner_api/jit_code_sign/src/jit_code_signer_factory.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_factory.cpp rename to frameworks/inner_api/jit_code_sign/src/jit_code_signer_factory.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp b/frameworks/inner_api/jit_code_sign/src/jit_code_signer_hybrid.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_hybrid.cpp rename to frameworks/inner_api/jit_code_sign/src/jit_code_signer_hybrid.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp b/frameworks/inner_api/jit_code_sign/src/jit_code_signer_single.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/jit_code_signer_single.cpp rename to frameworks/inner_api/jit_code_sign/src/jit_code_signer_single.cpp diff --git a/interfaces/innerkits/jit_code_sign/src/pac_sign_ctx.cpp b/frameworks/inner_api/jit_code_sign/src/pac_sign_ctx.cpp similarity index 100% rename from interfaces/innerkits/jit_code_sign/src/pac_sign_ctx.cpp rename to frameworks/inner_api/jit_code_sign/src/pac_sign_ctx.cpp diff --git a/interfaces/innerkits/local_code_sign/BUILD.gn b/frameworks/inner_api/local_code_sign/BUILD.gn similarity index 96% rename from interfaces/innerkits/local_code_sign/BUILD.gn rename to frameworks/inner_api/local_code_sign/BUILD.gn index fb7c66c4c51b4a4082839a9e350fdf719252c7bc..d57c8e6766712a6d361826420eaadd5fa94015ca 100644 --- a/interfaces/innerkits/local_code_sign/BUILD.gn +++ b/frameworks/inner_api/local_code_sign/BUILD.gn @@ -15,7 +15,7 @@ import("//build/ohos.gni") import("../../../code_signature.gni") config("public_local_code_sign_configs") { - include_dirs = [ "include" ] + include_dirs = [ "${code_signature_inner_api_dir}/local_code_sign/include" ] } ohos_shared_library("liblocal_code_sign_sdk") { diff --git a/interfaces/innerkits/local_code_sign/liblocal_code_sign_sdk.versionscript b/frameworks/inner_api/local_code_sign/liblocal_code_sign_sdk.versionscript similarity index 100% rename from interfaces/innerkits/local_code_sign/liblocal_code_sign_sdk.versionscript rename to frameworks/inner_api/local_code_sign/liblocal_code_sign_sdk.versionscript diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp b/frameworks/inner_api/local_code_sign/src/local_code_sign_client.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_client.cpp rename to frameworks/inner_api/local_code_sign/src/local_code_sign_client.cpp diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_kit.cpp b/frameworks/inner_api/local_code_sign/src/local_code_sign_kit.cpp similarity index 93% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_kit.cpp rename to frameworks/inner_api/local_code_sign/src/local_code_sign_kit.cpp index 51074fa2476fe3f9db6987de667f9e6546f10392..f014e4a4a1c638e57199c1d887ff94c5dd40f7af 100644 --- a/interfaces/innerkits/local_code_sign/src/local_code_sign_kit.cpp +++ b/frameworks/inner_api/local_code_sign/src/local_code_sign_kit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_load_callback.cpp b/frameworks/inner_api/local_code_sign/src/local_code_sign_load_callback.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_load_callback.cpp rename to frameworks/inner_api/local_code_sign/src/local_code_sign_load_callback.cpp diff --git a/interfaces/innerkits/local_code_sign/src/local_code_sign_proxy.cpp b/frameworks/inner_api/local_code_sign/src/local_code_sign_proxy.cpp similarity index 100% rename from interfaces/innerkits/local_code_sign/src/local_code_sign_proxy.cpp rename to frameworks/inner_api/local_code_sign/src/local_code_sign_proxy.cpp diff --git a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h b/interfaces/inner_api/code_sign_attr_utils/include/code_sign_attr_utils.h similarity index 97% rename from interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h rename to interfaces/inner_api/code_sign_attr_utils/include/code_sign_attr_utils.h index 5e54a34cbf045ac056499d49d858010445e8ad0c..a4cb2cc9e96c3b073af3704921ac2f18de9a0f93 100755 --- a/interfaces/innerkits/code_sign_attr_utils/include/code_sign_attr_utils.h +++ b/interfaces/inner_api/code_sign_attr_utils/include/code_sign_attr_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/code_sign_attr_utils/include/ownerid_utils.h b/interfaces/inner_api/code_sign_attr_utils/include/ownerid_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_attr_utils/include/ownerid_utils.h rename to interfaces/inner_api/code_sign_attr_utils/include/ownerid_utils.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_enable_multi_task.h b/interfaces/inner_api/code_sign_utils/include/code_sign_enable_multi_task.h similarity index 95% rename from interfaces/innerkits/code_sign_utils/include/code_sign_enable_multi_task.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_enable_multi_task.h index 46f504a05051fefe01bb1d8c64281431d8704777..0f68392fe0a8479c67bf3d610d9542db9b415460 100644 --- a/interfaces/innerkits/code_sign_utils/include/code_sign_enable_multi_task.h +++ b/interfaces/inner_api/code_sign_utils/include/code_sign_enable_multi_task.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_helper.h b/interfaces/inner_api/code_sign_utils/include/code_sign_helper.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_helper.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_helper.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_utils.h b/interfaces/inner_api/code_sign_utils/include/code_sign_utils.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_utils.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_utils.h diff --git a/interfaces/innerkits/code_sign_utils/include/code_sign_utils_in_c.h b/interfaces/inner_api/code_sign_utils/include/code_sign_utils_in_c.h similarity index 100% rename from interfaces/innerkits/code_sign_utils/include/code_sign_utils_in_c.h rename to interfaces/inner_api/code_sign_utils/include/code_sign_utils_in_c.h diff --git a/interfaces/innerkits/code_sign_utils/include/constants.h b/interfaces/inner_api/code_sign_utils/include/constants.h similarity index 92% rename from interfaces/innerkits/code_sign_utils/include/constants.h rename to interfaces/inner_api/code_sign_utils/include/constants.h index 2ab6d21d263b549c83c0d10e5df07f10076ef1ea..91a08bbc85349b50ffe400ae401987b574df48b9 100644 --- a/interfaces/innerkits/code_sign_utils/include/constants.h +++ b/interfaces/inner_api/code_sign_utils/include/constants.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/code_sign_utils/include/stat_utils.h b/interfaces/inner_api/code_sign_utils/include/stat_utils.h similarity index 91% rename from interfaces/innerkits/code_sign_utils/include/stat_utils.h rename to interfaces/inner_api/code_sign_utils/include/stat_utils.h index 263fad93f4711c941ec178d2d14e3ec38e3cbab7..4560121bbe82eb949112a002175599753cd7ff9d 100644 --- a/interfaces/innerkits/code_sign_utils/include/stat_utils.h +++ b/interfaces/inner_api/code_sign_utils/include/stat_utils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/common/include/byte_buffer.h b/interfaces/inner_api/common/include/byte_buffer.h similarity index 100% rename from interfaces/innerkits/common/include/byte_buffer.h rename to interfaces/inner_api/common/include/byte_buffer.h diff --git a/interfaces/innerkits/common/include/errcode.h b/interfaces/inner_api/common/include/errcode.h similarity index 100% rename from interfaces/innerkits/common/include/errcode.h rename to interfaces/inner_api/common/include/errcode.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h b/interfaces/inner_api/jit_code_sign/include/jit_buffer_integrity.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_buffer_integrity.h rename to interfaces/inner_api/jit_code_sign/include/jit_buffer_integrity.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_base.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_base.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_base.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_factory.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_factory.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_factory.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_factory.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_hybrid.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_hybrid.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_hybrid.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_hybrid.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_code_signer_single.h b/interfaces/inner_api/jit_code_sign/include/jit_code_signer_single.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_code_signer_single.h rename to interfaces/inner_api/jit_code_sign/include/jit_code_signer_single.h diff --git a/interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h b/interfaces/inner_api/jit_code_sign/include/jit_fort_helper.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/jit_fort_helper.h rename to interfaces/inner_api/jit_code_sign/include/jit_fort_helper.h diff --git a/interfaces/innerkits/jit_code_sign/include/pac_sign_ctx.h b/interfaces/inner_api/jit_code_sign/include/pac_sign_ctx.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/pac_sign_ctx.h rename to interfaces/inner_api/jit_code_sign/include/pac_sign_ctx.h diff --git a/interfaces/innerkits/jit_code_sign/include/random_helper.h b/interfaces/inner_api/jit_code_sign/include/random_helper.h similarity index 100% rename from interfaces/innerkits/jit_code_sign/include/random_helper.h rename to interfaces/inner_api/jit_code_sign/include/random_helper.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_client.h similarity index 94% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_client.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_client.h index b5552e0232c5b3da363acf6eb30298790fea0b19..1d86183cae2d6d73557285ab4b044cd8dfbeae90 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_client.h +++ b/interfaces/inner_api/local_code_sign/include/local_code_sign_client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_interface.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_interface.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_interface.h diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_ipc_interface_code.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_ipc_interface_code.h similarity index 91% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_ipc_interface_code.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_ipc_interface_code.h index 7ae63d48af211e6ab106568bcee9d8fb5109119b..c405034dd49b03fa7cd1d4e809640d42b96db860 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_ipc_interface_code.h +++ b/interfaces/inner_api/local_code_sign/include/local_code_sign_ipc_interface_code.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_kit.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_kit.h similarity index 94% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_kit.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_kit.h index c19181d15157d393abb6d1dea5269019af7d825f..8d43e7faadf67ca86c55f4d6e9cfcebed2a51623 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_kit.h +++ b/interfaces/inner_api/local_code_sign/include/local_code_sign_kit.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_load_callback.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_load_callback.h similarity index 92% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_load_callback.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_load_callback.h index 8d85671f40a917342a847b066b5849652896658d..826f8f9537b7c93ca119af7008334690be2a7905 100644 --- a/interfaces/innerkits/local_code_sign/include/local_code_sign_load_callback.h +++ b/interfaces/inner_api/local_code_sign/include/local_code_sign_load_callback.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h b/interfaces/inner_api/local_code_sign/include/local_code_sign_proxy.h similarity index 100% rename from interfaces/innerkits/local_code_sign/include/local_code_sign_proxy.h rename to interfaces/inner_api/local_code_sign/include/local_code_sign_proxy.h diff --git a/services/key_enable/utils/BUILD.gn b/services/key_enable/utils/BUILD.gn index 68fad0fbc50811978032c3152278584e8712278e..f084b59b2f56027fc832d1e193fcdf352ecc49f6 100644 --- a/services/key_enable/utils/BUILD.gn +++ b/services/key_enable/utils/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2024 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -24,10 +24,10 @@ ohos_static_library("libkey_enable_utils") { ] include_dirs = [ "include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk" ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] configs = [ "${code_signature_root_dir}:common_utils_config" ] diff --git a/services/local_code_sign/BUILD.gn b/services/local_code_sign/BUILD.gn index 1672a9df91a3554169862aa38ec8b7732f4b1aea..6a4eb3ee704f2185e4424fcf06a6a029569168b4 100644 --- a/services/local_code_sign/BUILD.gn +++ b/services/local_code_sign/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("liblocal_code_sign") { ] include_dirs = [ "include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] shlib_type = "sa" diff --git a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn index 3d6b295a1ceb6c5b563acbf6ddafc4562677eeb6..e9e01c8c9e80e71125d4334b9b21e3bdc32ec786 100644 --- a/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn +++ b/test/fuzztest/local_code_sign_stub/initlocalcertificatestub_fuzzer/BUILD.gn @@ -26,10 +26,10 @@ ohos_fuzztest("InitLocalCertificateStubFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", ] external_deps = [ @@ -47,7 +47,7 @@ ohos_fuzztest("InitLocalCertificateStubFuzzTest") { ] include_dirs += [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] diff --git a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn index e3043d66516aafe68e37b34f15ccf123db8e1bd3..1ac58b93b66baea181a79187446ca7f0e8a5efb0 100644 --- a/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn +++ b/test/fuzztest/local_code_sign_stub/signlocalcodestub_fuzzer/BUILD.gn @@ -26,10 +26,10 @@ ohos_fuzztest("SignLocalCodeStubFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", ] external_deps = [ @@ -47,7 +47,7 @@ ohos_fuzztest("SignLocalCodeStubFuzzTest") { ] include_dirs += [ - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/utils/include", ] public_configs = [ "${code_signature_root_dir}:common_public_config" ] diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 3da8fb1a3649bc43f5fc39cbc309bbd2b5e7a38e..5c179a3615b727f9538cba15b0750bc5aaa9886e 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -61,7 +61,7 @@ ohos_unittest("code_sign_utils_unittest") { deps = [ ":key_enable_src_set", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils", ] defines = [] @@ -74,7 +74,7 @@ ohos_unittest("code_sign_utils_unittest") { include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", "${code_signature_root_dir}/utils/include", ] @@ -89,11 +89,11 @@ ohos_unittest("code_sign_attr_utils_unittest") { module_out_path = "security/code_signature" sources = [ "code_sign_attr_utils_test.cpp" ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/code_sign_attr_utils:libcode_sign_attr_utils" ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/common/include", + "${code_signature_root_dir}/interfaces/inner_api/common/include", "${code_signature_root_dir}/utils/include", ] @@ -108,10 +108,10 @@ ohos_unittest("code_sign_utils_in_c_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "code_sign_utils_in_c_test.cpp" ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", "${code_signature_root_dir}/utils/include", ] @@ -132,15 +132,15 @@ ohos_unittest("local_code_sign_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "local_code_sign_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -166,7 +166,7 @@ ohos_unittest("local_code_sign_utils_unittest") { "mock/src/hks_api.cpp", "mock/src/hks_api_mock_helper.cpp", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ "mock/include", @@ -195,7 +195,7 @@ ohos_unittest("local_code_sign_utils_mock_unittest") { "mock/src/hks_api_mock_helper.cpp", "mock/src/hks_api_mock_test.cpp", ] - deps = [ "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils" ] + deps = [ "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils" ] include_dirs = [ "mock/include", @@ -220,15 +220,15 @@ ohos_unittest("sign_and_enforce_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "sign_and_enforce_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -249,15 +249,15 @@ ohos_unittest("multi_thread_local_sign_unittest") { resource_config_file = "resources/ohos_test.xml" sources = [ "multi_thread_local_sign_test.cpp" ] deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils:libcode_sign_utils", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign:liblocal_code_sign_sdk", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_utils:libcode_sign_utils", + "${code_signature_root_dir}/frameworks/inner_api/local_code_sign:liblocal_code_sign_sdk", ] include_dirs = [ "utils/include", - "${code_signature_root_dir}/interfaces/innerkits/local_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/local_code_sign/include", "${code_signature_root_dir}/services/local_code_sign/include", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_utils/include", + "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils/include", ] configs = [ "${code_signature_root_dir}:common_utils_config" ] external_deps = [ @@ -330,7 +330,7 @@ ohos_unittest("enable_verity_ioctl_unittest") { ] deps = [ ":key_enable_src_set", - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", "${selinux_dir}:libselinux", ] external_deps = [ @@ -342,7 +342,7 @@ ohos_unittest("enable_verity_ioctl_unittest") { ohos_unittest("jit_code_sign_unittest") { module_out_path = "security/code_signature" include_dirs = [ - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign/include", + "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign/include", ] sources = [ "jit_code_sign_test.cpp" ] sanitize = { @@ -351,8 +351,8 @@ ohos_unittest("jit_code_sign_unittest") { debug = false } deps = [ - "${code_signature_root_dir}/interfaces/innerkits/code_sign_attr_utils:libcode_sign_attr_utils", - "${code_signature_root_dir}/interfaces/innerkits/jit_code_sign:libjit_code_sign", + "${code_signature_root_dir}/frameworks/inner_api/code_sign_attr_utils:libcode_sign_attr_utils", + "${code_signature_root_dir}/frameworks/inner_api/jit_code_sign:libjit_code_sign", ] external_deps = [ "c_utils:utils",