SASDK规范整改

Signed-off-by: 王静 <wangjing561@huawei.com>

bundle.json

@@ -47,6 +47,7 @@
                 "certificate/x509_crl_match_parameters.h",
                 "certificate/x509_certificate.h",
                 "certificate/x509_cert_chain.h",
+                "certificate/x509_distinguished_name.h",
                 "certificate/x509_trust_anchor.h",
                 "certificate/x509_cert_chain_validate_params.h",
                 "certificate/x509_cert_chain_validate_result.h",
@@ -60,7 +61,7 @@
                 "include/cf_param.h",
                 "include/cf_type.h"
               ],
-              "header_base": "//base/security/certificate_framework/interfaces/innerkits"
+              "header_base": "//base/security/certificate_framework/interfaces/inner_api"
             }
           }
         ],

frameworks/common/common.gni

@@ -12,9 +12,9 @@
 # limitations under the License.
 
 crypto_framwork_common_inc_path = [
-  "../../interfaces/innerkits/certificate",
-  "../../interfaces/innerkits/common",
-  "../../interfaces/innerkits/include",
+  "../../interfaces/inner_api/certificate",
+  "../../interfaces/inner_api/common",
+  "../../interfaces/inner_api/include",
   "v1.0/inc",
 ]
 

frameworks/core/BUILD.gn

@@ -15,9 +15,9 @@ import("//build/ohos.gni")
 
 config("cert_framework_config") {
   include_dirs = [
-    "../../interfaces/innerkits/certificate",
-    "../../interfaces/innerkits/common",
-    "../../interfaces/innerkits/include",
+    "../../interfaces/inner_api/certificate",
+    "../../interfaces/inner_api/common",
+    "../../interfaces/inner_api/include",
   ]
 }
 

test/fuzztest/cfcreate_fuzzer/BUILD.gn

@@ -23,8 +23,8 @@ ohos_fuzztest("CfCreateFuzzTest") {
   include_dirs = [
     "include",
     "../../../frameworks/common/v1.0/inc",
-    "../../../interfaces/innerkits/common",
-    "../../../interfaces/innerkits/include",
+    "../../../interfaces/inner_api/common",
+    "../../../interfaces/inner_api/include",
   ]
   configs = [ "../../../config/build:coverage_flag_cc" ]
   cflags = [

test/fuzztest/cfgetandcheck_fuzzer/BUILD.gn

@@ -22,8 +22,8 @@ ohos_fuzztest("CfGetAndCheckFuzzTest") {
   fuzz_config_file = "../../../test/fuzztest/cfgetandcheck_fuzzer"
   include_dirs = [
     "include",
-    "../../../interfaces/innerkits/common",
-    "../../../interfaces/innerkits/include",
+    "../../../interfaces/inner_api/common",
+    "../../../interfaces/inner_api/include",
     "../../../frameworks/common/v1.0/inc",
     "../../../test/unittest/common/include",
   ]
@@ -54,4 +54,4 @@ group("fuzztest") {
     # deps file
     ":CfGetAndCheckFuzzTest",
   ]
-}
+}

test/fuzztest/cfparam_fuzzer/BUILD.gn

@@ -22,8 +22,8 @@ ohos_fuzztest("CfParamFuzzTest") {
   fuzz_config_file = "../../../test/fuzztest/cfparam_fuzzer"
   include_dirs = [
     "include",
-    "../../../interfaces/innerkits/common",
-    "../../../interfaces/innerkits/include",
+    "../../../interfaces/inner_api/common",
+    "../../../interfaces/inner_api/include",
     "../../../frameworks/common/v1.0/inc",
     "../../../test/unittest/common/include",
   ]

test/fuzztest/v1.0/x509certchain_fuzzer/BUILD.gn

@@ -23,8 +23,8 @@ ohos_fuzztest("X509CertChainFuzzTest") {
   configs = [ "../../../../config/build:coverage_flag_cc" ]
   include_dirs = [
     "include",
-    "../../../../interfaces/innerkits/certificate",
-    "../../../../interfaces/innerkits/common",
+    "../../../../interfaces/inner_api/certificate",
+    "../../../../interfaces/inner_api/common",
     "../../../../frameworks/common/v1.0/inc",
     "../../../../frameworks/core/v1.0/spi",
     "../../../../frameworks/adapter/v1.0/inc",

test/unittest/v1.0/BUILD.gn

@@ -25,9 +25,9 @@ ohos_unittest("cf_version1_test") {
 
   include_dirs = [
     "./include",
-    "../../../interfaces/innerkits/certificate",
-    "../../../interfaces/innerkits/common",
-    "../../../interfaces/innerkits/include",
+    "../../../interfaces/inner_api/certificate",
+    "../../../interfaces/inner_api/common",
+    "../../../interfaces/inner_api/include",
     "../../../frameworks/common/v1.0/inc",
     "../../../frameworks/core/v1.0/spi",
     "../../../frameworks/adapter/v1.0/inc",