diff --git a/bundle.json b/bundle.json index df299919c7e108712ad6d0128f65e6c788d71a91..38c19be35d97c917467edb307d3a47bf5165b5e6 100644 --- a/bundle.json +++ b/bundle.json @@ -16,7 +16,7 @@ "component": { "name": "certificate_manager", "subsystem": "security", - "syscap": [ "SystemCapability.Security.CertificateManager" ], + "syscap": [ "SystemCapability.Security.CertificateManagerDialog, SystemCapability.Security.CertificateManager" ], "features": [ "certificate_manager_deps_huks_enabled", "certificate_manager_feature_ca_enabled", @@ -74,7 +74,8 @@ "name": "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", "header": { "header_files": [ - "cert_manager_api.h" + "cert_manager_api.h", + "cm_type.h" ], "header_base": "//base/security/certificate_manager/interfaces/innerkits/cert_manager_standard/main/include" } diff --git a/cert_manager.gni b/cert_manager.gni index 3ea04e460099705416638af0168c348174d47101..b4c913a474d32bc6b1b05376a16eac768293b1ee 100644 --- a/cert_manager.gni +++ b/cert_manager.gni @@ -13,6 +13,7 @@ use_crypto_lib = "openssl" non_rwlock_support = false +cert_manager_root_dir = "//base/security/certificate_manager" declare_args() { # depend on the definition of huks security level in base/security/huks/build/config.gni diff --git a/frameworks/cert_manager_standard/main/common/BUILD.gn b/frameworks/cert_manager_standard/main/common/BUILD.gn index 3ab84be2efca4c6b37bffc85488f475f49bf6ae3..bcafd629c5c485b170deda1ef3bed908b32b75e8 100644 --- a/frameworks/cert_manager_standard/main/common/BUILD.gn +++ b/frameworks/cert_manager_standard/main/common/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -29,16 +30,11 @@ ohos_static_library("libcert_manager_common_standard_static") { integer_overflow = true ubsan = true } - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] + public_configs = [ ":cert_manager_config" ] # Share include files for other gn when deps. - include_dirs = - [ "../../../../interfaces/innerkits/cert_manager_standard/main/include" ] - + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "src/cm_advsecmode_check.c", "src/cm_param.c", @@ -53,10 +49,6 @@ ohos_static_library("libcert_manager_common_standard_static") { "init:libbegetutil", "openssl:libcrypto_shared", ] - cflags = [ - "-DHILOG_ENABLE", - "-Wall", - "-Werror", - ] + complete_static_lib = true } diff --git a/frameworks/cert_manager_standard/main/common/include/cm_log.h b/frameworks/cert_manager_standard/main/common/include/cm_log.h index a1df0daa3f01d6cf09f56149b93f7bb81cd6883d..0b591ef6b531b49333e5a9f2e3bda48b60f05983 100644 --- a/frameworks/cert_manager_standard/main/common/include/cm_log.h +++ b/frameworks/cert_manager_standard/main/common/include/cm_log.h @@ -22,12 +22,10 @@ extern "C" { #endif -#ifdef _CM_LOG_ENABLE_ #undef LOG_TAG #define LOG_TAG "CertManager" #undef LOG_DOMAIN #define LOG_DOMAIN 0xD002F09 /* CertManager's domain id */ -#endif enum CmLogLevel { CM_LOG_LEVEL_I, @@ -36,19 +34,12 @@ enum CmLogLevel { CM_LOG_LEVEL_D, }; -#ifdef _CM_LOG_ENABLE_ void CmLog(uint32_t logLevel, const char *funcName, uint32_t lineNo, const char *format, ...); #define CM_LOG_I(...) CmLog(CM_LOG_LEVEL_I, __func__, __LINE__, __VA_ARGS__) #define CM_LOG_W(...) CmLog(CM_LOG_LEVEL_W, __func__, __LINE__, __VA_ARGS__) #define CM_LOG_E(...) CmLog(CM_LOG_LEVEL_E, __func__, __LINE__, __VA_ARGS__) #define CM_LOG_D(...) CmLog(CM_LOG_LEVEL_D, __func__, __LINE__, __VA_ARGS__) -#else -#define CM_LOG_I(...) -#define CM_LOG_W(...) -#define CM_LOG_E(...) -#define CM_LOG_D(...) -#endif #ifdef __cplusplus } diff --git a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn index 75b2cceb91c91d296ce20f0d0256eb06db664100..ffb8c4114be2469326014b01ff958496f75c2423 100644 --- a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn +++ b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn @@ -11,16 +11,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") -config("cert_manager_log_mem_config") { - include_dirs = [ "../common/include" ] -} - ohos_static_library("libcert_manager_log_mem_static") { subsystem_name = "security" part_name = "certificate_manager" - public_configs = [ ":cert_manager_log_mem_config" ] branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -30,26 +26,19 @@ ohos_static_library("libcert_manager_log_mem_static") { integer_overflow = true ubsan = true } - include_dirs = - [ "../../../../interfaces/innerkits/cert_manager_standard/main/include" ] - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] + sources = [ "./log/cm_log.c", "./posix/cm_mem.c", ] + deps = [ "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static" ] external_deps = [ "c_utils:utils", "hilog:libhilog", ] - cflags = [ - "-DHILOG_ENABLE", - "-Wall", - "-Werror", - ] + complete_static_lib = true } @@ -70,18 +59,14 @@ ohos_static_library("libcert_manager_ipc_client_static") { integer_overflow = true ubsan = true } - include_dirs = - [ "../../../../interfaces/innerkits/cert_manager_standard/main/include" ] - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] + sources = [ "./cm_ipc/src/cm_ipc_client.c", "./cm_ipc/src/cm_ipc_client_serialization.c", "./cm_ipc/src/cm_request.cpp", ] - deps = [ ":libcert_manager_log_mem_static" ] + deps = [ "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static" ] external_deps = [ "c_utils:utils", "hilog:libhilog", @@ -89,11 +74,6 @@ ohos_static_library("libcert_manager_ipc_client_static") { "openssl:libcrypto_shared", "samgr:samgr_proxy", ] - cflags_cc = [ - "-DHILOG_ENABLE", - "-Wall", - "-Werror", - ] - cflags = cflags_cc + complete_static_lib = true } diff --git a/interfaces/innerkits/cert_manager_standard/main/BUILD.gn b/interfaces/innerkits/cert_manager_standard/main/BUILD.gn index 0bb051178b24ad22dbb54c758dabc3261f3eab21..ca8831c38fa19e004160982fe7f2289439119627 100644 --- a/interfaces/innerkits/cert_manager_standard/main/BUILD.gn +++ b/interfaces/innerkits/cert_manager_standard/main/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -29,26 +30,13 @@ if (os_level == "standard") { ubsan = true } subsystem_name = "security" - innerapi_tags = [ - "platformsdk", - "chipsetsdk", - ] + innerapi_tags = [ "sasdk" ] part_name = "certificate_manager" public_configs = [ ":cert_manager_config" ] - defines = [ - "L2_STANDARD", - "_HARDWARE_ROOT_KEY_", - "_CM_LOG_ENABLE_", - ] sources = [ "src/cert_manager_api.c" ] - cflags = [ - "-DHILOG_ENABLE", - "-Wall", - "-Werror", - ] - deps = [ "../../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks" ] + deps = [ "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks" ] external_deps = [ "bounds_checking_function:libsec_shared", diff --git a/interfaces/kits/cj/BUILD.gn b/interfaces/kits/cj/BUILD.gn index e584858292a6a244054a9054e9d6913e9a39b3a5..450464834d85a6b342b0edec615882c48afdcb93 100644 --- a/interfaces/kits/cj/BUILD.gn +++ b/interfaces/kits/cj/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") ohos_shared_library("cj_cert_manager_ffi") { @@ -23,24 +24,15 @@ ohos_shared_library("cj_cert_manager_ffi") { integer_overflow = true ubsan = true } - defines = [ - "L2_STANDARD", - "_HARDWARE_ROOT_KEY_", - "_CM_LOG_ENABLE_", - ] - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "include", - ] + include_dirs = [ "include" ] sources = [ "src/cj_cert_manager_ffi.c" ] - cflags_cc = [ - "-Wall", - "-Werror", + deps = [ + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - deps = [ "../../innerkits/cert_manager_standard/main:cert_manager_sdk" ] innerapi_tags = [ "platformsdk" ] subsystem_name = "security" diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index 52e4862912a734f196d577d21e10ca8df2612a56..4515ec1cc6f1a8f93dd44fea15861ba90f4f37b1 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") ohos_shared_library("certmanager") { @@ -23,16 +24,8 @@ ohos_shared_library("certmanager") { integer_overflow = true ubsan = true } - defines = [ - "L2_STANDARD", - "_HARDWARE_ROOT_KEY_", - "_CM_LOG_ENABLE_", - ] - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "include", - ] + include_dirs = [ "include" ] sources = [ "src/cm_napi.cpp", @@ -58,11 +51,10 @@ ohos_shared_library("certmanager") { "c_utils:utils", "napi:ace_napi", ] - cflags_cc = [ - "-Wall", - "-Werror", + deps = [ + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - deps = [ "../../innerkits/cert_manager_standard/main:cert_manager_sdk" ] relative_install_dir = "module/security" subsystem_name = "security" @@ -79,16 +71,8 @@ ohos_shared_library("certmanagerdialog") { integer_overflow = true ubsan = true } - defines = [ - "L2_STANDARD", - "_HARDWARE_ROOT_KEY_", - "_CM_LOG_ENABLE_", - ] - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "include/dialog", - ] + include_dirs = [ "include/dialog" ] sources = [ "src/dialog/cm_napi_dialog.cpp", @@ -112,11 +96,10 @@ ohos_shared_library("certmanagerdialog") { "napi:ace_napi", "samgr:samgr_proxy", ] - cflags_cc = [ - "-Wall", - "-Werror", + deps = [ + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - deps = [ "../../innerkits/cert_manager_standard/main:cert_manager_sdk" ] relative_install_dir = "module/security" subsystem_name = "security" diff --git a/services/cert_manager_standard/BUILD.gn b/services/cert_manager_standard/BUILD.gn index f5f8f9b4c364916ac76934e354e8bdb886a8777f..95b2b0816766c309036c85f6039326c94c5c6a12 100644 --- a/services/cert_manager_standard/BUILD.gn +++ b/services/cert_manager_standard/BUILD.gn @@ -40,21 +40,9 @@ ohos_shared_library("cert_manager_service") { } subsystem_name = "security" part_name = "certificate_manager" - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] - - if (certificate_manager_feature_ca_enabled == "false") { - defines += [ "CERTIFICATE_MANAGER_FEATURE_CA_DISABLED" ] - } - if (certificate_manager_feature_credential_enabled == "false") { - defines += [ "CERTIFICATE_MANAGER_FEATURE_CREDENTIAL_DISABLED" ] - } deps = [ ":cert_manager_service.rc", - "cert_manager_engine/main/core:cert_manager_engine_core_standard", "cert_manager_engine/main/rdb:libcert_manager_rdb_static", "cert_manager_service/main/os_dependency:libcert_manager_service_os_dependency_standard_static", ] diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn index 4483755614f989282fda09a127b934a93f2a1397..3378e78f93fa0cad837aedcb2ef2e6d34c70efee 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_engine_core_config") { @@ -30,19 +31,7 @@ ohos_static_library("cert_manager_engine_core_standard") { ubsan = true } - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - "OPENSSL_SUPPRESS_DEPRECATED", - ] - include_dirs = [ - "../rdb/include", - "../../../../../interfaces/innerkits/cert_manager_standard/main/include", - ] - cflags = [ - "-Wall", - "-Werror", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "src/cert_manager.c", "src/cert_manager_app_cert_process.c", @@ -68,8 +57,8 @@ ohos_static_library("cert_manager_engine_core_standard") { ] deps = [ - "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", - "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/rdb:libcert_manager_rdb_static", ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -79,4 +68,6 @@ ohos_static_library("cert_manager_engine_core_standard") { "ipc:ipc_core", "openssl:libcrypto_shared", ] + + complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_engine/main/rdb/BUILD.gn b/services/cert_manager_standard/cert_manager_engine/main/rdb/BUILD.gn index 197beb858cbe0827c78456c308aa7425270ec6ad..16b218652adafaa802ed085368777fb313b67c39 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/rdb/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_engine/main/rdb/BUILD.gn @@ -9,8 +9,9 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and -# limitations under the License. +# limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -31,10 +32,7 @@ ohos_static_library("libcert_manager_rdb_static") { ubsan = true } - include_dirs = [ - "../../../../../frameworks/cert_manager_standard/main/common/include", - "../../../../../interfaces/innerkits/cert_manager_standard/main/include", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "src/cm_cert_property_rdb.cpp", @@ -42,18 +40,12 @@ ohos_static_library("libcert_manager_rdb_static") { "src/cm_rdb_open_callback.cpp", ] + deps = [ "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static" ] external_deps = [ "c_utils:utils", "hilog:libhilog", "relational_store:native_rdb", ] - defines = [ "_CM_LOG_ENABLE_" ] - - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/BUILD.gn index 8b4771add0c7486f9c559e61aa207122a0682e0e..cd003f7e7a78de62ddde8815a83c86deac6486d0 100644 --- a/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -30,26 +31,19 @@ ohos_static_library("libcert_manager_hisysevent_wrapper_static") { integer_overflow = true ubsan = true } - include_dirs = [ - "../../../../../frameworks/cert_manager_standard/main/common/include", - "../../../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include", - "../../../../../services/cert_manager_standard/cert_manager_engine/main/core/include", - "../../../../../interfaces/innerkits/cert_manager_standard/main/include", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "src/cm_report_wrapper.c", "src/hisysevent_wrapper.cpp", ] - cflags = [ - "-Wall", - "-Werror", - ] - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", + deps = [ + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/core:cert_manager_engine_core_standard", ] external_deps = [ - "bounds_checking_function:libsec_static", + "bounds_checking_function:libsec_shared", "hisysevent:libhisysevent", ] + complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn index cea010b35489a2b3e549221a4a79e963b8abc738..360953bc48c889965af691594a9679f888cde975 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn @@ -11,11 +11,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") +config("cert_manager_config") { + include_dirs = [ "sa" ] +} ohos_static_library("libcert_manager_service_os_dependency_standard_static") { subsystem_name = "security" part_name = "certificate_manager" + public_configs = [ ":cert_manager_config" ] branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -25,20 +30,12 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") { integer_overflow = true ubsan = true } - include_dirs = [ - "../../../cert_manager_engine/main/core/include", - "../../../cert_manager_engine/main/rdb/include", - "../../../../../interfaces/innerkits/cert_manager_standard/main/include", - ] - - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "sa/cm_sa.cpp" ] deps = [ - "../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", - "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/core:cert_manager_engine_core_standard", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/rdb:libcert_manager_rdb_static", "idl:libcm_service_idl_standard_static", ] @@ -53,7 +50,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") { if (support_jsapi) { sources += [ "sa/cm_event_observer.cpp" ] - defines += [ "SUPPORT_COMMON_EVENT" ] external_deps += [ "ability_base:want", "bundle_framework:appexecfwk_base", @@ -61,11 +57,5 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") { "os_account:os_account_innerkits", ] } - - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn index 11fc83e67adc43fa6c852251975c88a8ec1c21be..6760350b4456e4e2bb72c63c405acd8695a70e7d 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -30,25 +31,19 @@ ohos_static_library("libcm_service_idl_standard_static") { integer_overflow = true ubsan = true } - include_dirs = [ - "../../../../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../../cert_manager_engine/main/core/include", - ] - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] + include_dirs = [ "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main/include" ] sources = [ "cm_ipc/cm_ipc_service.c", "cm_ipc/cm_ipc_service_serialization.c", "cm_ipc/cm_response.cpp", ] deps = [ - "../../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", - "../../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static", - "../../hisysevent_wrapper:libcert_manager_hisysevent_wrapper_static", - "../../security_guard_report:libcert_manager_sg_report_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/core:cert_manager_engine_core_standard", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper:libcert_manager_hisysevent_wrapper_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/security_guard_report:libcert_manager_sg_report_static", ] + external_deps = [ "ability_base:want", "c_utils:utils", @@ -63,14 +58,6 @@ ohos_static_library("libcm_service_idl_standard_static") { "access_token:libaccesstoken_sdk", "os_account:os_account_innerkits", ] - defines += [] } - - cflags_cc = [ - "-DHILOG_ENABLE", - "-Wall", - "-Werror", - ] - cflags = cflags_cc complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_service/main/security_guard_report/BUILD.gn b/services/cert_manager_standard/cert_manager_service/main/security_guard_report/BUILD.gn index 3bdd81cbdca5ee46cb1283cddb73b114b37fba45..a02f80a4241ec43e1a3d04fc0e39a5ee37a93b89 100644 --- a/services/cert_manager_standard/cert_manager_service/main/security_guard_report/BUILD.gn +++ b/services/cert_manager_standard/cert_manager_service/main/security_guard_report/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") -import("../../../../../cert_manager.gni") config("cert_manager_config") { include_dirs = [ "include" ] @@ -31,29 +31,23 @@ ohos_static_library("libcert_manager_sg_report_static") { integer_overflow = true ubsan = true } - include_dirs = [ - "../../../../../frameworks/cert_manager_standard/main/common/include", - "../../../../../interfaces/innerkits/cert_manager_standard/main/include", + + deps = [ + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - deps = [ "../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static" ] sources = [ "src/cm_security_guard_info.c", "src/cm_security_guard_report.cpp", ] - cflags = [ - "-Wall", - "-Werror", - ] - defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ - "bounds_checking_function:libsec_static", + "bounds_checking_function:libsec_shared", "c_utils:utils", "ipc:ipc_single", ] if (support_security_guard) { - cflags += [ "-DSUPPORT_SECURITY_GUARD" ] - cflags_cc = [ "-DSUPPORT_SECURITY_GUARD" ] external_deps += [ "security_guard:libsg_collect_sdk" ] } + complete_static_lib = true } diff --git a/test/BUILD.gn b/test/BUILD.gn index 2971cb913879b307db39c58ba10ad0722987bc7b..347e28400595d5af91bfdc0447f969eb6363eb77 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/test.gni") -import("../cert_manager.gni") module_output_path = "cert_manager_standard/cert_manager_standard_test" @@ -37,11 +37,6 @@ ohos_unittest("cm_sdk_test") { ] include_dirs = [ "unittest/include" ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -53,8 +48,8 @@ ohos_unittest("cm_sdk_test") { } deps = [ - "../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", - "../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] external_deps = [ "access_token:libaccesstoken_sdk", @@ -66,11 +61,6 @@ ohos_unittest("cm_sdk_test") { "openssl:libcrypto_shared", ] resource_config_file = "./resource/certificate_manager/ohos_test.xml" - - defines = [] - if (certificate_manager_deps_huks_enabled == "software") { - defines += [ "DEPS_HKS_UNTRUSTED_RUNNING_ENV" ] - } } group("unittest") { diff --git a/test/fuzz_test/cmabort_fuzzer/BUILD.gn b/test/fuzz_test/cmabort_fuzzer/BUILD.gn index 621cb1ac61297790808621c3433056648d8cca22..74562f8ccaf80857d35d5f6354a0c6bf52e191c9 100644 --- a/test/fuzz_test/cmabort_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmabort_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,13 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmAbortFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmabort_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmabort_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmabort_fuzzer.cpp", - ] + sources = [ "cmabort_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmabort_fuzzer/cmabort_fuzzer.cpp b/test/fuzz_test/cmabort_fuzzer/cmabort_fuzzer.cpp index 45cd417683cfe140395e87a16ff1982ed6df084d..867a3e1e0d02bdd53b9053f90bd95e85f2b31521 100644 --- a/test/fuzz_test/cmabort_fuzzer/cmabort_fuzzer.cpp +++ b/test/fuzz_test/cmabort_fuzzer/cmabort_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -37,7 +36,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmAbort(&abHandle); CmFree(myData); diff --git a/test/fuzz_test/cmappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmappcert_fuzzer/BUILD.gn index c543c8f79ffb5b95be2d2a2e65c397c7f611a198..be9b978ea8d4930b3475a425ab1984881ee68901 100644 --- a/test/fuzz_test/cmappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmappcert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmappcert_fuzzer.cpp", - ] + sources = [ "cmappcert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmappcert_fuzzer/cmappcert_fuzzer.cpp b/test/fuzz_test/cmappcert_fuzzer/cmappcert_fuzzer.cpp index 7d92888fdf2cda34a2c6cacb495f9556637bf7fc..cab826bfc804181462f5be5f733a1a73ac8d545a 100644 --- a/test/fuzz_test/cmappcert_fuzzer/cmappcert_fuzzer.cpp +++ b/test/fuzz_test/cmappcert_fuzzer/cmappcert_fuzzer.cpp @@ -16,15 +16,16 @@ #include "cmappcert_fuzzer.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" -#include "cm_cert_data_part1_rsa.h" +#include "cm_cert_data_rsa.h" #include "cm_ipc_client_serialization.h" #include "cm_ipc_service.h" #include "cm_param.h" #include "cert_manager_api.h" +#include "cm_type.h" using namespace CmFuzzTest; namespace OHOS { + constexpr uint32_t TEST_USERID = 100; constexpr uint32_t MIN_DATA_USE_TIME = 4; static bool InstallAppCert(uint8_t *tmpData, uint32_t *remainSize, uint32_t *offset, uint32_t store, struct CmBlob *keyUri) @@ -132,7 +133,7 @@ namespace OHOS { uint32_t remainSize = static_cast(size); uint32_t offset = 0; - CertmanagerTest::SetATPermission(); + SetATPermission(); uint32_t store; if (!GetUintFromBuffer(tmpData, &remainSize, &offset, &store)) { diff --git a/test/fuzz_test/cmfinish_fuzzer/BUILD.gn b/test/fuzz_test/cmfinish_fuzzer/BUILD.gn index 887fea79a6c0ec00c2f6664b04c2b9018844da42..6291ef68400900bebb66e3ec89567cb970cb1d5d 100644 --- a/test/fuzz_test/cmfinish_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmfinish_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,13 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmFinishFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmfinish_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmfinish_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmfinish_fuzzer.cpp", - ] + sources = [ "cmfinish_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmfinish_fuzzer/cmfinish_fuzzer.cpp b/test/fuzz_test/cmfinish_fuzzer/cmfinish_fuzzer.cpp index 44e6575aa660a520a544a41a5e271c57889be935..85ceea355c2c53bbc8397ebf95d9c2e3d5d633f2 100644 --- a/test/fuzz_test/cmfinish_fuzzer/cmfinish_fuzzer.cpp +++ b/test/fuzz_test/cmfinish_fuzzer/cmfinish_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -52,7 +51,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmFinish(&fiHandle, &inData, &outData); CmFree(myData); diff --git a/test/fuzz_test/cmgetappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmgetappcert_fuzzer/BUILD.gn index c1397028bcb88d348ba425a3df5d5bc688645b0a..29a7f016b15a2fe7b0cb76704e81c42191aab3f4 100644 --- a/test/fuzz_test/cmgetappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetappcert_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetappcert_fuzzer.cpp", - ] + sources = [ "cmgetappcert_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetappcert_fuzzer/cmgetappcert_fuzzer.cpp b/test/fuzz_test/cmgetappcert_fuzzer/cmgetappcert_fuzzer.cpp index 69cef83d8747d338f460cdbec68789df3ff5db7e..96baf1b3cff133e14540ea6937fb50a293836015 100644 --- a/test/fuzz_test/cmgetappcert_fuzzer/cmgetappcert_fuzzer.cpp +++ b/test/fuzz_test/cmgetappcert_fuzzer/cmgetappcert_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -58,7 +57,7 @@ namespace OHOS { } credCert.credData.data = const_cast(myData + offset); - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetAppCert(&appCertUri, store, &credCert); CmFree(myData); diff --git a/test/fuzz_test/cmgetappcertlist_fuzzer/BUILD.gn b/test/fuzz_test/cmgetappcertlist_fuzzer/BUILD.gn index 3a480a1ba10c7cb874ed44c20d910aeb9a1999ee..04d65f430cbd95aacdacfde3a5fe64843c5f494d 100644 --- a/test/fuzz_test/cmgetappcertlist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetappcertlist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetAppCertListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetappcertlist_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetappcertlist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetappcertlist_fuzzer.cpp", - ] + sources = [ "cmgetappcertlist_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetappcertlist_fuzzer/cmgetappcertlist_fuzzer.cpp b/test/fuzz_test/cmgetappcertlist_fuzzer/cmgetappcertlist_fuzzer.cpp index 3f2420cdb1867e217229d348737e9674ab692123..ae1b018340c86a2597e277b6fe3de8d64961a9bb 100644 --- a/test/fuzz_test/cmgetappcertlist_fuzzer/cmgetappcertlist_fuzzer.cpp +++ b/test/fuzz_test/cmgetappcertlist_fuzzer/cmgetappcertlist_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -49,7 +48,7 @@ namespace OHOS { } credCertList.credentialAbstract = reinterpret_cast(myData + offset); - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetAppCertList(credStore, &credCertList); CmFree(myData); diff --git a/test/fuzz_test/cmgetauthorizedapplist_fuzzer/BUILD.gn b/test/fuzz_test/cmgetauthorizedapplist_fuzzer/BUILD.gn index ad4eb9dc7508c3ce2de61393e55f42d8c768afff..09b4e0afb1943fddeeaa8bb0a6f1139fbd48268d 100644 --- a/test/fuzz_test/cmgetauthorizedapplist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetauthorizedapplist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetAuthorizedAppListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetauthorizedapplist_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetauthorizedapplist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetauthorizedapplist_fuzzer.cpp", - ] + sources = [ "cmgetauthorizedapplist_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetauthorizedapplist_fuzzer/cmgetauthorizedapplist_fuzzer.cpp b/test/fuzz_test/cmgetauthorizedapplist_fuzzer/cmgetauthorizedapplist_fuzzer.cpp index 7389574f3b404707605b8eb49535a62e25bc8091..a2a4119b0b0af7320a1e5c26d4b8a75cd712497e 100644 --- a/test/fuzz_test/cmgetauthorizedapplist_fuzzer/cmgetauthorizedapplist_fuzzer.cpp +++ b/test/fuzz_test/cmgetauthorizedapplist_fuzzer/cmgetauthorizedapplist_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -49,7 +48,7 @@ namespace OHOS { } appUidList.appUid = reinterpret_cast(myData + offset); - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetAuthorizedAppList(&authorUri, &appUidList); CmFree(myData); diff --git a/test/fuzz_test/cmgetcertinfo_fuzzer/BUILD.gn b/test/fuzz_test/cmgetcertinfo_fuzzer/BUILD.gn index 1eca4404e568b34daa575fa35a048899c94c464d..d959161ed799fe44ed121ab33083df97c8367c3d 100644 --- a/test/fuzz_test/cmgetcertinfo_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetcertinfo_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetCertInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetcertinfo_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetcertinfo_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetcertinfo_fuzzer.cpp", - ] + sources = [ "cmgetcertinfo_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetcertinfo_fuzzer/cmgetcertinfo_fuzzer.cpp b/test/fuzz_test/cmgetcertinfo_fuzzer/cmgetcertinfo_fuzzer.cpp index 27b4d078022bdc94ef1f5a33fe2edeabd1e469e9..8dbee6420c6116e9b35254bc46e544416ea25a60 100644 --- a/test/fuzz_test/cmgetcertinfo_fuzzer/cmgetcertinfo_fuzzer.cpp +++ b/test/fuzz_test/cmgetcertinfo_fuzzer/cmgetcertinfo_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -49,7 +48,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetCertInfo(&sysUri, store, &sysCertInfo); CmFree(myData); diff --git a/test/fuzz_test/cmgetcertlist_fuzzer/BUILD.gn b/test/fuzz_test/cmgetcertlist_fuzzer/BUILD.gn index 2ee235350f91dcbba31b5b7c3bbdab8bbf156e89..6560ac49f875ee5645c149c1d1c523f1df9b8671 100644 --- a/test/fuzz_test/cmgetcertlist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetcertlist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetCertListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetcertlist_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetcertlist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetcertlist_fuzzer.cpp", - ] + sources = [ "cmgetcertlist_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetcertlist_fuzzer/cmgetcertlist_fuzzer.cpp b/test/fuzz_test/cmgetcertlist_fuzzer/cmgetcertlist_fuzzer.cpp index 58cc6bb84cf7b3be4f81c76af0cec96dbda33ce3..bdeb3fb251401bf525130b9a9854f8f0e5562aa9 100644 --- a/test/fuzz_test/cmgetcertlist_fuzzer/cmgetcertlist_fuzzer.cpp +++ b/test/fuzz_test/cmgetcertlist_fuzzer/cmgetcertlist_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -43,7 +42,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetCertList(sysStore, &sysCertList); CmFree(myData); diff --git a/test/fuzz_test/cmgetusercertinfo_fuzzer/BUILD.gn b/test/fuzz_test/cmgetusercertinfo_fuzzer/BUILD.gn index ef10ddeff70f825611bb720e691bb57c5315439a..b1b05a9e66272121b440d06bac5858fd6c88134e 100644 --- a/test/fuzz_test/cmgetusercertinfo_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetusercertinfo_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetUserCertInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetusercertinfo_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetusercertinfo_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetusercertinfo_fuzzer.cpp", - ] + sources = [ "cmgetusercertinfo_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetusercertinfo_fuzzer/cmgetusercertinfo_fuzzer.cpp b/test/fuzz_test/cmgetusercertinfo_fuzzer/cmgetusercertinfo_fuzzer.cpp index e5ab2d526a3aebfcf1d0fff9a850940c7670b27b..6d8b304067fc9a46bbe08cc6dd6edf435ca7cd1b 100644 --- a/test/fuzz_test/cmgetusercertinfo_fuzzer/cmgetusercertinfo_fuzzer.cpp +++ b/test/fuzz_test/cmgetusercertinfo_fuzzer/cmgetusercertinfo_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -50,7 +49,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetUserCertInfo(&userCertUri, store, &userCertInfo); CmFree(myData); diff --git a/test/fuzz_test/cmgetusercertlist_fuzzer/BUILD.gn b/test/fuzz_test/cmgetusercertlist_fuzzer/BUILD.gn index e9af46e82156892efe00a8dbd1ebf3d68ad4dbb5..81bc7e0ebcf1f17d76eead783fcea2ba435c37b9 100644 --- a/test/fuzz_test/cmgetusercertlist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgetusercertlist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGetUserCertListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgetusercertlist_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgetusercertlist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgetusercertlist_fuzzer.cpp", - ] + sources = [ "cmgetusercertlist_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgetusercertlist_fuzzer/cmgetusercertlist_fuzzer.cpp b/test/fuzz_test/cmgetusercertlist_fuzzer/cmgetusercertlist_fuzzer.cpp index 7b38d51fb1bb17a950d01d583f4ea506d62a6d24..a015bf488373955205d682d4a9cea82294dacb20 100644 --- a/test/fuzz_test/cmgetusercertlist_fuzzer/cmgetusercertlist_fuzzer.cpp +++ b/test/fuzz_test/cmgetusercertlist_fuzzer/cmgetusercertlist_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -44,7 +43,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGetUserCertList(userStore, &userCertList); CmFree(myData); diff --git a/test/fuzz_test/cmgrantappcertificate_fuzzer/BUILD.gn b/test/fuzz_test/cmgrantappcertificate_fuzzer/BUILD.gn index c393ac3dc893763c558e24bd86889856c77c95b0..79bdfd85c5e751d578f4f4a61be3f0d2908b2df6 100644 --- a/test/fuzz_test/cmgrantappcertificate_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmgrantappcertificate_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmGrantAppCertificateFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmgrantappcertificate_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmgrantappcertificate_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmgrantappcertificate_fuzzer.cpp", - ] + sources = [ "cmgrantappcertificate_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmgrantappcertificate_fuzzer/cmgrantappcertificate_fuzzer.cpp b/test/fuzz_test/cmgrantappcertificate_fuzzer/cmgrantappcertificate_fuzzer.cpp index fceeb5946d2e55cb35b6ab6341e61be471484498..e716e1be40ab4fcf6f9be6910d5331b56650878e 100644 --- a/test/fuzz_test/cmgrantappcertificate_fuzzer/cmgrantappcertificate_fuzzer.cpp +++ b/test/fuzz_test/cmgrantappcertificate_fuzzer/cmgrantappcertificate_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -50,7 +49,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmGrantAppCertificate(&keyUri, appUid, &authUri); CmFree(myData); diff --git a/test/fuzz_test/cminit_fuzzer/BUILD.gn b/test/fuzz_test/cminit_fuzzer/BUILD.gn index 2347e5a6751aa646c638ec48f500b167cc457be3..910162658d2004fd6c0d76626d0afc9c2f55b772 100644 --- a/test/fuzz_test/cminit_fuzzer/BUILD.gn +++ b/test/fuzz_test/cminit_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,13 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmInitFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cminit_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cminit_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cminit_fuzzer.cpp", - ] + sources = [ "cminit_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cminit_fuzzer/cminit_fuzzer.cpp b/test/fuzz_test/cminit_fuzzer/cminit_fuzzer.cpp index d653e1892c7488a457f9aa72a33ef15eb8117f35..36e85ced8a2c2994d68f67b0df260f7b97852530 100644 --- a/test/fuzz_test/cminit_fuzzer/cminit_fuzzer.cpp +++ b/test/fuzz_test/cminit_fuzzer/cminit_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -55,7 +54,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmInit(&authUri, &spec, &handle); CmFree(myData); diff --git a/test/fuzz_test/cminstallappcert_fuzzer/BUILD.gn b/test/fuzz_test/cminstallappcert_fuzzer/BUILD.gn index 499f5cd4c49ec0a97450a5dd9e7e547e1cc329e2..253c543a9849eec40dfcb9cb7ad6572abc45449a 100644 --- a/test/fuzz_test/cminstallappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cminstallappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmInstallAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cminstallappcert_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cminstallappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cminstallappcert_fuzzer.cpp", - ] + sources = [ "cminstallappcert_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cminstallappcert_fuzzer/cminstallappcert_fuzzer.cpp b/test/fuzz_test/cminstallappcert_fuzzer/cminstallappcert_fuzzer.cpp index 09affe140617c746d5ae66cd22828e45cf9ffbad..49036081e0e7611956bbe5e66527f12aece6059b 100644 --- a/test/fuzz_test/cminstallappcert_fuzzer/cminstallappcert_fuzzer.cpp +++ b/test/fuzz_test/cminstallappcert_fuzzer/cminstallappcert_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -64,7 +63,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmInstallAppCert(&appCert, &appCertPwd, &certAlias, store, &keyUri); CmFree(myData); diff --git a/test/fuzz_test/cminstallusertrustedcert_fuzzer/BUILD.gn b/test/fuzz_test/cminstallusertrustedcert_fuzzer/BUILD.gn index 6869baa619a11005ea77921a4bb947a8ab65bdf9..458ce3d0a52d9cafc0b40fae35afa40cb19b9668 100644 --- a/test/fuzz_test/cminstallusertrustedcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cminstallusertrustedcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmInstallUserTrustedCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cminstallusertrustedcert_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cminstallusertrustedcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cminstallusertrustedcert_fuzzer.cpp", - ] + sources = [ "cminstallusertrustedcert_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cminstallusertrustedcert_fuzzer/cminstallusertrustedcert_fuzzer.cpp b/test/fuzz_test/cminstallusertrustedcert_fuzzer/cminstallusertrustedcert_fuzzer.cpp index 0ab3eb0dce8baf829c895fec1eda571c4c2c227d..1198f271d7323e5a8bc31374b9f0e069752aa9bf 100644 --- a/test/fuzz_test/cminstallusertrustedcert_fuzzer/cminstallusertrustedcert_fuzzer.cpp +++ b/test/fuzz_test/cminstallusertrustedcert_fuzzer/cminstallusertrustedcert_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -51,7 +50,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmInstallUserTrustedCert(&userCert, &certAlias, &certUri); CmFree(myData); diff --git a/test/fuzz_test/cmipcserviceabort_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceabort_fuzzer/BUILD.gn index 1379e0a57e319e7fe56300558858ff46c51de96f..dc25c98641f225e653fe9966909b31f0a77045bc 100644 --- a/test/fuzz_test/cmipcserviceabort_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceabort_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceAbortFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcserviceabort_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceabort_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceabort_fuzzer.cpp", - ] + sources = [ "cmipcserviceabort_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceabort_fuzzer/cmipcserviceabort_fuzzer.cpp b/test/fuzz_test/cmipcserviceabort_fuzzer/cmipcserviceabort_fuzzer.cpp index 23a4d68f55dd8730f365f3955d48d06f1907a001..23aa999ef184f60afb67499803b8bb2d1d796af7 100644 --- a/test/fuzz_test/cmipcserviceabort_fuzzer/cmipcserviceabort_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceabort_fuzzer/cmipcserviceabort_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_ABORT, false, CmIpcServiceAbort)) { return false; } diff --git a/test/fuzz_test/cmipcservicefinish_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicefinish_fuzzer/BUILD.gn index 0e4d8ce323a5a07d637d614caa82799d4a810b37..ee3f5b058a4fb54060806749ac7e8ede4ce31285 100644 --- a/test/fuzz_test/cmipcservicefinish_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicefinish_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceFinishFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcservicefinish_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcservicefinish_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicefinish_fuzzer.cpp", - ] + sources = [ "cmipcservicefinish_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicefinish_fuzzer/cmipcservicefinish_fuzzer.cpp b/test/fuzz_test/cmipcservicefinish_fuzzer/cmipcservicefinish_fuzzer.cpp index 4e6a996fb59d52067e1d36fcd56b20d9933b3f83..85009c2cd9192382e1c2bf066af833bdbac4add0 100644 --- a/test/fuzz_test/cmipcservicefinish_fuzzer/cmipcservicefinish_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicefinish_fuzzer/cmipcservicefinish_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_FINISH, false, CmIpcServiceFinish)) { return false; } diff --git a/test/fuzz_test/cmipcservicegetappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetappcert_fuzzer/BUILD.gn index 1c3b59eca31b28cb6ded339515fd92f3cdbcb682..afabac00948a05bb636f679d6e58ebd99accb2b3 100644 --- a/test/fuzz_test/cmipcservicegetappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcservicegetappcert_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetappcert_fuzzer.cpp", - ] + sources = [ "cmipcservicegetappcert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetappcert_fuzzer/cmipcservicegetappcert_fuzzer.cpp b/test/fuzz_test/cmipcservicegetappcert_fuzzer/cmipcservicegetappcert_fuzzer.cpp index a63da8c81aa207b5d40c9e2e747d417e0be96d18..dcbc70bb5889ad4d30a4de4d8cec26d6438a3631 100644 --- a/test/fuzz_test/cmipcservicegetappcert_fuzzer/cmipcservicegetappcert_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetappcert_fuzzer/cmipcservicegetappcert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_APP_CERTIFICATE, false, CmIpcServiceGetAppCert)) { return false; diff --git a/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/BUILD.gn index 05892f6105ab66fb9147037f853cedc121c4a70e..1b508cd703a017a0ddf48bbe201b0e3b47463d0b 100644 --- a/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetAppCertListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcservicegetappcertlist_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetappcertlist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetappcertlist_fuzzer.cpp", - ] + sources = [ "cmipcservicegetappcertlist_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/cmipcservicegetappcertlist_fuzzer.cpp b/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/cmipcservicegetappcertlist_fuzzer.cpp index 694297dd218926561fcef7744da5f515e290bfe0..9fbbdbd87d838f75a3fb22fd89453481abc7a910 100644 --- a/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/cmipcservicegetappcertlist_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetappcertlist_fuzzer/cmipcservicegetappcertlist_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_APP_CERTIFICATE_LIST, false, CmIpcServiceGetAppCertList)) { return false; diff --git a/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/BUILD.gn index 5ff93dbd4801c55ce6d014ca86a6909866ca081b..f257f88cf786deb1ace241ee3ba7725c72b95fc3 100644 --- a/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetAuthorizedAppListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetauthorizedapplist_fuzzer.cpp", - ] + sources = [ "cmipcservicegetauthorizedapplist_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/cmipcservicegetauthorizedapplist_fuzzer.cpp b/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/cmipcservicegetauthorizedapplist_fuzzer.cpp index 19add546828955c024a5b8b9eb8bfcb04e74f8ac..a84f7fef1f815db239da0327691b279813cace98 100644 --- a/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/cmipcservicegetauthorizedapplist_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetauthorizedapplist_fuzzer/cmipcservicegetauthorizedapplist_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_AUTHED_LIST, false, CmIpcServiceGetAuthorizedAppList)) { return false; diff --git a/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/BUILD.gn index e650f41470f58b402a2b0af22757ac1f8dab819c..c11986b208cc9e10da101fa9d498fa8dca493d5e 100644 --- a/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetCertificateInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetcertificateinfo_fuzzer.cpp", - ] + sources = [ "cmipcservicegetcertificateinfo_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/cmipcservicegetcertificateinfo_fuzzer.cpp b/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/cmipcservicegetcertificateinfo_fuzzer.cpp index 233c65574470cc92ceff028fd595ff063f9cacb7..9ba32afc7acb7afdd637e1abe4be190c480342b1 100644 --- a/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/cmipcservicegetcertificateinfo_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetcertificateinfo_fuzzer/cmipcservicegetcertificateinfo_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_CERTIFICATE_INFO, false, CmIpcServiceGetCertificateInfo)) { return false; diff --git a/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/BUILD.gn index 1e6fcbe2921787e532aa1dce1660c2ae15d430cf..f74b441961859c1864b40379ff38df97b3cb43d4 100644 --- a/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetCertificateListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegetcertificatelist_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetcertificatelist_fuzzer.cpp", - ] + sources = [ "cmipcservicegetcertificatelist_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/cmipcservicegetcertificatelist_fuzzer.cpp b/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/cmipcservicegetcertificatelist_fuzzer.cpp index 117231366d75ef8786346ff8d1640c49f7b679fc..d97b49b3cd4978b3cf089d291c5639dab2e9641a 100644 --- a/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/cmipcservicegetcertificatelist_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetcertificatelist_fuzzer/cmipcservicegetcertificatelist_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_CERTIFICATE_LIST, false, CmIpcServiceGetCertificateList)) { return false; diff --git a/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/BUILD.gn index 80ab69b307aced872ae25d2080ad8d0838b54d65..c6274a1762b8058f44f3d92f838e2dc2e8ecee99 100644 --- a/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetUserCertInfoFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegetusercertinfo_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetusercertinfo_fuzzer.cpp", - ] + sources = [ "cmipcservicegetusercertinfo_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/cmipcservicegetusercertinfo_fuzzer.cpp b/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/cmipcservicegetusercertinfo_fuzzer.cpp index c1b68eceffb91b1fba7ec800999ecfbcb033b099..d9e4d3b3def4a52ceaff968eb64f9bcc52236c7a 100644 --- a/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/cmipcservicegetusercertinfo_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetusercertinfo_fuzzer/cmipcservicegetusercertinfo_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_USER_CERTIFICATE_INFO, false, CmIpcServiceGetUserCertInfo)) { return false; diff --git a/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/BUILD.gn index 4694b795c2cc6a2e0c041a2145e8d811d2b29b3a..6d3ecb4191ea6153f01cfb8f2231dc786db0e627 100644 --- a/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGetUserCertListFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegetusercertlist_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegetusercertlist_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegetusercertlist_fuzzer.cpp", - ] + sources = [ "cmipcservicegetusercertlist_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/cmipcservicegetusercertlist_fuzzer.cpp b/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/cmipcservicegetusercertlist_fuzzer.cpp index 39cd98ed4bb7e84d632fc31dfdd03268763e8560..182bd4b915fce1c8b51d6391ae71f4b8b16a987b 100644 --- a/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/cmipcservicegetusercertlist_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegetusercertlist_fuzzer/cmipcservicegetusercertlist_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GET_USER_CERTIFICATE_LIST, false, CmIpcServiceGetUserCertList)) { return false; diff --git a/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/BUILD.gn index e3b641d91a29295b3031ded310f32c9e322ed460..1f46227b98354ea2a96205e8292e0a546f48f449 100644 --- a/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceGrantAppCertificateFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicegrantappcertificate_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicegrantappcertificate_fuzzer.cpp", - ] + sources = [ "cmipcservicegrantappcertificate_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/cmipcservicegrantappcertificate_fuzzer.cpp b/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/cmipcservicegrantappcertificate_fuzzer.cpp index 1cbb366f7ee7cdd33f708f2e576ac9e2e4ade7f2..ca3e65810cdd6e2f82ab5e9293deb79b78f95f21 100644 --- a/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/cmipcservicegrantappcertificate_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicegrantappcertificate_fuzzer/cmipcservicegrantappcertificate_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_GRANT_APP_CERT, false, CmIpcServiceGrantAppCertificate)) { return false; diff --git a/test/fuzz_test/cmipcserviceinit_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceinit_fuzzer/BUILD.gn index adfae0118e4ed7776eb92e009a74bbadef379259..f897f80d54f1b432a3ae0a66458c9215caffcc6c 100644 --- a/test/fuzz_test/cmipcserviceinit_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceinit_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceInitFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcserviceinit_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceinit_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceinit_fuzzer.cpp", - ] + sources = [ "cmipcserviceinit_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceinit_fuzzer/cmipcserviceinit_fuzzer.cpp b/test/fuzz_test/cmipcserviceinit_fuzzer/cmipcserviceinit_fuzzer.cpp index f2d71cdd07314112ab8100e95ab40ef1832e1d58..6194d7ae949a7684f722fa40a60a8f8499f31822 100644 --- a/test/fuzz_test/cmipcserviceinit_fuzzer/cmipcserviceinit_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceinit_fuzzer/cmipcserviceinit_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_INIT, false, CmIpcServiceInit)) { return false; } diff --git a/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/BUILD.gn index fbb5ea97bc947d7ad5c9b98fce3ba87e58423834..4b80b7e8885b8015e3577afcb3a015827c5e0d1f 100644 --- a/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceInstallAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcserviceinstallappcert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceinstallappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceinstallappcert_fuzzer.cpp", - ] + sources = [ "cmipcserviceinstallappcert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/cmipcserviceinstallappcert_fuzzer.cpp b/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/cmipcserviceinstallappcert_fuzzer.cpp index 507c3c8b9bfe8c6c10569e0a098acf5a0feaccda..81e063dfb6a90fc036e4656a9c7dbd995fed507a 100644 --- a/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/cmipcserviceinstallappcert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceinstallappcert_fuzzer/cmipcserviceinstallappcert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_INSTALL_APP_CERTIFICATE, false, CmIpcServiceInstallAppCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/BUILD.gn index 227cb0a4f66eef5bb63bd3dae5d6029dd2b4fb54..74774122cc6177f287e3586d72ac13a14ae13fbf 100644 --- a/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceInstallUserCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceinstallusercert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceinstallusercert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceinstallusercert_fuzzer.cpp", - ] + sources = [ "cmipcserviceinstallusercert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/cmipcserviceinstallusercert_fuzzer.cpp b/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/cmipcserviceinstallusercert_fuzzer.cpp index 16f6067acba6a0f29d5a9e735ab5ccca75c7c94c..116aacdd8b3d16016ddfc8b8f80b72e62f33b201 100644 --- a/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/cmipcserviceinstallusercert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceinstallusercert_fuzzer/cmipcserviceinstallusercert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_INSTALL_USER_CERTIFICATE, false, CmIpcServiceInstallUserCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/BUILD.gn index 95c1a46ea5bc58b8f1794d4506e28ee700993fd5..14de7a23c82883b40203f78e801a6b1c86337763 100644 --- a/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceIsAuthorizedAppFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceisauthorizedapp_fuzzer.cpp", - ] + sources = [ "cmipcserviceisauthorizedapp_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/cmipcserviceisauthorizedapp_fuzzer.cpp b/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/cmipcserviceisauthorizedapp_fuzzer.cpp index d9f4c2314e2d481feb667af62676742219c4f4a3..c8c67320a88f006cb23ea5baa92f54357f40dc39 100644 --- a/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/cmipcserviceisauthorizedapp_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceisauthorizedapp_fuzzer/cmipcserviceisauthorizedapp_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_CHECK_IS_AUTHED_APP, false, CmIpcServiceIsAuthorizedApp)) { return false; diff --git a/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/BUILD.gn index 040cba6dd6091050a0b7b64ed3ae7907cbdd6b1b..f2385d0072846c646be9bb9ce435358b93bc2e4d 100644 --- a/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceRemoveGrantedAppFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceremovegrantedapp_fuzzer.cpp", - ] + sources = [ "cmipcserviceremovegrantedapp_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/cmipcserviceremovegrantedapp_fuzzer.cpp b/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/cmipcserviceremovegrantedapp_fuzzer.cpp index 35040319d7de257ec43245b981e9449a7ad2e136..7ed5bbaff42415fc314f09ae248f79a8aa7ea477 100644 --- a/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/cmipcserviceremovegrantedapp_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceremovegrantedapp_fuzzer/cmipcserviceremovegrantedapp_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_REMOVE_GRANT_APP, false, CmIpcServiceRemoveGrantedApp)) { return false; diff --git a/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/BUILD.gn index 3c152134f8b251e51a656002d51dffe3824fba35..416824ff55a721b428b16c99867b4b777841762f 100644 --- a/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceSetCertStatusFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcservicesetcertstatus_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcservicesetcertstatus_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicesetcertstatus_fuzzer.cpp", - ] + sources = [ "cmipcservicesetcertstatus_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/cmipcservicesetcertstatus_fuzzer.cpp b/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/cmipcservicesetcertstatus_fuzzer.cpp index 436b3b8de6e192a15cd865300ac443e2a01f4129..26c2b5422cab4ca88862471b27a95f2a02da23e7 100644 --- a/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/cmipcservicesetcertstatus_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicesetcertstatus_fuzzer/cmipcservicesetcertstatus_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_SET_CERTIFICATE_STATUS, false, CmIpcServiceSetCertStatus)) { return false; diff --git a/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/BUILD.gn b/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/BUILD.gn index 754a54284a0c3ff67e3fbf522437149ff2600850..4e2142c232058bafbde152b2eca3514fbd701bf6 100644 --- a/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceSetUserCertStatusFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcservicesetusercertstatus_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcservicesetusercertstatus_fuzzer.cpp", - ] + sources = [ "cmipcservicesetusercertstatus_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/cmipcservicesetusercertstatus_fuzzer.cpp b/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/cmipcservicesetusercertstatus_fuzzer.cpp index 0215e1b173584bae8639a08f169bd9bf657ddd64..ca4e31890eaf39ec721b1a9c55cbec04eac60b15 100644 --- a/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/cmipcservicesetusercertstatus_fuzzer.cpp +++ b/test/fuzz_test/cmipcservicesetusercertstatus_fuzzer/cmipcservicesetusercertstatus_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_SET_USER_CERTIFICATE_STATUS, false, CmIpcServiceSetUserCertStatus)) { return false; diff --git a/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/BUILD.gn index 4649726f877431ab8dc61da4807195d61fa0e9e0..2b7fb499302b036d76008fbe445b5ba7e5a27dfa 100644 --- a/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceUninstallAllAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceuninstallallappcert_fuzzer.cpp", - ] + sources = [ "cmipcserviceuninstallallappcert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/cmipcserviceuninstallallappcert_fuzzer.cpp b/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/cmipcserviceuninstallallappcert_fuzzer.cpp index 8f1cd8ec7e0cbaaa192de93da4de35391f8b788d..99802a5c9b87ad8f0694d580f8b802ec8754b388 100644 --- a/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/cmipcserviceuninstallallappcert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceuninstallallappcert_fuzzer/cmipcserviceuninstallallappcert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_UNINSTALL_APP_CERTIFICATE, false, CmIpcServiceUninstallAllAppCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/BUILD.gn index aa3c1c1e5e4f0b47d5504c574b0987a88fb63d1d..72bbe419fa54cda9c985dd3f8d0012db9f25932a 100644 --- a/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceUninstallAllUserCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceuninstallallusercert_fuzzer.cpp", - ] + sources = [ "cmipcserviceuninstallallusercert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/cmipcserviceuninstallallusercert_fuzzer.cpp b/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/cmipcserviceuninstallallusercert_fuzzer.cpp index 7d848a84e7eaa72f6b086a8cb2448029aa2e60b3..8ee5260519806cf473e76a79e5c4df72b8b20f46 100644 --- a/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/cmipcserviceuninstallallusercert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceuninstallallusercert_fuzzer/cmipcserviceuninstallallusercert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_UNINSTALL_ALL_USER_CERTIFICATE, false, CmIpcServiceUninstallAllUserCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/BUILD.gn index ca57b48af73091c0fe6ab21e5e68b17bb0b55948..6a52b1eabd6e977236e5bd5301859c6c1641f7d9 100644 --- a/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceUninstallAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceuninstallappcert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceuninstallappcert_fuzzer.cpp", - ] + sources = [ "cmipcserviceuninstallappcert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/cmipcserviceuninstallappcert_fuzzer.cpp b/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/cmipcserviceuninstallappcert_fuzzer.cpp index 2ed14dd18083bd6a253ab8f38e2b954df330f099..7392c9a98e8a785c437f41ad0a33d774eeab24c0 100644 --- a/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/cmipcserviceuninstallappcert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceuninstallappcert_fuzzer/cmipcserviceuninstallappcert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_UNINSTALL_APP_CERTIFICATE, false, CmIpcServiceUninstallAppCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/BUILD.gn index 991f301de05dd5a7084f11bf1631f2d83fd3c4e5..84afa3c0d353deb6579c39d8444f598c6719eb50 100644 --- a/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,28 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceUninstallUserCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = - "../../../test/fuzz_test/cmipcserviceuninstallusercert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceuninstallusercert_fuzzer.cpp", - ] + sources = [ "cmipcserviceuninstallusercert_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/cmipcserviceuninstallusercert_fuzzer.cpp b/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/cmipcserviceuninstallusercert_fuzzer.cpp index e6894c4847d068b7de5f74225d26b0c416c2fb64..7da8988f3a1458ebe2bf72b38b77a1dce69dc5c8 100644 --- a/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/cmipcserviceuninstallusercert_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceuninstallusercert_fuzzer/cmipcserviceuninstallusercert_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_UNINSTALL_USER_CERTIFICATE, false, CmIpcServiceUninstallUserCert)) { return false; diff --git a/test/fuzz_test/cmipcserviceupdate_fuzzer/BUILD.gn b/test/fuzz_test/cmipcserviceupdate_fuzzer/BUILD.gn index 7f3f75df87054948be0c34da606b861217822189..8c1af9e4f91659d0e8396d23a21aaa8ed70d6846 100644 --- a/test/fuzz_test/cmipcserviceupdate_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmipcserviceupdate_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,16 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIpcServiceUpdateFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmipcserviceupdate_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmipcserviceupdate_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmipcserviceupdate_fuzzer.cpp", - ] + sources = [ "cmipcserviceupdate_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmipcserviceupdate_fuzzer/cmipcserviceupdate_fuzzer.cpp b/test/fuzz_test/cmipcserviceupdate_fuzzer/cmipcserviceupdate_fuzzer.cpp index 883913224b076cb1e993e01f650661da3d37a633..971ee9ba5244ea36f3d4af7c48130f2cace96060 100644 --- a/test/fuzz_test/cmipcserviceupdate_fuzzer/cmipcserviceupdate_fuzzer.cpp +++ b/test/fuzz_test/cmipcserviceupdate_fuzzer/cmipcserviceupdate_fuzzer.cpp @@ -17,13 +17,12 @@ #include "cm_fuzz_test_common.h" #include "cm_ipc_service.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) { - CertmanagerTest::SetATPermission(); + SetATPermission(); if (!IpcServiceApiFuzzerTest(data, size, CM_MSG_UPDATE, false, CmIpcServiceUpdate)) { return false; } diff --git a/test/fuzz_test/cmisauthorizedapp_fuzzer/BUILD.gn b/test/fuzz_test/cmisauthorizedapp_fuzzer/BUILD.gn index 8d9e56ea27fddea65f293eb2242317aa77809846..7d29953266f79b16b4f9741fcfccae3c7c6c304f 100644 --- a/test/fuzz_test/cmisauthorizedapp_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmisauthorizedapp_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmIsAuthorizedAppFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmisauthorizedapp_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmisauthorizedapp_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmisauthorizedapp_fuzzer.cpp", - ] + sources = [ "cmisauthorizedapp_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmisauthorizedapp_fuzzer/cmisauthorizedapp_fuzzer.cpp b/test/fuzz_test/cmisauthorizedapp_fuzzer/cmisauthorizedapp_fuzzer.cpp index c40cd54251d79e3e07d3fcab80552218dbe16fd0..6c6e422e59c950a6702753034fb0dd60e06f99f6 100644 --- a/test/fuzz_test/cmisauthorizedapp_fuzzer/cmisauthorizedapp_fuzzer.cpp +++ b/test/fuzz_test/cmisauthorizedapp_fuzzer/cmisauthorizedapp_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -38,7 +37,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmIsAuthorizedApp(&authAppUri); CmFree(myData); diff --git a/test/fuzz_test/cmonremoterequest_fuzzer/BUILD.gn b/test/fuzz_test/cmonremoterequest_fuzzer/BUILD.gn index 4c483f97ec6c55cd4c387a8f141a97df4d7e40a9..92c8e3c6d6b8aa65a957eb28ec9e6a6e1df1db15 100755 --- a/test/fuzz_test/cmonremoterequest_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmonremoterequest_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,27 +20,17 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmOnRemoteRequestFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmonremoterequest_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmonremoterequest_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/sa", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmonremoterequest_fuzzer.cpp", - ] + sources = [ "cmonremoterequest_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency:libcert_manager_service_os_dependency_standard_static", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmonremoterequest_fuzzer/cmonremoterequest_fuzzer.cpp b/test/fuzz_test/cmonremoterequest_fuzzer/cmonremoterequest_fuzzer.cpp index 083d95ce12a34672051c1152df88e891891ede87..d5699b744274248972171681943549f36fc28425 100755 --- a/test/fuzz_test/cmonremoterequest_fuzzer/cmonremoterequest_fuzzer.cpp +++ b/test/fuzz_test/cmonremoterequest_fuzzer/cmonremoterequest_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cm_fuzz_test_common.h" #include "cm_sa.h" -#include "cm_test_common.h" #include "message_option.h" #include "message_parcel.h" @@ -67,7 +66,7 @@ namespace OHOS { MessageParcel reply; MessageOption option; - CertmanagerTest::SetATPermission(); + SetATPermission(); SystemAbilityOnDemandReason reason; (void)myService.OnStart(reason); (void)myService.OnRemoteRequest(code, messageData, reply, option); diff --git a/test/fuzz_test/cmremovegrantedapp_fuzzer/BUILD.gn b/test/fuzz_test/cmremovegrantedapp_fuzzer/BUILD.gn index 37a5baae9e2e17266194b35fe58623ff90d5d265..e7725807fc8872dc8ea5d66361b7a6bddfce96ac 100644 --- a/test/fuzz_test/cmremovegrantedapp_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmremovegrantedapp_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -20,25 +21,14 @@ module_output_path = "certificate_manager/certificate_manager" ohos_fuzztest("CmRemoveGrantedAppFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmremovegrantedapp_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmremovegrantedapp_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmremovegrantedapp_fuzzer.cpp", - ] + sources = [ "cmremovegrantedapp_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmremovegrantedapp_fuzzer/cmremovegrantedapp_fuzzer.cpp b/test/fuzz_test/cmremovegrantedapp_fuzzer/cmremovegrantedapp_fuzzer.cpp index bcf1d8b433e22fb2988eada22b03508aefab08bd..5fe5a712af17e616f0eb66b58673bbedeaf19013 100644 --- a/test/fuzz_test/cmremovegrantedapp_fuzzer/cmremovegrantedapp_fuzzer.cpp +++ b/test/fuzz_test/cmremovegrantedapp_fuzzer/cmremovegrantedapp_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -44,7 +43,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmRemoveGrantedApp(&grantKeyUri, appUid); CmFree(myData); diff --git a/test/fuzz_test/cmsendrequest_fuzzer/BUILD.gn b/test/fuzz_test/cmsendrequest_fuzzer/BUILD.gn index c3cbc32c1aa1e6681331e48e3e9d0277a2df0705..a341807cfc6f4c9ac85947dd9c2432f40d0e373c 100644 --- a/test/fuzz_test/cmsendrequest_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmsendrequest_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,26 +20,15 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmSendRequestFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmsendrequest_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmsendrequest_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include/", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmsendrequest_fuzzer.cpp", - ] + sources = [ "cmsendrequest_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmsendrequest_fuzzer/cmsendrequest_fuzzer.cpp b/test/fuzz_test/cmsendrequest_fuzzer/cmsendrequest_fuzzer.cpp index af35186734720bf94591adc1d642792afb814e3d..0d427cf04f9df1239ddd19ed65f58c55edabef91 100644 --- a/test/fuzz_test/cmsendrequest_fuzzer/cmsendrequest_fuzzer.cpp +++ b/test/fuzz_test/cmsendrequest_fuzzer/cmsendrequest_fuzzer.cpp @@ -18,7 +18,6 @@ #include "cm_fuzz_test_common.h" #include "cm_param.h" #include "cm_request.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -56,7 +55,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)SendRequest(type, &inBlob, &outBlob); CmFree(myData); diff --git a/test/fuzz_test/cmsetcertstatus_fuzzer/BUILD.gn b/test/fuzz_test/cmsetcertstatus_fuzzer/BUILD.gn index 4d2c36ef96fa4cf9469d2baa9684cb73bd39c45e..9b4e274a9dd86e3edf5bea8b6576e24c278594f9 100644 --- a/test/fuzz_test/cmsetcertstatus_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmsetcertstatus_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmSetCertStatusFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmsetcertstatus_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmsetcertstatus_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmsetcertstatus_fuzzer.cpp", - ] + sources = [ "cmsetcertstatus_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmsetcertstatus_fuzzer/cmsetcertstatus_fuzzer.cpp b/test/fuzz_test/cmsetcertstatus_fuzzer/cmsetcertstatus_fuzzer.cpp index 2089560ec7b445938039be4b9d0f1cde9457ffeb..c473980b0deee013ceaba7b63c0851500683eca8 100644 --- a/test/fuzz_test/cmsetcertstatus_fuzzer/cmsetcertstatus_fuzzer.cpp +++ b/test/fuzz_test/cmsetcertstatus_fuzzer/cmsetcertstatus_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -51,7 +50,7 @@ namespace OHOS { bool status; (void)memcpy_s(&status, sizeof(bool), myData + offset, sizeof(bool)); - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmSetCertStatus(&sysCertUri, store, status); CmFree(myData); return true; diff --git a/test/fuzz_test/cmsetusercertstatus_fuzzer/BUILD.gn b/test/fuzz_test/cmsetusercertstatus_fuzzer/BUILD.gn index 590310236eef0557a2bcf6ecd94cef357af100a2..3c0088ef22cb0a095d1a789c9437c630a1b8cbac 100644 --- a/test/fuzz_test/cmsetusercertstatus_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmsetusercertstatus_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmSetUserCertStatusFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmsetusercertstatus_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmsetusercertstatus_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmsetusercertstatus_fuzzer.cpp", - ] + sources = [ "cmsetusercertstatus_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmsetusercertstatus_fuzzer/cmsetusercertstatus_fuzzer.cpp b/test/fuzz_test/cmsetusercertstatus_fuzzer/cmsetusercertstatus_fuzzer.cpp index e281dc748ac0a9a9b6379e6968a438dcc80c0d50..e3abd200a7952db1633ae0b6f6df3bf73cb4a344 100644 --- a/test/fuzz_test/cmsetusercertstatus_fuzzer/cmsetusercertstatus_fuzzer.cpp +++ b/test/fuzz_test/cmsetusercertstatus_fuzzer/cmsetusercertstatus_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -51,7 +50,7 @@ namespace OHOS { bool status; (void)memcpy_s(&status, sizeof(bool), myData + offset, sizeof(bool)); - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmSetUserCertStatus(&setUserUri, userStore, status); CmFree(myData); diff --git a/test/fuzz_test/cmsystemtrustedstore_fuzzer/BUILD.gn b/test/fuzz_test/cmsystemtrustedstore_fuzzer/BUILD.gn index 0393c2aee37b581b337204997801375cd7d78309..c747bd69ea437c17b5dd3d32a80a8aa81aba7654 100644 --- a/test/fuzz_test/cmsystemtrustedstore_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmsystemtrustedstore_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,29 +20,18 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmSystemTrustedStoreFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmsystemtrustedstore_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmsystemtrustedstore_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../services/cert_manager_standard/cert_manager_engine/main/core/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmsystemtrustedstore_fuzzer.cpp", - ] + sources = [ "cmsystemtrustedstore_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/core:cert_manager_engine_core_standard", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmsystemtrustedstore_fuzzer/cmsystemtrustedstore_fuzzer.cpp b/test/fuzz_test/cmsystemtrustedstore_fuzzer/cmsystemtrustedstore_fuzzer.cpp index 900e07b0f5ca641e7be0564547543efa371797ac..5954ad603ee0d3fcd5fbad7bb258e84cc846f6cb 100644 --- a/test/fuzz_test/cmsystemtrustedstore_fuzzer/cmsystemtrustedstore_fuzzer.cpp +++ b/test/fuzz_test/cmsystemtrustedstore_fuzzer/cmsystemtrustedstore_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cm_fuzz_test_common.h" #include "cert_manager_api.h" -#include "cm_test_common.h" #include "cm_ipc_client_serialization.h" #include "cm_ipc_service.h" #include "cm_param.h" @@ -137,7 +136,7 @@ namespace OHOS { uint32_t remainSize = static_cast(size); uint32_t offset = 0; - CertmanagerTest::SetATPermission(); + SetATPermission(); bool ret = false; uint8_t keyUriData[] = "1d3472b9.0"; diff --git a/test/fuzz_test/cmuninstallappcert_fuzzer/BUILD.gn b/test/fuzz_test/cmuninstallappcert_fuzzer/BUILD.gn index 0ebf1a0c4f6be45d83b443049866da966fe8356a..5566b6667d4ac51d25501aa0d18e9a6953b99864 100644 --- a/test/fuzz_test/cmuninstallappcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmuninstallappcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,14 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmUninstallAppCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmuninstallappcert_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmuninstallappcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmuninstallappcert_fuzzer.cpp", - ] + sources = [ "cmuninstallappcert_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmuninstallappcert_fuzzer/cmuninstallappcert_fuzzer.cpp b/test/fuzz_test/cmuninstallappcert_fuzzer/cmuninstallappcert_fuzzer.cpp index 5467aad56864aec9168593747818a7093dc23fc7..aecdd9cb833576e4614f85ddbf8f89309cae5e94 100644 --- a/test/fuzz_test/cmuninstallappcert_fuzzer/cmuninstallappcert_fuzzer.cpp +++ b/test/fuzz_test/cmuninstallappcert_fuzzer/cmuninstallappcert_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -44,7 +43,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmUninstallAppCert(&rmKeyUri, store); CmFree(myData); diff --git a/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/BUILD.gn b/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/BUILD.gn index b54b6828244dbfcf88e01558b4fb22ae30cdffdc..a140027dc5b1dcd0f4599e75a91db7bd180cce5b 100644 --- a/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,13 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmUninstallUserTrustedCertFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmuninstallusertrustedcert_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmuninstallusertrustedcert_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmuninstallusertrustedcert_fuzzer.cpp", - ] + sources = [ "cmuninstallusertrustedcert_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/cmuninstallusertrustedcert_fuzzer.cpp b/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/cmuninstallusertrustedcert_fuzzer.cpp index be583d8eb529d0216f0e3935cd67f584493a17ad..5b05598fe96b8a1346178d3f1f8b301fc06cbd3a 100644 --- a/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/cmuninstallusertrustedcert_fuzzer.cpp +++ b/test/fuzz_test/cmuninstallusertrustedcert_fuzzer/cmuninstallusertrustedcert_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -37,7 +36,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmUninstallUserTrustedCert(&rmUserUri); CmFree(myData); return true; diff --git a/test/fuzz_test/cmupdate_fuzzer/BUILD.gn b/test/fuzz_test/cmupdate_fuzzer/BUILD.gn index 58af3ed27a52fbc2a69e8116c6d78a10bb7a67d1..2e6fa41768cbed5fb391bc2d43060f87c609a288 100644 --- a/test/fuzz_test/cmupdate_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmupdate_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,25 +20,13 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmUpdateFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmupdate_fuzzer" + fuzz_config_file = "${cert_manager_root_dir}/test/fuzz_test/cmupdate_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmupdate_fuzzer.cpp", - ] + sources = [ "cmupdate_fuzzer.cpp" ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmupdate_fuzzer/cmupdate_fuzzer.cpp b/test/fuzz_test/cmupdate_fuzzer/cmupdate_fuzzer.cpp index 8ccdb122eda2e779cb1a1953d66835dd8976ea90..34a5c074a7cdd5a6edb1124036386ed4c7c914e1 100644 --- a/test/fuzz_test/cmupdate_fuzzer/cmupdate_fuzzer.cpp +++ b/test/fuzz_test/cmupdate_fuzzer/cmupdate_fuzzer.cpp @@ -17,7 +17,6 @@ #include "cert_manager_api.h" #include "cm_fuzz_test_common.h" -#include "cm_test_common.h" using namespace CmFuzzTest; namespace OHOS { @@ -46,7 +45,7 @@ namespace OHOS { return false; } - CertmanagerTest::SetATPermission(); + SetATPermission(); (void)CmUpdate(&upHandle, &inData); CmFree(myData); diff --git a/test/fuzz_test/cmusertrustedstore_fuzzer/BUILD.gn b/test/fuzz_test/cmusertrustedstore_fuzzer/BUILD.gn index 543075c19c43e166cf0dced5d88325808d7195d7..b9faeb0f4ad1fd8393cbeba1f684130c0ea64696 100644 --- a/test/fuzz_test/cmusertrustedstore_fuzzer/BUILD.gn +++ b/test/fuzz_test/cmusertrustedstore_fuzzer/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/config/features.gni") import("//build/test.gni") @@ -19,29 +20,18 @@ module_output_path = "certificate_manager/certificate_manager" ##############################fuzztest########################################## ohos_fuzztest("CmUserTrustedStoreFuzzTest") { module_out_path = module_output_path - fuzz_config_file = "../../../test/fuzz_test/cmusertrustedstore_fuzzer" + fuzz_config_file = + "${cert_manager_root_dir}/test/fuzz_test/cmusertrustedstore_fuzzer" - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - "../../../services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc", - "../../../services/cert_manager_standard/cert_manager_engine/main/core/include", - "../../../test/unittest/include", - ] - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ - "../../../test/unittest/src/cm_test_common.cpp", - "cmusertrustedstore_fuzzer.cpp", - ] + sources = [ "cmusertrustedstore_fuzzer.cpp" ] deps = [ - "../../../services/cert_manager_standard:cert_manager_service", - "../../../test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/services/cert_manager_standard:cert_manager_service", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_engine/main/core:cert_manager_engine_core_standard", + "${cert_manager_root_dir}/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl:libcm_service_idl_standard_static", + "${cert_manager_root_dir}/test/fuzz_test/fuzz_test_common:libcert_manager_fuzz_test_common_static", ] external_deps = [ "access_token:libaccesstoken_sdk", diff --git a/test/fuzz_test/cmusertrustedstore_fuzzer/cmusertrustedstore_fuzzer.cpp b/test/fuzz_test/cmusertrustedstore_fuzzer/cmusertrustedstore_fuzzer.cpp index a4a2d9749cc8212b5971949bc84236960e6c3a0c..5cbb136413b32d254ddf2313e6ba49ff03a05fe8 100644 --- a/test/fuzz_test/cmusertrustedstore_fuzzer/cmusertrustedstore_fuzzer.cpp +++ b/test/fuzz_test/cmusertrustedstore_fuzzer/cmusertrustedstore_fuzzer.cpp @@ -17,15 +17,16 @@ #include "cm_fuzz_test_common.h" #include "cert_manager_api.h" -#include "cm_test_common.h" #include "cm_cert_data_user.h" #include "cm_ipc_client_serialization.h" #include "cm_ipc_service.h" #include "cm_param.h" #include "cert_manager_status.h" +#include "cm_type.h" using namespace CmFuzzTest; namespace OHOS { + constexpr uint32_t TEST_USERID = 100; constexpr uint32_t MIN_DATA_USE_TIME = 10; static bool InstallUserCert(uint8_t *tmpData, uint32_t *remainSize, uint32_t *offset, struct CmBlob *keyUri) { @@ -201,7 +202,7 @@ namespace OHOS { uint32_t remainSize = static_cast(size); uint32_t offset = 0; - CertmanagerTest::SetATPermission(); + SetATPermission(); bool ret = false; uint8_t keyUriData[] = "1d3472b9.0"; diff --git a/test/fuzz_test/fuzz_test_common/BUILD.gn b/test/fuzz_test/fuzz_test_common/BUILD.gn index c50648191b9761ed190f270a1cc9938e2464eb57..dd124645764f053cc41a480c4fec2e6aabd6da0b 100644 --- a/test/fuzz_test/fuzz_test_common/BUILD.gn +++ b/test/fuzz_test/fuzz_test_common/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/ohos.gni") config("cert_manager_config") { @@ -21,24 +22,17 @@ ohos_static_library("libcert_manager_fuzz_test_common_static") { subsystem_name = "security" part_name = "certificate_manager" public_configs = [ ":cert_manager_config" ] - include_dirs = [ - "../../../frameworks/cert_manager_standard/main/common/include", - "../../../frameworks/cert_manager_standard/main/os_dependency/cm_ipc/include", - "../../../interfaces/innerkits/cert_manager_standard/main/include", - ] + sources = [ "src/cm_fuzz_test_common.cpp" ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - defines = [ - "L2_STANDARD", - "_CM_LOG_ENABLE_", - ] deps = [ - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main/os_dependency:libcert_manager_ipc_client_static", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "c_utils:utils", "ipc:ipc_core", ] diff --git a/test/fuzz_test/fuzz_test_common/include/cm_cert_data_rsa.h b/test/fuzz_test/fuzz_test_common/include/cm_cert_data_rsa.h new file mode 100644 index 0000000000000000000000000000000000000000..660ecd6ab9d8cde70909adb7a4977ab6cdfe85d9 --- /dev/null +++ b/test/fuzz_test/fuzz_test_common/include/cm_cert_data_rsa.h @@ -0,0 +1,211 @@ +/* + * Copyright (c) 2022 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef CM_CERT_DATA_RSA_H +#define CM_CERT_DATA_RSA_H + +static const uint8_t g_certPwd[] = "123456"; +static const uint8_t g_rsa2048P12CertInfo[] = { + 0x30, 0x82, 0x0b, 0xc1, 0x02, 0x01, 0x03, 0x30, 0x82, 0x0b, 0x87, 0x06, 0x09, 0x2a, 0x86, 0x48, + 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x0b, 0x78, 0x04, 0x82, 0x0b, 0x74, 0x30, 0x82, + 0x0b, 0x70, 0x30, 0x82, 0x06, 0x27, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, + 0x06, 0xa0, 0x82, 0x06, 0x18, 0x30, 0x82, 0x06, 0x14, 0x02, 0x01, 0x00, 0x30, 0x82, 0x06, 0x0d, + 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0x30, 0x1c, 0x06, 0x0a, 0x2a, + 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x01, 0x03, 0x30, 0x0e, 0x04, 0x08, 0x1a, 0x8f, 0xc1, + 0xd1, 0xda, 0x6c, 0xd1, 0xa9, 0x02, 0x02, 0x08, 0x00, 0x80, 0x82, 0x05, 0xe0, 0xd0, 0x2f, 0x2d, + 0x52, 0x09, 0x86, 0x55, 0x53, 0xf0, 0x49, 0x8f, 0x00, 0xa1, 0x4d, 0x21, 0xc8, 0xb4, 0xad, 0x27, + 0x12, 0x44, 0xab, 0x4d, 0x10, 0x14, 0xe3, 0x3c, 0x9a, 0x05, 0x77, 0x51, 0x90, 0x4a, 0x3a, 0x8a, + 0x09, 0xa9, 0x4b, 0x36, 0x50, 0x60, 0x22, 0x4b, 0x77, 0x12, 0x5c, 0x2f, 0x60, 0xd3, 0xd9, 0x30, + 0x94, 0x4d, 0x9e, 0x81, 0xc3, 0xe9, 0x9d, 0xd9, 0x47, 0xb3, 0x54, 0xa2, 0x9a, 0x8f, 0xe7, 0x58, + 0x95, 0xd7, 0x48, 0x87, 0xc4, 0x40, 0xad, 0x9a, 0x42, 0x1d, 0x36, 0xb7, 0x48, 0xbc, 0x70, 0x8c, + 0x84, 0xcb, 0x3c, 0x02, 0x25, 0x9f, 0xfe, 0x2c, 0x4a, 0x76, 0xb1, 0x27, 0x94, 0x8f, 0xb0, 0x07, + 0xf0, 0xc0, 0x00, 0x3a, 0x69, 0x16, 0xe1, 0x63, 0x0c, 0xe5, 0x92, 0xc2, 0x7d, 0x99, 0xd9, 0x11, + 0x40, 0xd8, 0x64, 0xab, 0x13, 0xda, 0x73, 0x7b, 0x12, 0x53, 0xb1, 0x0b, 0x0c, 0x67, 0x81, 0xe1, + 0xf5, 0x59, 0x3a, 0xc7, 0xe0, 0xe9, 0xda, 0x12, 0xc7, 0x2b, 0xab, 0x3d, 0xbc, 0x10, 0x3d, 0x1a, + 0x88, 0xc7, 0x1d, 0x31, 0x5f, 0x39, 0x63, 0x51, 0x8b, 0x11, 0x99, 0x05, 0xf9, 0x40, 0x42, 0x27, + 0xad, 0x75, 0x6f, 0xe2, 0x2d, 0x66, 0x28, 0x97, 0x7c, 0x6f, 0xf4, 0xfc, 0x95, 0xaa, 0x67, 0x81, + 0xd8, 0x15, 0x3c, 0xf4, 0x7b, 0x97, 0x08, 0x7b, 0x1b, 0x8c, 0xd3, 0x45, 0x8b, 0x96, 0x54, 0x2c, + 0xb1, 0x00, 0x87, 0x59, 0x5c, 0x94, 0x78, 0x29, 0xaa, 0x7b, 0x9c, 0x5c, 0x61, 0xff, 0xcc, 0x32, + 0x14, 0x4e, 0xc3, 0x1b, 0x96, 0xad, 0x4c, 0xde, 0x49, 0xe4, 0x8e, 0x63, 0x52, 0x5d, 0x24, 0x9c, + 0xd3, 0x45, 0xed, 0x98, 0xe1, 0x6e, 0x15, 0xcd, 0x76, 0xa1, 0x0b, 0x67, 0x84, 0x79, 0xbc, 0xb0, + 0x9c, 0x3e, 0xff, 0x48, 0xf9, 0xc1, 0xab, 0x76, 0xc4, 0xe4, 0x61, 0x84, 0x7a, 0xb0, 0x88, 0xa2, + 0x14, 0x0a, 0xdc, 0x01, 0x47, 0xff, 0xf6, 0x27, 0x46, 0x1e, 0x37, 0xe5, 0x5e, 0x9a, 0x55, 0x49, + 0x67, 0x7b, 0x04, 0xba, 0xef, 0x89, 0x32, 0x8a, 0x2b, 0x72, 0x8c, 0xb9, 0xba, 0x19, 0xfa, 0x09, + 0x7f, 0x24, 0xea, 0xbd, 0xcc, 0xa5, 0x3c, 0xa8, 0xc6, 0x30, 0x0f, 0xcf, 0xd2, 0xf3, 0x10, 0xed, + 0x5c, 0x7d, 0xbb, 0x0a, 0x6a, 0x27, 0x60, 0x32, 0x9a, 0xa2, 0xfb, 0x2c, 0x38, 0xd2, 0x62, 0x92, + 0x5d, 0x77, 0xe8, 0xb8, 0x3a, 0x64, 0xfe, 0xb8, 0x2f, 0x69, 0xc4, 0xdd, 0x78, 0xdd, 0x92, 0xeb, + 0xc3, 0x08, 0xc2, 0x05, 0xef, 0xa6, 0x9c, 0x12, 0xd5, 0x48, 0x27, 0xfb, 0x19, 0x66, 0x66, 0x24, + 0x52, 0x47, 0xf1, 0x7c, 0xad, 0xc9, 0xb8, 0x1a, 0xd0, 0x2d, 0x40, 0xe9, 0x36, 0xce, 0x9e, 0x07, + 0x06, 0xd0, 0xe3, 0x5d, 0x98, 0xfb, 0x67, 0x1a, 0xd1, 0x62, 0x35, 0x03, 0xe8, 0x34, 0xf0, 0xfd, + 0x24, 0xe4, 0x06, 0x52, 0x03, 0xda, 0x8e, 0x68, 0x6d, 0x74, 0xfd, 0xda, 0x9b, 0xca, 0x8e, 0x52, + 0x71, 0x9c, 0x14, 0x05, 0x10, 0x61, 0x63, 0xa4, 0x53, 0x72, 0x4a, 0xda, 0x15, 0xf8, 0x0a, 0x56, + 0x89, 0x00, 0xdd, 0x87, 0xf5, 0xdd, 0x69, 0xd6, 0x6c, 0x89, 0x15, 0x1a, 0x1f, 0x48, 0xd6, 0x2c, + 0x1e, 0x4f, 0x23, 0x06, 0x6e, 0x34, 0x0d, 0x4e, 0xe3, 0x17, 0x40, 0x22, 0x7a, 0x68, 0x37, 0xad, + 0x05, 0xdb, 0x99, 0xde, 0x1a, 0x47, 0x2f, 0xb1, 0x9e, 0x7e, 0xdb, 0xad, 0x69, 0x06, 0x25, 0xd5, + 0xd9, 0x8e, 0xaf, 0xe2, 0xaa, 0x5a, 0x9a, 0x79, 0xd6, 0xeb, 0x02, 0x10, 0xf8, 0x72, 0x78, 0x4e, + 0x51, 0x2a, 0x53, 0x55, 0xb9, 0xd3, 0x7c, 0x31, 0x42, 0xff, 0x59, 0x39, 0x92, 0xd6, 0xec, 0x46, + 0x2d, 0x4f, 0xea, 0xf1, 0x0e, 0x83, 0x57, 0x55, 0x7b, 0xf1, 0x43, 0x47, 0x82, 0x10, 0x0d, 0x72, + 0xa2, 0x40, 0x2e, 0xf7, 0x2d, 0xcb, 0x80, 0x5b, 0x8a, 0x02, 0x5b, 0x71, 0xd9, 0xa5, 0x55, 0xea, + 0x41, 0x3f, 0x15, 0x9b, 0xee, 0x92, 0x4a, 0x3e, 0x87, 0x2e, 0xc3, 0xba, 0x71, 0x81, 0x57, 0xb9, + 0x7e, 0xb3, 0xd7, 0x52, 0x05, 0x91, 0x57, 0x87, 0x16, 0x48, 0x36, 0xdb, 0x4b, 0x45, 0x32, 0xaf, + 0x22, 0xc0, 0x3b, 0xc8, 0x90, 0xce, 0x53, 0xf3, 0x85, 0x64, 0xa3, 0x04, 0xe7, 0xfc, 0xa8, 0xc1, + 0x12, 0x77, 0x4a, 0x22, 0xd6, 0xfb, 0x01, 0x8f, 0x78, 0xd3, 0x2d, 0x33, 0x4c, 0xc8, 0x9d, 0x89, + 0xd7, 0x1f, 0xf2, 0x50, 0xf7, 0x94, 0x13, 0xe7, 0x3b, 0x4e, 0x36, 0x56, 0x93, 0x1a, 0xc7, 0x7e, + 0x4f, 0x92, 0xa2, 0xae, 0x4d, 0x9d, 0xbc, 0x03, 0xd4, 0x07, 0x76, 0x38, 0xc1, 0x59, 0x59, 0x3d, + 0xc9, 0xcf, 0xdd, 0x43, 0xcc, 0x82, 0xdb, 0xc1, 0x85, 0xbe, 0x3e, 0xab, 0x18, 0xd7, 0x7d, 0x17, + 0xc9, 0x9c, 0x9c, 0x81, 0x5b, 0xa8, 0x03, 0x04, 0x62, 0xc4, 0xd8, 0x78, 0x95, 0xd0, 0xfa, 0x8e, + 0x71, 0x43, 0x30, 0x3b, 0xdd, 0x64, 0x54, 0xb5, 0xd2, 0xa6, 0x0d, 0x8a, 0x73, 0x97, 0x46, 0x81, + 0xd6, 0x61, 0x61, 0x41, 0x07, 0xed, 0x23, 0x32, 0xd2, 0x20, 0x18, 0x27, 0x2b, 0x89, 0x8e, 0x3b, + 0xd7, 0x6e, 0xed, 0x50, 0x3f, 0xcb, 0x27, 0xab, 0xb5, 0x26, 0x9b, 0x9e, 0xe4, 0xe3, 0x2a, 0x88, + 0xf5, 0x4f, 0xf7, 0xb8, 0xc4, 0x11, 0xb0, 0x0c, 0xd7, 0x85, 0x3a, 0xc9, 0x65, 0x06, 0x43, 0xbf, + 0x66, 0x19, 0xf2, 0x2a, 0xed, 0x36, 0xf0, 0xf6, 0x39, 0x78, 0xd2, 0x4b, 0xe6, 0x20, 0x64, 0x66, + 0xe2, 0x87, 0x73, 0x5d, 0x09, 0x98, 0xe5, 0x06, 0xc1, 0xc7, 0xdf, 0x47, 0x12, 0x3a, 0xe0, 0xd6, + 0x7f, 0xb4, 0x29, 0x46, 0x3e, 0x49, 0x8f, 0x3d, 0xea, 0xd6, 0x0b, 0x36, 0xa3, 0xd2, 0xa3, 0x6b, + 0x9c, 0x0c, 0xe0, 0x47, 0x58, 0xbf, 0xfd, 0x42, 0xa2, 0x94, 0xe9, 0xd1, 0xfd, 0xc4, 0xcc, 0x68, + 0x32, 0x3a, 0x1e, 0xd2, 0x6f, 0x6b, 0x48, 0xe1, 0x48, 0xe0, 0x20, 0x23, 0xfc, 0x7c, 0xf9, 0x30, + 0xb1, 0xb0, 0x0e, 0x3c, 0x14, 0xf6, 0x73, 0x17, 0x1c, 0x71, 0x4c, 0xd9, 0x1d, 0x16, 0xcf, 0x31, + 0x6d, 0x79, 0xd6, 0x99, 0x66, 0xd5, 0x7f, 0xe7, 0xc2, 0x0d, 0xb8, 0xcb, 0xdb, 0x5e, 0x26, 0x95, + 0x35, 0xf1, 0x57, 0x5c, 0xec, 0xcd, 0xf0, 0xdb, 0xb4, 0x18, 0x7f, 0x04, 0x22, 0x50, 0xbe, 0xb3, + 0x04, 0x5c, 0xcd, 0x3a, 0x62, 0xe2, 0x3b, 0x5f, 0xa1, 0xa0, 0xd8, 0xd1, 0xf0, 0x45, 0x43, 0xf4, + 0xee, 0x27, 0x4f, 0x45, 0xb7, 0x06, 0x46, 0x53, 0x65, 0x49, 0xca, 0x4c, 0x12, 0xc9, 0x5b, 0x05, + 0xb6, 0xf6, 0x26, 0x5d, 0x90, 0x4a, 0x9b, 0x50, 0xaf, 0x65, 0x92, 0x13, 0xfc, 0xc2, 0x47, 0xff, + 0xe8, 0xb6, 0x4e, 0xd2, 0xa7, 0x48, 0x8c, 0xbe, 0x3a, 0x13, 0x2e, 0xe6, 0xb9, 0xb7, 0x29, 0x2d, + 0x30, 0xaa, 0x80, 0xcf, 0x74, 0x77, 0x14, 0xb2, 0x78, 0x52, 0x25, 0xf6, 0x97, 0x99, 0x40, 0x9a, + 0xea, 0xce, 0x92, 0x68, 0xb9, 0x5c, 0x9e, 0xf4, 0xbf, 0xd9, 0xd4, 0x43, 0x7d, 0xf6, 0x10, 0x05, + 0x9d, 0xa4, 0xe2, 0x8f, 0x8e, 0x2e, 0xce, 0x07, 0x57, 0x7b, 0xa2, 0xb2, 0x90, 0xd7, 0xd5, 0x66, + 0x12, 0xaa, 0x27, 0xce, 0xcb, 0x0a, 0xe9, 0x59, 0x47, 0xbd, 0x3e, 0x65, 0xd9, 0x83, 0xa2, 0x65, + 0x27, 0x06, 0x7f, 0x04, 0xc3, 0x35, 0xba, 0x55, 0x3d, 0x68, 0xc7, 0x0c, 0xa2, 0x50, 0xc3, 0xb1, + 0x66, 0x65, 0x7f, 0x74, 0xda, 0x05, 0x11, 0x89, 0xaf, 0xf2, 0x04, 0x8b, 0x60, 0x1d, 0xbf, 0x06, + 0x84, 0x7c, 0x1d, 0xcd, 0xcb, 0x5e, 0xf3, 0xfa, 0xfd, 0x1a, 0xb0, 0x1f, 0xc1, 0x6e, 0x91, 0x67, + 0xaa, 0x05, 0x9e, 0x2d, 0x6f, 0x4c, 0xdb, 0xab, 0x99, 0x83, 0x81, 0x80, 0x21, 0xbd, 0x17, 0x50, + 0x59, 0x3b, 0x16, 0x3a, 0x66, 0x2b, 0xd9, 0xab, 0x3f, 0x4a, 0xb1, 0xa3, 0x56, 0x9e, 0xbd, 0xd3, + 0x4a, 0x85, 0x63, 0x58, 0xa5, 0xbb, 0xdf, 0x64, 0x79, 0x43, 0x8d, 0x78, 0xa3, 0x88, 0x8e, 0x0d, + 0xbe, 0x1a, 0x14, 0xc2, 0xcf, 0x48, 0x0c, 0x55, 0xa8, 0xd6, 0xea, 0xdb, 0x5d, 0x50, 0x90, 0x84, + 0xfd, 0xe9, 0xd1, 0x90, 0xfe, 0xeb, 0xd8, 0xd1, 0x9c, 0xbe, 0xd5, 0x92, 0xd8, 0x71, 0x58, 0x58, + 0xc1, 0xbf, 0x4c, 0xe2, 0xa9, 0xd5, 0xc1, 0xce, 0x4a, 0xec, 0xde, 0xb3, 0x0a, 0xa2, 0xc0, 0x00, + 0xa2, 0xfa, 0x6a, 0x83, 0x9b, 0xae, 0x6e, 0x1f, 0x35, 0x8b, 0xcf, 0xcc, 0x3f, 0xdc, 0xac, 0x68, + 0x2a, 0x50, 0x65, 0x56, 0xb8, 0x2c, 0x92, 0xff, 0xc2, 0x1a, 0xd4, 0x4e, 0x12, 0x3d, 0x40, 0x67, + 0x62, 0x75, 0xcd, 0x4f, 0x1b, 0x45, 0xff, 0xbf, 0x46, 0xf8, 0xa2, 0xd1, 0xd2, 0xc9, 0xe6, 0xb6, + 0x26, 0x55, 0xd9, 0x55, 0xc9, 0x7b, 0xe4, 0xa9, 0x69, 0x43, 0x13, 0xdb, 0x7d, 0x8f, 0xaa, 0x02, + 0x15, 0x24, 0x6d, 0x80, 0x1f, 0x42, 0x7b, 0x32, 0x76, 0xbd, 0x0c, 0xcd, 0x3c, 0x5e, 0x55, 0x4f, + 0x49, 0xf1, 0x28, 0x6d, 0xc1, 0x36, 0x39, 0x93, 0x57, 0xf5, 0x83, 0xc2, 0x9e, 0xbb, 0x7b, 0x05, + 0xbe, 0x89, 0xab, 0x80, 0x93, 0xf0, 0x9c, 0xc3, 0x97, 0xcf, 0x03, 0x25, 0xb5, 0x2e, 0x6b, 0x18, + 0xe8, 0x72, 0x46, 0x0c, 0x8f, 0xc0, 0x27, 0x52, 0x31, 0x2c, 0x20, 0x96, 0x30, 0x29, 0x66, 0xa5, + 0x70, 0x9f, 0xbf, 0xfa, 0xb3, 0x4c, 0xfd, 0xd1, 0x73, 0xf4, 0x3c, 0x29, 0x74, 0xac, 0xa9, 0xc0, + 0xb4, 0x16, 0x72, 0x4a, 0x7f, 0x07, 0xe3, 0xfe, 0xd5, 0xa0, 0x3f, 0x47, 0x86, 0x59, 0x10, 0xbc, + 0xff, 0x0d, 0x0e, 0xdc, 0xc9, 0x6d, 0x8f, 0xb0, 0xc7, 0x78, 0xd7, 0xa2, 0x79, 0xdd, 0x6b, 0x10, + 0x8b, 0x9f, 0x3c, 0xba, 0x14, 0xe5, 0x3a, 0xf1, 0x1f, 0xb5, 0x84, 0xc1, 0x6a, 0xd5, 0xad, 0x59, + 0xe8, 0x15, 0x22, 0x33, 0xb6, 0x79, 0x6d, 0xe1, 0x59, 0xb9, 0xa7, 0x0f, 0x4c, 0xcc, 0x5f, 0x2a, + 0xbd, 0xab, 0x0e, 0x45, 0x47, 0x0c, 0x8d, 0x8a, 0xe3, 0xfb, 0x61, 0x64, 0x51, 0x36, 0x87, 0x04, + 0xc7, 0xd8, 0x16, 0x46, 0x9f, 0xa4, 0x35, 0xd0, 0xa6, 0x1a, 0x85, 0xf0, 0x91, 0x34, 0xfe, 0xe7, + 0x0b, 0xd2, 0xd7, 0x91, 0x46, 0xd0, 0xfe, 0xa9, 0xfb, 0xd7, 0xf7, 0x4d, 0x81, 0x95, 0x1b, 0x96, + 0x51, 0x21, 0xa5, 0xdc, 0xee, 0x25, 0xbe, 0xb2, 0x7d, 0x3f, 0x7b, 0x35, 0x05, 0x92, 0x30, 0x5d, + 0x2d, 0x57, 0x53, 0x45, 0xa7, 0x51, 0xab, 0x09, 0x71, 0xe0, 0x01, 0x96, 0x1c, 0x9b, 0xa5, 0x2d, + 0xcf, 0xff, 0x0e, 0x80, 0xf5, 0xa4, 0x3c, 0x52, 0xa6, 0xf3, 0x16, 0x96, 0xa6, 0x64, 0xac, 0x7e, + 0xaf, 0xb7, 0xc6, 0x34, 0xfd, 0xf7, 0x0a, 0x10, 0xe6, 0x2b, 0xda, 0x10, 0xdd, 0xb2, 0x44, 0x8d, + 0x95, 0x71, 0xbf, 0xb1, 0xf3, 0x91, 0xac, 0xc6, 0x93, 0xe1, 0x91, 0x62, 0x05, 0x90, 0x38, 0x33, + 0xcf, 0x36, 0xff, 0xa5, 0x82, 0x4e, 0x14, 0x78, 0x33, 0x40, 0x18, 0x22, 0xd6, 0x60, 0x6b, 0x0b, + 0x97, 0x4f, 0x2d, 0xd0, 0x36, 0x82, 0xb3, 0x1a, 0xe8, 0xd7, 0x93, 0xff, 0x19, 0xd1, 0x74, 0xd2, + 0x29, 0xe1, 0x97, 0x60, 0x09, 0x48, 0xef, 0xc9, 0x61, 0xae, 0x3b, 0x4f, 0xd4, 0x30, 0x82, 0x05, + 0x41, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x82, 0x05, 0x32, + 0x04, 0x82, 0x05, 0x2e, 0x30, 0x82, 0x05, 0x2a, 0x30, 0x82, 0x05, 0x26, 0x06, 0x0b, 0x2a, 0x86, + 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x0a, 0x01, 0x02, 0xa0, 0x82, 0x04, 0xee, 0x30, 0x82, 0x04, + 0xea, 0x30, 0x1c, 0x06, 0x0a, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x0c, 0x01, 0x03, 0x30, + 0x0e, 0x04, 0x08, 0x2b, 0xef, 0x2d, 0x9b, 0x33, 0xf6, 0x82, 0x62, 0x02, 0x02, 0x08, 0x00, 0x04, + 0x82, 0x04, 0xc8, 0x59, 0x60, 0xea, 0x6e, 0x23, 0x9e, 0x82, 0x1c, 0x0a, 0x8e, 0xbd, 0x09, 0x94, + 0x98, 0x5e, 0x1a, 0x1b, 0x4a, 0xfe, 0x86, 0x2d, 0xf4, 0x54, 0xaa, 0x17, 0xba, 0xf1, 0xf1, 0x58, + 0x12, 0xa2, 0x81, 0x1c, 0x29, 0xe7, 0x94, 0x78, 0xbc, 0x68, 0x07, 0x8f, 0xdb, 0x3f, 0xab, 0xa7, + 0xa7, 0x73, 0x6d, 0xea, 0x25, 0x6f, 0x97, 0xc8, 0xba, 0x73, 0xcc, 0x1e, 0xa0, 0x73, 0x18, 0x14, + 0xe8, 0xae, 0xe0, 0x5d, 0x3c, 0x9b, 0x9e, 0xad, 0xf4, 0x46, 0xeb, 0xa4, 0x73, 0xe2, 0xb5, 0x16, + 0x8f, 0x70, 0x35, 0xe7, 0x84, 0x2d, 0x02, 0xc7, 0xc3, 0x9d, 0x1e, 0x91, 0xba, 0x47, 0xfe, 0xf2, + 0x43, 0xc2, 0x9e, 0xeb, 0x68, 0x87, 0xeb, 0x3b, 0x9a, 0x59, 0x87, 0xf6, 0x2a, 0x1e, 0xf0, 0x07, + 0x13, 0xd0, 0xc0, 0x0f, 0xe7, 0x41, 0xb7, 0x5e, 0xb2, 0x2d, 0x12, 0xd2, 0x99, 0x6f, 0x90, 0x29, + 0xf2, 0x96, 0x9e, 0xfc, 0x00, 0x75, 0xab, 0x2f, 0x87, 0x49, 0x0e, 0xe6, 0xaf, 0x46, 0xe2, 0x69, + 0x88, 0x8f, 0xd3, 0x45, 0xda, 0xcc, 0x4c, 0xf6, 0xfd, 0xaa, 0xda, 0x83, 0x77, 0xee, 0xf9, 0x4a, + 0xa9, 0x31, 0x50, 0x8d, 0x8d, 0x86, 0x89, 0xb2, 0xf3, 0xcf, 0x9b, 0xba, 0xef, 0xa2, 0x09, 0x7c, + 0x72, 0x49, 0xf2, 0xf3, 0x86, 0xa2, 0x78, 0x3e, 0xbf, 0x61, 0x2a, 0x18, 0x96, 0xa2, 0x17, 0xe2, + 0x63, 0x75, 0xfd, 0xf0, 0x82, 0xd6, 0x36, 0x5b, 0x44, 0xf3, 0x9a, 0x96, 0x29, 0x1c, 0x50, 0x91, + 0x20, 0xbb, 0x7b, 0x2d, 0x96, 0xe1, 0x0e, 0xc6, 0xce, 0x01, 0x40, 0xe8, 0x22, 0xc5, 0xac, 0x3f, + 0xfa, 0xd0, 0xac, 0xc9, 0x4e, 0x1e, 0x20, 0x8a, 0xc6, 0x40, 0xed, 0x6b, 0xb6, 0xc4, 0xc1, 0x43, + 0xec, 0x3c, 0xfe, 0xb7, 0x50, 0x19, 0x09, 0x1b, 0x21, 0x83, 0x63, 0x93, 0x18, 0xbd, 0x73, 0x42, + 0x73, 0x25, 0x4f, 0xda, 0xdb, 0x4f, 0xf9, 0xba, 0x11, 0xf3, 0x91, 0xc0, 0x5b, 0x9d, 0x93, 0xfd, + 0x94, 0x89, 0xb6, 0xea, 0x90, 0x15, 0xe5, 0xf0, 0xe8, 0xd8, 0x31, 0x2c, 0xe0, 0x92, 0x6a, 0xb7, + 0xe3, 0x43, 0x51, 0xfc, 0xa0, 0x20, 0x2b, 0x5c, 0xbb, 0xf0, 0x22, 0x2b, 0xa5, 0x00, 0x40, 0xe9, + 0x0d, 0x64, 0xf0, 0xe7, 0xca, 0x29, 0x85, 0xfc, 0x89, 0x38, 0x03, 0xaa, 0x0c, 0xad, 0x71, 0xe6, + 0xc9, 0xde, 0x42, 0x5e, 0x97, 0x74, 0x35, 0x6a, 0x88, 0x94, 0x99, 0xd5, 0xbd, 0x91, 0xa5, 0x92, + 0x35, 0x1d, 0xf4, 0x11, 0xf7, 0x7e, 0x47, 0x96, 0xe4, 0x2f, 0x85, 0x75, 0x3a, 0x16, 0x2a, 0x45, + 0x96, 0xd7, 0xb1, 0x8f, 0xd5, 0x64, 0x87, 0x5d, 0xd0, 0x44, 0x1e, 0xd6, 0x67, 0x0c, 0xc6, 0xdb, + 0xb4, 0x0a, 0xe4, 0x18, 0x0c, 0x12, 0x73, 0xb5, 0x4f, 0x44, 0xc8, 0xd6, 0x97, 0x8b, 0x99, 0x19, + 0x66, 0x55, 0x08, 0xcb, 0xa0, 0xca, 0x9e, 0x09, 0x0f, 0xe1, 0x8b, 0xd7, 0xa1, 0x12, 0x54, 0x46, + 0x2d, 0x09, 0x44, 0x27, 0x30, 0xcd, 0x02, 0xcc, 0x88, 0x8f, 0x69, 0x22, 0xed, 0x31, 0x25, 0x14, + 0x5f, 0x37, 0x5f, 0xce, 0x91, 0x95, 0x30, 0x07, 0x32, 0xaa, 0x2e, 0x55, 0x9a, 0xc4, 0x33, 0xab, + 0xd0, 0x55, 0x3d, 0x04, 0xe3, 0x84, 0x0c, 0xf1, 0xe4, 0xe6, 0x52, 0x39, 0x0e, 0x22, 0x8b, 0x4f, + 0xf3, 0x5c, 0xc2, 0xc7, 0xc3, 0xd4, 0xc1, 0x5c, 0x45, 0x83, 0xee, 0x37, 0x3e, 0xa7, 0xd9, 0xa2, + 0x9c, 0x5b, 0x4b, 0x6b, 0xdf, 0xc5, 0x5c, 0x50, 0x12, 0x1d, 0x6c, 0x73, 0xea, 0xf4, 0xdc, 0x70, + 0x3f, 0x11, 0x70, 0x0e, 0x3d, 0x4d, 0x8c, 0x69, 0xaf, 0x8b, 0x6a, 0x20, 0x75, 0x55, 0xeb, 0x6e, + 0x27, 0x21, 0x5d, 0x9c, 0xdb, 0xbb, 0xf7, 0xf9, 0x3e, 0x81, 0x2f, 0x4f, 0x96, 0xcb, 0x2e, 0xb1, + 0xc3, 0x01, 0x1f, 0xa7, 0x87, 0x43, 0xc8, 0x89, 0xec, 0x5b, 0x41, 0x42, 0x2e, 0x19, 0x0b, 0xdf, + 0x3a, 0x90, 0xaa, 0x98, 0x2f, 0xe9, 0xad, 0x02, 0xf9, 0x96, 0x40, 0x51, 0xdd, 0x4b, 0x8b, 0xe5, + 0xca, 0x84, 0xe2, 0x93, 0xdd, 0xad, 0x43, 0x37, 0x62, 0x14, 0xa1, 0x07, 0x17, 0x5d, 0x71, 0x73, + 0xc0, 0xd8, 0x02, 0x0f, 0x44, 0xcf, 0x5e, 0x6f, 0x55, 0x44, 0x70, 0xa6, 0x22, 0xe7, 0x2d, 0xc3, + 0x2c, 0x44, 0xc3, 0x0e, 0xf1, 0xda, 0x02, 0x57, 0x40, 0x24, 0x36, 0xc8, 0xf9, 0x4f, 0x17, 0x0b, + 0x9b, 0x2a, 0xa8, 0x0d, 0x84, 0xf1, 0x49, 0x3b, 0x6d, 0x23, 0xb9, 0x97, 0x47, 0x2a, 0x0b, 0xc3, + 0x80, 0xe5, 0xdf, 0x4e, 0x1f, 0x94, 0xd1, 0x0e, 0x69, 0xb5, 0xb0, 0xf8, 0xa5, 0x7d, 0x9c, 0x9f, + 0x68, 0x7d, 0x04, 0x18, 0x42, 0x32, 0x72, 0xdc, 0xab, 0xdc, 0xe6, 0xba, 0x09, 0xe8, 0xd4, 0x27, + 0x53, 0x95, 0x9c, 0x39, 0xd5, 0x70, 0x0d, 0x1e, 0xb5, 0xb7, 0x2b, 0x0a, 0x79, 0xc7, 0xd6, 0x0b, + 0xee, 0xea, 0xf8, 0x6f, 0x6a, 0xb1, 0xfc, 0x90, 0x35, 0xce, 0x46, 0x99, 0xfa, 0x88, 0x01, 0x48, + 0xd5, 0x70, 0x26, 0x4c, 0x08, 0x2a, 0x13, 0x60, 0xb0, 0x96, 0x91, 0xa7, 0xc5, 0x05, 0xd3, 0xcd, + 0x5e, 0xcb, 0x9f, 0xa4, 0x5c, 0x29, 0x98, 0xbc, 0xd6, 0x2e, 0x6a, 0xeb, 0xc8, 0xfa, 0x58, 0x45, + 0x79, 0x15, 0x30, 0x98, 0x59, 0x65, 0x30, 0x7f, 0x14, 0x14, 0xbd, 0x27, 0xd1, 0x0c, 0xbc, 0x52, + 0xda, 0x42, 0x09, 0xc5, 0xc4, 0x58, 0xdb, 0x04, 0x22, 0xbd, 0x7a, 0xac, 0x55, 0x94, 0x52, 0x46, + 0x51, 0x32, 0x84, 0x9a, 0xeb, 0xe1, 0xd3, 0x9e, 0x9d, 0x48, 0x3d, 0xd2, 0x21, 0xfa, 0x7d, 0x10, + 0x04, 0x50, 0x06, 0xf0, 0x84, 0xcb, 0x9f, 0x39, 0xbe, 0xec, 0x03, 0x7d, 0x86, 0x85, 0xf5, 0x06, + 0x8c, 0x51, 0x74, 0x13, 0xf1, 0xfa, 0x50, 0xe1, 0x69, 0x23, 0xf6, 0x3e, 0x13, 0xd2, 0xc7, 0x52, + 0x80, 0xe6, 0x41, 0x86, 0x1d, 0x8a, 0xda, 0x3c, 0x3f, 0x90, 0x5c, 0x82, 0x85, 0x8d, 0x8c, 0x64, + 0x2a, 0xeb, 0xb9, 0x23, 0x6c, 0x0a, 0xd3, 0x2b, 0x35, 0xbe, 0xb0, 0x66, 0xd8, 0x1b, 0x45, 0xa1, + 0xb6, 0x67, 0x2d, 0xa6, 0xd6, 0xcd, 0x69, 0x88, 0x57, 0x70, 0xe6, 0xaa, 0x02, 0x3b, 0x84, 0x6a, + 0xb6, 0xa5, 0x91, 0x4a, 0x69, 0x20, 0x01, 0xd7, 0x5d, 0xf2, 0x7b, 0x3e, 0xf2, 0xbb, 0xe4, 0x9e, + 0x3a, 0xc0, 0xaa, 0x72, 0x2d, 0xa6, 0x47, 0x09, 0x2e, 0x0f, 0xf6, 0x9b, 0x8e, 0x7c, 0x41, 0xa6, + 0xc6, 0x10, 0x29, 0xcc, 0x4e, 0xcf, 0x01, 0xd5, 0x93, 0x75, 0x51, 0xb8, 0xd4, 0xec, 0xee, 0x6a, + 0x2f, 0x8b, 0x45, 0x65, 0xe8, 0xf5, 0x3e, 0xbc, 0xf4, 0x59, 0xec, 0x3e, 0x20, 0x18, 0x85, 0x31, + 0x8e, 0x25, 0x59, 0x16, 0x0f, 0xf0, 0x6e, 0xb1, 0x1e, 0x58, 0x83, 0x33, 0x10, 0x0d, 0x52, 0xc3, + 0x8f, 0x7e, 0x09, 0x27, 0xba, 0xd7, 0xf5, 0x8d, 0x79, 0xcf, 0x60, 0x52, 0xa2, 0x03, 0x46, 0xf5, + 0xf8, 0x9d, 0x6d, 0x5f, 0x23, 0x68, 0x7a, 0xb0, 0x2a, 0x55, 0x44, 0xd9, 0x58, 0xfd, 0xd1, 0x2d, + 0xcc, 0x75, 0xa2, 0x90, 0x8e, 0x7f, 0x91, 0x56, 0xa5, 0x3f, 0x62, 0x1a, 0x67, 0xd5, 0xb2, 0xc8, + 0x06, 0x66, 0xa7, 0xf7, 0xeb, 0x0c, 0xe0, 0xb0, 0xb5, 0x28, 0x8d, 0xda, 0x75, 0xd5, 0x03, 0x3e, + 0xc4, 0x4e, 0xd7, 0x6c, 0x7b, 0x28, 0x92, 0x7c, 0xeb, 0xb8, 0x67, 0x1a, 0x0c, 0xc4, 0xed, 0x5f, + 0x50, 0x5a, 0xb6, 0x52, 0xba, 0x9b, 0xe5, 0xcc, 0xb6, 0x78, 0x76, 0x9a, 0xcd, 0x2d, 0x43, 0x56, + 0xa4, 0xe7, 0x97, 0x6c, 0xdc, 0xb2, 0x2c, 0xb4, 0x2c, 0x30, 0x23, 0x1c, 0x51, 0x96, 0xca, 0x0d, + 0xbd, 0xf9, 0x2d, 0x97, 0x3c, 0x84, 0x45, 0x16, 0xcb, 0x25, 0xe2, 0x73, 0x9c, 0x4b, 0xbe, 0x36, + 0x12, 0xb3, 0xd0, 0x76, 0x9e, 0x5c, 0x40, 0xb9, 0x6f, 0x4e, 0x55, 0x1c, 0x87, 0xc4, 0x8d, 0x5a, + 0xda, 0x1b, 0xec, 0xd5, 0x03, 0x7f, 0x58, 0x78, 0xcc, 0xfa, 0xae, 0x0a, 0xb4, 0x3c, 0x50, 0xcd, + 0xa8, 0x7e, 0xfc, 0x17, 0x31, 0xd8, 0xe9, 0x86, 0x60, 0xa9, 0x0b, 0x11, 0x6b, 0xda, 0xfb, 0x6e, + 0x44, 0x62, 0xd8, 0x96, 0x4f, 0x61, 0xdb, 0x62, 0x0d, 0x03, 0xa6, 0x2f, 0x11, 0x91, 0x95, 0x38, + 0xf3, 0x49, 0x94, 0xf0, 0x93, 0x0e, 0xaf, 0xff, 0x28, 0xe6, 0x24, 0xbc, 0xc4, 0x1d, 0x0d, 0xfb, + 0x00, 0xc4, 0x5b, 0xef, 0xda, 0x55, 0x76, 0xbf, 0x52, 0xf9, 0x00, 0xab, 0xd5, 0xef, 0xa5, 0x31, + 0x37, 0x60, 0xcf, 0xad, 0x79, 0x45, 0xef, 0x0f, 0x97, 0xc8, 0x0e, 0x88, 0x61, 0x56, 0x58, 0x3b, + 0xd5, 0x1c, 0xe8, 0xb0, 0x93, 0x02, 0xdf, 0xa5, 0x6c, 0xaf, 0x4b, 0x5e, 0x66, 0x7d, 0xfe, 0xaa, + 0xaf, 0xa0, 0xd4, 0x35, 0xcd, 0x81, 0xa0, 0x71, 0xe4, 0x45, 0x12, 0x24, 0x1e, 0x0d, 0x06, 0x96, + 0x1e, 0x23, 0xa3, 0x39, 0xd8, 0xcc, 0x72, 0xd7, 0xac, 0x72, 0x5c, 0x8c, 0xdf, 0x6c, 0xb4, 0xc4, + 0x2b, 0xbc, 0x1c, 0xeb, 0xbe, 0x1b, 0xbb, 0xf3, 0xbc, 0x45, 0x34, 0xe9, 0x5a, 0x7f, 0x11, 0x61, + 0xd7, 0x61, 0x15, 0x18, 0x0e, 0xf8, 0x8b, 0x23, 0x97, 0xa7, 0x46, 0x31, 0x25, 0x30, 0x23, 0x06, + 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x09, 0x15, 0x31, 0x16, 0x04, 0x14, 0x8b, 0x4e, + 0x13, 0x2a, 0xf1, 0x4d, 0xa3, 0xe9, 0x31, 0x5c, 0x6d, 0xce, 0x5a, 0x09, 0x93, 0x0a, 0xf4, 0x12, + 0x19, 0x7b, 0x30, 0x31, 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, + 0x00, 0x04, 0x14, 0x00, 0x3b, 0x70, 0x95, 0x68, 0xd3, 0xd8, 0x4f, 0x71, 0xd0, 0x7d, 0x41, 0x49, + 0x48, 0xef, 0x88, 0x6d, 0xe0, 0x9d, 0x53, 0x04, 0x08, 0x0e, 0x46, 0xa3, 0xb5, 0x73, 0x88, 0x7c, + 0x22, 0x02, 0x02, 0x08, 0x00 +}; +#endif /* CM_CERT_DATA_RSA_H */ \ No newline at end of file diff --git a/test/fuzz_test/fuzz_test_common/include/cm_cert_data_user.h b/test/fuzz_test/fuzz_test_common/include/cm_cert_data_user.h new file mode 100644 index 0000000000000000000000000000000000000000..374a97dc6eeff1bbbdad683d20d8a16080cadd22 --- /dev/null +++ b/test/fuzz_test/fuzz_test_common/include/cm_cert_data_user.h @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2022 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef CM_CERT_DATA_USER_H +#define CM_CERT_DATA_USER_H +static const uint8_t g_certData01[] = { /* 40dc992e.0 */ + 0x30, 0x82, 0x04, 0x31, 0x30, 0x82, 0x03, 0x19, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x01, 0x00, + 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, 0x30, + 0x81, 0x95, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x47, 0x52, 0x31, + 0x44, 0x30, 0x42, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x3b, 0x48, 0x65, 0x6c, 0x6c, 0x65, 0x6e, + 0x69, 0x63, 0x20, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x69, 0x63, 0x20, 0x61, 0x6e, 0x64, 0x20, + 0x52, 0x65, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x20, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x43, 0x65, 0x72, 0x74, 0x2e, 0x20, 0x41, 0x75, 0x74, 0x68, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x31, 0x40, 0x30, 0x3e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x37, + 0x48, 0x65, 0x6c, 0x6c, 0x65, 0x6e, 0x69, 0x63, 0x20, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x69, + 0x63, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x52, 0x65, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x20, 0x49, + 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x52, 0x6f, 0x6f, 0x74, + 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x31, 0x30, 0x1e, 0x17, 0x0d, 0x31, 0x31, 0x31, 0x32, 0x30, + 0x36, 0x31, 0x33, 0x34, 0x39, 0x35, 0x32, 0x5a, 0x17, 0x0d, 0x33, 0x31, 0x31, 0x32, 0x30, 0x31, + 0x31, 0x33, 0x34, 0x39, 0x35, 0x32, 0x5a, 0x30, 0x81, 0x95, 0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, + 0x55, 0x04, 0x06, 0x13, 0x02, 0x47, 0x52, 0x31, 0x44, 0x30, 0x42, 0x06, 0x03, 0x55, 0x04, 0x0a, + 0x13, 0x3b, 0x48, 0x65, 0x6c, 0x6c, 0x65, 0x6e, 0x69, 0x63, 0x20, 0x41, 0x63, 0x61, 0x64, 0x65, + 0x6d, 0x69, 0x63, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x52, 0x65, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x20, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x43, 0x65, + 0x72, 0x74, 0x2e, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x31, 0x40, 0x30, + 0x3e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x37, 0x48, 0x65, 0x6c, 0x6c, 0x65, 0x6e, 0x69, 0x63, + 0x20, 0x41, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x69, 0x63, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x52, 0x65, + 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x20, 0x49, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x20, 0x52, 0x6f, 0x6f, 0x74, 0x43, 0x41, 0x20, 0x32, 0x30, 0x31, 0x31, 0x30, + 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, + 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, + 0xa9, 0x53, 0x00, 0xe3, 0x2e, 0xa6, 0xf6, 0x8e, 0xfa, 0x60, 0xd8, 0x2d, 0x95, 0x3e, 0xf8, 0x2c, + 0x2a, 0x54, 0x4e, 0xcd, 0xb9, 0x84, 0x61, 0x94, 0x58, 0x4f, 0x8f, 0x3d, 0x8b, 0xe4, 0x43, 0xf3, + 0x75, 0x89, 0x8d, 0x51, 0xe4, 0xc3, 0x37, 0xd2, 0x8a, 0x88, 0x4d, 0x79, 0x1e, 0xb7, 0x12, 0xdd, + 0x43, 0x78, 0x4a, 0x8a, 0x92, 0xe6, 0xd7, 0x48, 0xd5, 0x0f, 0xa4, 0x3a, 0x29, 0x44, 0x35, 0xb8, + 0x07, 0xf6, 0x68, 0x1d, 0x55, 0xcd, 0x38, 0x51, 0xf0, 0x8c, 0x24, 0x31, 0x85, 0xaf, 0x83, 0xc9, + 0x7d, 0xe9, 0x77, 0xaf, 0xed, 0x1a, 0x7b, 0x9d, 0x17, 0xf9, 0xb3, 0x9d, 0x38, 0x50, 0x0f, 0xa6, + 0x5a, 0x79, 0x91, 0x80, 0xaf, 0x37, 0xae, 0xa6, 0xd3, 0x31, 0xfb, 0xb5, 0x26, 0x09, 0x9d, 0x3c, + 0x5a, 0xef, 0x51, 0xc5, 0x2b, 0xdf, 0x96, 0x5d, 0xeb, 0x32, 0x1e, 0x02, 0xda, 0x70, 0x49, 0xec, + 0x6e, 0x0c, 0xc8, 0x9a, 0x37, 0x8d, 0xf7, 0xf1, 0x36, 0x60, 0x4b, 0x26, 0x2c, 0x82, 0x9e, 0xd0, + 0x78, 0xf3, 0x0d, 0x0f, 0x63, 0xa4, 0x51, 0x30, 0xe1, 0xf9, 0x2b, 0x27, 0x12, 0x07, 0xd8, 0xea, + 0xbd, 0x18, 0x62, 0x98, 0xb0, 0x59, 0x37, 0x7d, 0xbe, 0xee, 0xf3, 0x20, 0x51, 0x42, 0x5a, 0x83, + 0xef, 0x93, 0xba, 0x69, 0x15, 0xf1, 0x62, 0x9d, 0x9f, 0x99, 0x39, 0x82, 0xa1, 0xb7, 0x74, 0x2e, + 0x8b, 0xd4, 0xc5, 0x0b, 0x7b, 0x2f, 0xf0, 0xc8, 0x0a, 0xda, 0x3d, 0x79, 0x0a, 0x9a, 0x93, 0x1c, + 0xa5, 0x28, 0x72, 0x73, 0x91, 0x43, 0x9a, 0xa7, 0xd1, 0x4d, 0x85, 0x84, 0xb9, 0xa9, 0x74, 0x8f, + 0x14, 0x40, 0xc7, 0xdc, 0xde, 0xac, 0x41, 0x64, 0x6c, 0xb4, 0x19, 0x9b, 0x02, 0x63, 0x6d, 0x24, + 0x64, 0x8f, 0x44, 0xb2, 0x25, 0xea, 0xce, 0x5d, 0x74, 0x0c, 0x63, 0x32, 0x5c, 0x8d, 0x87, 0xe5, + 0x02, 0x03, 0x01, 0x00, 0x01, 0xa3, 0x81, 0x89, 0x30, 0x81, 0x86, 0x30, 0x0f, 0x06, 0x03, 0x55, + 0x1d, 0x13, 0x01, 0x01, 0xff, 0x04, 0x05, 0x30, 0x03, 0x01, 0x01, 0xff, 0x30, 0x0b, 0x06, 0x03, + 0x55, 0x1d, 0x0f, 0x04, 0x04, 0x03, 0x02, 0x01, 0x06, 0x30, 0x1d, 0x06, 0x03, 0x55, 0x1d, 0x0e, + 0x04, 0x16, 0x04, 0x14, 0xa6, 0x91, 0x42, 0xfd, 0x13, 0x61, 0x4a, 0x23, 0x9e, 0x08, 0xa4, 0x29, + 0xe5, 0xd8, 0x13, 0x04, 0x23, 0xee, 0x41, 0x25, 0x30, 0x47, 0x06, 0x03, 0x55, 0x1d, 0x1e, 0x04, + 0x40, 0x30, 0x3e, 0xa0, 0x3c, 0x30, 0x05, 0x82, 0x03, 0x2e, 0x67, 0x72, 0x30, 0x05, 0x82, 0x03, + 0x2e, 0x65, 0x75, 0x30, 0x06, 0x82, 0x04, 0x2e, 0x65, 0x64, 0x75, 0x30, 0x06, 0x82, 0x04, 0x2e, + 0x6f, 0x72, 0x67, 0x30, 0x05, 0x81, 0x03, 0x2e, 0x67, 0x72, 0x30, 0x05, 0x81, 0x03, 0x2e, 0x65, + 0x75, 0x30, 0x06, 0x81, 0x04, 0x2e, 0x65, 0x64, 0x75, 0x30, 0x06, 0x81, 0x04, 0x2e, 0x6f, 0x72, + 0x67, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00, + 0x03, 0x82, 0x01, 0x01, 0x00, 0x1f, 0xef, 0x79, 0x41, 0xe1, 0x7b, 0x6e, 0x3f, 0xb2, 0x8c, 0x86, + 0x37, 0x42, 0x4a, 0x4e, 0x1c, 0x37, 0x1e, 0x8d, 0x66, 0xba, 0x24, 0x81, 0xc9, 0x4f, 0x12, 0x0f, + 0x21, 0xc0, 0x03, 0x97, 0x86, 0x25, 0x6d, 0x5d, 0xd3, 0x22, 0x29, 0xa8, 0x6c, 0xa2, 0x0d, 0xa9, + 0xeb, 0x3d, 0x06, 0x5b, 0x99, 0x3a, 0xc7, 0xcc, 0xc3, 0x9a, 0x34, 0x7f, 0xab, 0x0e, 0xc8, 0x4e, + 0x1c, 0xe1, 0xfa, 0xe4, 0xdc, 0xcd, 0x0d, 0xbe, 0xbf, 0x24, 0xfe, 0x6c, 0xe7, 0x6b, 0xc2, 0x0d, + 0xc8, 0x06, 0x9e, 0x4e, 0x8d, 0x61, 0x28, 0xa6, 0x6a, 0xfd, 0xe5, 0xf6, 0x62, 0xea, 0x18, 0x3c, + 0x4e, 0xa0, 0x53, 0x9d, 0xb2, 0x3a, 0x9c, 0xeb, 0xa5, 0x9c, 0x91, 0x16, 0xb6, 0x4d, 0x82, 0xe0, + 0x0c, 0x05, 0x48, 0xa9, 0x6c, 0xf5, 0xcc, 0xf8, 0xcb, 0x9d, 0x49, 0xb4, 0xf0, 0x02, 0xa5, 0xfd, + 0x70, 0x03, 0xed, 0x8a, 0x21, 0xa5, 0xae, 0x13, 0x86, 0x49, 0xc3, 0x33, 0x73, 0xbe, 0x87, 0x3b, + 0x74, 0x8b, 0x17, 0x45, 0x26, 0x4c, 0x16, 0x91, 0x83, 0xfe, 0x67, 0x7d, 0xcd, 0x4d, 0x63, 0x67, + 0xfa, 0xf3, 0x03, 0x12, 0x96, 0x78, 0x06, 0x8d, 0xb1, 0x67, 0xed, 0x8e, 0x3f, 0xbe, 0x9f, 0x4f, + 0x02, 0xf5, 0xb3, 0x09, 0x2f, 0xf3, 0x4c, 0x87, 0xdf, 0x2a, 0xcb, 0x95, 0x7c, 0x01, 0xcc, 0xac, + 0x36, 0x7a, 0xbf, 0xa2, 0x73, 0x7a, 0xf7, 0x8f, 0xc1, 0xb5, 0x9a, 0xa1, 0x14, 0xb2, 0x8f, 0x33, + 0x9f, 0x0d, 0xef, 0x22, 0xdc, 0x66, 0x7b, 0x84, 0xbd, 0x45, 0x17, 0x06, 0x3d, 0x3c, 0xca, 0xb9, + 0x77, 0x34, 0x8f, 0xca, 0xea, 0xcf, 0x3f, 0x31, 0x3e, 0xe3, 0x88, 0xe3, 0x80, 0x49, 0x25, 0xc8, + 0x97, 0xb5, 0x9d, 0x9a, 0x99, 0x4d, 0xb0, 0x3c, 0xf8, 0x4a, 0x00, 0x9b, 0x64, 0xdd, 0x9f, 0x39, + 0x4b, 0xd1, 0x27, 0xd7, 0xb8 +}; +#endif /* CM_CERT_DATA_USER_H */ \ No newline at end of file diff --git a/test/fuzz_test/fuzz_test_common/include/cm_fuzz_test_common.h b/test/fuzz_test/fuzz_test_common/include/cm_fuzz_test_common.h index cc48ab76d40f542dab91298cd161f761981936e3..ef1ec4bfcd23a472d9add5ab5b0272846801c85f 100644 --- a/test/fuzz_test/fuzz_test_common/include/cm_fuzz_test_common.h +++ b/test/fuzz_test/fuzz_test_common/include/cm_fuzz_test_common.h @@ -23,6 +23,8 @@ #include "securec.h" namespace CmFuzzTest { +void SetATPermission(void); + constexpr uint32_t CERT_INFO_LEN = sizeof(uint32_t) + MAX_LEN_CERTIFICATE + sizeof(uint32_t) + MAX_LEN_CERT_ALIAS + sizeof(uint32_t); diff --git a/test/fuzz_test/fuzz_test_common/src/cm_fuzz_test_common.cpp b/test/fuzz_test/fuzz_test_common/src/cm_fuzz_test_common.cpp index e42902bb77631b2c5dea569f1ccb3faba151b541..8034da626cd181c6c9ee8349e5f31f9ed30fedc5 100644 --- a/test/fuzz_test/fuzz_test_common/src/cm_fuzz_test_common.cpp +++ b/test/fuzz_test/fuzz_test_common/src/cm_fuzz_test_common.cpp @@ -17,10 +17,49 @@ #include "cm_ipc_client_serialization.h" #include "message_parcel.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" +#include "accesstoken_kit.h" +#include namespace CmFuzzTest { +constexpr uint32_t SLEEP_TIME = 3; +constexpr int32_t PERMISSION_MAX = 4; +constexpr int32_t PERMISSION_INDEX0 = 0; +constexpr int32_t PERMISSION_INDEX1 = 1; +constexpr int32_t PERMISSION_INDEX2 = 2; +constexpr int32_t PERMISSION_INDEX3 = 3; constexpr uint32_t NUM_10 = 10; constexpr uint32_t NUM_9 = 9; +void SetATPermission(void) +{ + static bool firstRun = true; + const char **perms = new const char *[PERMISSION_MAX]; // 4 permissions + perms[PERMISSION_INDEX0] = "ohos.permission.ACCESS_CERT_MANAGER_INTERNAL"; // system_core + perms[PERMISSION_INDEX1] = "ohos.permission.ACCESS_CERT_MANAGER"; // normal + perms[PERMISSION_INDEX2] = "ohos.permission.ACCESS_USER_TRUSTED_CERT"; // system_core + perms[PERMISSION_INDEX3] = "ohos.permission.ACCESS_SYSTEM_APP_CERT"; // system_core + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = PERMISSION_MAX, + .dcaps = nullptr, + .perms = perms, + .acls = nullptr, + .processName = "TestCertManager", + .aplStr = "system_core", + }; + + auto tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + if (firstRun) { + system("pidof accesstoken_ser | xargs kill -9"); + sleep(SLEEP_TIME); + firstRun = false; + } + delete[] perms; +} + bool GetUintFromBuffer(uint8_t *srcData, uint32_t *remSize, uint32_t *offset, uint32_t *outVal) { if (*remSize < sizeof(uint32_t)) { diff --git a/test/unittest/common_permission_test/BUILD.gn b/test/unittest/common_permission_test/BUILD.gn index cc3b5306fb23e7b2bebede191912222fc7259a8d..1578e8142f44d287b31becb620405613d6e2a850 100644 --- a/test/unittest/common_permission_test/BUILD.gn +++ b/test/unittest/common_permission_test/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/test.gni") module_output_path = "cert_manager_standard/cert_manager_standard_test" @@ -23,11 +24,6 @@ ohos_unittest("cm_common_permission_test") { ] include_dirs = [ "../include" ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -39,10 +35,9 @@ ohos_unittest("cm_common_permission_test") { } deps = [ - "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken", diff --git a/test/unittest/inner_permission_test/BUILD.gn b/test/unittest/inner_permission_test/BUILD.gn index 30b4c407e5b58625a92138bdf1c99123bb8854e1..def6ff95150a5f5bcba095e0f9688c3d6e0a084f 100644 --- a/test/unittest/inner_permission_test/BUILD.gn +++ b/test/unittest/inner_permission_test/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/test.gni") module_output_path = "cert_manager_standard/cert_manager_standard_test" @@ -23,11 +24,6 @@ ohos_unittest("cm_inner_permission_test") { ] include_dirs = [ "../include" ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -39,10 +35,9 @@ ohos_unittest("cm_inner_permission_test") { } deps = [ - "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken", diff --git a/test/unittest/module_test/BUILD.gn b/test/unittest/module_test/BUILD.gn index a31043b8a667c68278e4a0135d85a2016683c365..61f97a6e0e4843b46c3cfd7430aaa1f4348ebc7f 100644 --- a/test/unittest/module_test/BUILD.gn +++ b/test/unittest/module_test/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/test.gni") module_output_path = "cert_manager_standard/cert_manager_standard_test" @@ -27,11 +28,6 @@ ohos_unittest("cm_module_test") { "include", "../include", ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -43,10 +39,9 @@ ohos_unittest("cm_module_test") { } deps = [ - "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ "bounds_checking_function:libsec_static", "c_utils:utils", diff --git a/test/unittest/multi_thread_test/BUILD.gn b/test/unittest/multi_thread_test/BUILD.gn index 3251d76b8076683f28e551db423d154d772c35f0..74973a87ab033ea6322b20c23c57ab5bc7baab50 100644 --- a/test/unittest/multi_thread_test/BUILD.gn +++ b/test/unittest/multi_thread_test/BUILD.gn @@ -11,6 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//base/security/certificate_manager/cert_manager.gni") import("//build/test.gni") module_output_path = "cert_manager_standard/cert_manager_standard_test" @@ -26,11 +27,6 @@ ohos_unittest("cm_multi_thread_test") { ] include_dirs = [ "../include" ] - cflags_cc = [ - "-Wall", - "-Werror", - ] - cflags = cflags_cc branch_protector_ret = "pac_ret" sanitize = { cfi = true @@ -42,10 +38,9 @@ ohos_unittest("cm_multi_thread_test") { } deps = [ - "../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", - "../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", + "${cert_manager_root_dir}/frameworks/cert_manager_standard/main:cert_manager_standard_frameworks", + "${cert_manager_root_dir}/interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk", ] - defines = [ "_CM_LOG_ENABLE_" ] external_deps = [ "access_token:libaccesstoken_sdk", "access_token:libnativetoken",