support sa sdk reform

Signed-off-by: fundavid <fangjiawei8@huawei.com>

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}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils",
+    "${code_signature_root_dir}/interfaces/inner_api/code_sign_utils:libcode_sign_utils",
+    "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign:libjit_code_sign",
+    "${code_signature_root_dir}/interfaces/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",
   ]

README.md

@@ -20,7 +20,7 @@ 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

README_zh.md

@@ -21,7 +21,7 @@
 ```
 /base/security/code_signature
 ├── interfaces                   # 接口层
-│   └── innerkits                #
+│   └── inner_api                #
 │       ├── code_sign_attr_utils # 属性设置接口
 │       ├── code_sign_utils      # 使能接口
 │       ├── common               # 公共基础能力

bundle.json

@@ -56,31 +56,43 @@
       ],
       "inner_kits": [
         {
-          "name" : "//base/security/code_signature/interfaces/innerkits/code_sign_utils:libcode_sign_utils",
+          "name" : "//base/security/code_signature/interfaces/inner_api/code_sign_utils:libcode_sign_utils",
           "header": {
-            "header_files": [],
-            "header_base": "//base/security/code_signature/interfaces/innerkits/code_sign_utils/include"
+            "header_files": [
+              "code_sign_utils.h",
+              "code_sign_utils_in_c.h"
+            ],
+            "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/interfaces/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_files": [
+              "local_code_sign_kit.h"
+            ],
+            "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/interfaces/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_files": [
+              "code_sign_attr_utils.h"
+            ],
+            "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/interfaces/inner_api/jit_code_sign:libjit_code_sign",
           "header": {
-            "header_files": [],
-            "header_base": "//base/security/code_signature/interfaces/innerkits/jit_code_sign/include"
+            "header_files": [
+              "jit_buffer_integrity.h",
+              "jit_code_signer_base.h",
+              "jit_code_signer_factory.h",
+              "jit_fort_helper.h"
+            ],
+            "header_base": "//base/security/code_signature/interfaces/inner_api/jit_code_sign/include"
           }
         }
       ],

services/key_enable/utils/BUILD.gn

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

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"

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}/interfaces/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" ]

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}/interfaces/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" ]

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}/interfaces/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}/interfaces/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}/interfaces/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}/interfaces/inner_api/code_sign_utils:libcode_sign_utils",
+    "${code_signature_root_dir}/interfaces/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}/interfaces/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}/interfaces/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}/interfaces/inner_api/code_sign_utils:libcode_sign_utils",
+    "${code_signature_root_dir}/interfaces/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}/interfaces/inner_api/code_sign_utils:libcode_sign_utils",
+    "${code_signature_root_dir}/interfaces/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}/interfaces/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}/interfaces/inner_api/code_sign_attr_utils:libcode_sign_attr_utils",
+    "${code_signature_root_dir}/interfaces/inner_api/jit_code_sign:libjit_code_sign",
   ]
   external_deps = [
     "c_utils:utils",