diff --git a/bundle.json b/bundle.json index 568201c..8f6a233 100644 --- a/bundle.json +++ b/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" } } ], diff --git a/frameworks/common/common.gni b/frameworks/common/common.gni index 80e3f5b..b491844 100644 --- a/frameworks/common/common.gni +++ b/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", ] diff --git a/frameworks/core/BUILD.gn b/frameworks/core/BUILD.gn index 683bd1e..2852c56 100644 --- a/frameworks/core/BUILD.gn +++ b/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", ] } diff --git a/interfaces/innerkits/certificate/cert_chain_validator.h b/interfaces/inner_api/certificate/cert_chain_validator.h similarity index 100% rename from interfaces/innerkits/certificate/cert_chain_validator.h rename to interfaces/inner_api/certificate/cert_chain_validator.h diff --git a/interfaces/innerkits/certificate/cert_crl_collection.h b/interfaces/inner_api/certificate/cert_crl_collection.h similarity index 100% rename from interfaces/innerkits/certificate/cert_crl_collection.h rename to interfaces/inner_api/certificate/cert_crl_collection.h diff --git a/interfaces/innerkits/certificate/cert_crl_common.h b/interfaces/inner_api/certificate/cert_crl_common.h similarity index 100% rename from interfaces/innerkits/certificate/cert_crl_common.h rename to interfaces/inner_api/certificate/cert_crl_common.h diff --git a/interfaces/innerkits/certificate/certificate.h b/interfaces/inner_api/certificate/certificate.h similarity index 100% rename from interfaces/innerkits/certificate/certificate.h rename to interfaces/inner_api/certificate/certificate.h diff --git a/interfaces/innerkits/certificate/crl.h b/interfaces/inner_api/certificate/crl.h similarity index 100% rename from interfaces/innerkits/certificate/crl.h rename to interfaces/inner_api/certificate/crl.h diff --git a/interfaces/innerkits/certificate/x509_cert_chain.h b/interfaces/inner_api/certificate/x509_cert_chain.h similarity index 100% rename from interfaces/innerkits/certificate/x509_cert_chain.h rename to interfaces/inner_api/certificate/x509_cert_chain.h diff --git a/interfaces/innerkits/certificate/x509_cert_chain_validate_params.h b/interfaces/inner_api/certificate/x509_cert_chain_validate_params.h similarity index 100% rename from interfaces/innerkits/certificate/x509_cert_chain_validate_params.h rename to interfaces/inner_api/certificate/x509_cert_chain_validate_params.h diff --git a/interfaces/innerkits/certificate/x509_cert_chain_validate_result.h b/interfaces/inner_api/certificate/x509_cert_chain_validate_result.h similarity index 100% rename from interfaces/innerkits/certificate/x509_cert_chain_validate_result.h rename to interfaces/inner_api/certificate/x509_cert_chain_validate_result.h diff --git a/interfaces/innerkits/certificate/x509_cert_match_parameters.h b/interfaces/inner_api/certificate/x509_cert_match_parameters.h similarity index 100% rename from interfaces/innerkits/certificate/x509_cert_match_parameters.h rename to interfaces/inner_api/certificate/x509_cert_match_parameters.h diff --git a/interfaces/innerkits/certificate/x509_certificate.h b/interfaces/inner_api/certificate/x509_certificate.h similarity index 100% rename from interfaces/innerkits/certificate/x509_certificate.h rename to interfaces/inner_api/certificate/x509_certificate.h diff --git a/interfaces/innerkits/certificate/x509_crl.h b/interfaces/inner_api/certificate/x509_crl.h similarity index 100% rename from interfaces/innerkits/certificate/x509_crl.h rename to interfaces/inner_api/certificate/x509_crl.h diff --git a/interfaces/innerkits/certificate/x509_crl_entry.h b/interfaces/inner_api/certificate/x509_crl_entry.h similarity index 100% rename from interfaces/innerkits/certificate/x509_crl_entry.h rename to interfaces/inner_api/certificate/x509_crl_entry.h diff --git a/interfaces/innerkits/certificate/x509_crl_match_parameters.h b/interfaces/inner_api/certificate/x509_crl_match_parameters.h similarity index 100% rename from interfaces/innerkits/certificate/x509_crl_match_parameters.h rename to interfaces/inner_api/certificate/x509_crl_match_parameters.h diff --git a/interfaces/innerkits/certificate/x509_distinguished_name.h b/interfaces/inner_api/certificate/x509_distinguished_name.h similarity index 100% rename from interfaces/innerkits/certificate/x509_distinguished_name.h rename to interfaces/inner_api/certificate/x509_distinguished_name.h diff --git a/interfaces/innerkits/certificate/x509_trust_anchor.h b/interfaces/inner_api/certificate/x509_trust_anchor.h similarity index 100% rename from interfaces/innerkits/certificate/x509_trust_anchor.h rename to interfaces/inner_api/certificate/x509_trust_anchor.h diff --git a/interfaces/innerkits/common/cf_blob.h b/interfaces/inner_api/common/cf_blob.h similarity index 100% rename from interfaces/innerkits/common/cf_blob.h rename to interfaces/inner_api/common/cf_blob.h diff --git a/interfaces/innerkits/common/cf_object_base.h b/interfaces/inner_api/common/cf_object_base.h similarity index 100% rename from interfaces/innerkits/common/cf_object_base.h rename to interfaces/inner_api/common/cf_object_base.h diff --git a/interfaces/innerkits/common/cf_result.h b/interfaces/inner_api/common/cf_result.h similarity index 100% rename from interfaces/innerkits/common/cf_result.h rename to interfaces/inner_api/common/cf_result.h diff --git a/interfaces/innerkits/include/cf_api.h b/interfaces/inner_api/include/cf_api.h similarity index 100% rename from interfaces/innerkits/include/cf_api.h rename to interfaces/inner_api/include/cf_api.h diff --git a/interfaces/innerkits/include/cf_param.h b/interfaces/inner_api/include/cf_param.h similarity index 100% rename from interfaces/innerkits/include/cf_param.h rename to interfaces/inner_api/include/cf_param.h diff --git a/interfaces/innerkits/include/cf_type.h b/interfaces/inner_api/include/cf_type.h similarity index 100% rename from interfaces/innerkits/include/cf_type.h rename to interfaces/inner_api/include/cf_type.h diff --git a/test/fuzztest/cfcreate_fuzzer/BUILD.gn b/test/fuzztest/cfcreate_fuzzer/BUILD.gn index 12ac56c..19ab1e1 100644 --- a/test/fuzztest/cfcreate_fuzzer/BUILD.gn +++ b/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 = [ diff --git a/test/fuzztest/cfgetandcheck_fuzzer/BUILD.gn b/test/fuzztest/cfgetandcheck_fuzzer/BUILD.gn index 0b53caf..77e0375 100644 --- a/test/fuzztest/cfgetandcheck_fuzzer/BUILD.gn +++ b/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", ] -} \ No newline at end of file +} diff --git a/test/fuzztest/cfparam_fuzzer/BUILD.gn b/test/fuzztest/cfparam_fuzzer/BUILD.gn index 41e1fcc..7f8fa48 100644 --- a/test/fuzztest/cfparam_fuzzer/BUILD.gn +++ b/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", ] diff --git a/test/fuzztest/v1.0/x509certchain_fuzzer/BUILD.gn b/test/fuzztest/v1.0/x509certchain_fuzzer/BUILD.gn index 513c4bc..f386d4a 100644 --- a/test/fuzztest/v1.0/x509certchain_fuzzer/BUILD.gn +++ b/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", diff --git a/test/unittest/v1.0/BUILD.gn b/test/unittest/v1.0/BUILD.gn index 01cb541..a2f2fef 100644 --- a/test/unittest/v1.0/BUILD.gn +++ b/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",