openharmony/security_certificate_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_certificate_manager synced 2025-02-11 04:35:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

编译规范化

Browse Source 
Signed-off-by: 陈怡博 <chenyibo6@huawei.com>
This commit is contained in:
陈怡博 2024-05-06 17:36:08 +08:00
parent ff69ed1847
commit 6063222b4c
13 changed files with 34 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bundle.json
View File

@ -17,7 +17,11 @@
"name": "certificate_manager",
"subsystem": "security",
"syscap": [ "SystemCapability.Security.CertificateManager" ],
"features": [],
"features": [
"certificate_manager_deps_huks_enabled",
"certificate_manager_feature_ca_enabled",
"certificate_manager_feature_credential_enabled"
],
"adapted_system_type": [
"mini",
"small",
@ -45,9 +49,7 @@
"os_account",
"safwk",
"samgr",
"security_guard"
],
"third_party": [
"security_guard",
"openssl"
]
},

2
cert_manager.gni
View File

@ -16,7 +16,7 @@ non_rwlock_support = false
declare_args() {
# depend on the definition of huks security level in base/security/huks/build/config.gni
deps_huks_security_level = "software"
certificate_manager_deps_huks_enabled = "software"
}
if (!defined(global_parts_info) ||

8
frameworks/cert_manager_standard/main/common/BUILD.gn
View File

@ -36,10 +36,8 @@ ohos_static_library("libcert_manager_common_standard_static") {
public_configs =
[ ":cert_manager_config" ] # Share include files for other gn when deps.
include_dirs = [
"//third_party/openssl/include",
"../../../../interfaces/innerkits/cert_manager_standard/main/include",
]
include_dirs =
[ "../../../../interfaces/innerkits/cert_manager_standard/main/include" ]
sources = [
"src/cm_advsecmode_check.c",
@ -48,11 +46,11 @@ ohos_static_library("libcert_manager_common_standard_static") {
"src/cm_x509.c",
]
deps = [ "//third_party/openssl:libcrypto_shared" ]
external_deps = [
"c_utils:utils",
"huks:libhukssdk",
"init:libbegetutil",
"openssl:libcrypto_shared",
]
cflags = [
"-DHILOG_ENABLE",

6
frameworks/cert_manager_standard/main/os_dependency/BUILD.gn
View File

@ -82,14 +82,12 @@ ohos_static_library("libcert_manager_ipc_client_static") {
"./cm_ipc/src/cm_load_sa.cpp",
"./cm_ipc/src/cm_request.cpp",
]
deps = [
":libcert_manager_log_mem_static",
"//third_party/openssl:libcrypto_shared",
]
deps = [ ":libcert_manager_log_mem_static" ]
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"ipc:ipc_single",
"openssl:libcrypto_shared",
"samgr:samgr_proxy",
]
cflags_cc = [

3
services/cert_manager_standard/cert_manager_engine/main/core/BUILD.gn
View File

@ -37,7 +37,6 @@ ohos_static_library("cert_manager_engine_core_standard") {
]
include_dirs = [
"../../../../../interfaces/innerkits/cert_manager_standard/main/include",
"//third_party/openssl/include",
]
cflags = [
"-Wall",
@ -70,7 +69,6 @@ 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",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
"access_token:libaccesstoken_sdk",
@ -78,5 +76,6 @@ ohos_static_library("cert_manager_engine_core_standard") {
"c_utils:utils",
"huks:libhukssdk",
"ipc:ipc_core",
"openssl:libcrypto_shared",
]
}

1
services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_updateflag.h
View File

@ -18,7 +18,6 @@
#include <stdint.h>
#include <stdbool.h>
#include "openssl/ossl_typ.h"
#include "cm_type.h"
#ifdef __cplusplus

2
services/cert_manager_standard/cert_manager_service/main/os_dependency/BUILD.gn
View File

@ -26,7 +26,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") {
ubsan = true
}
include_dirs = [
"//third_party/openssl/include",
"../../../cert_manager_engine/main/core/include",
"../../../../../interfaces/innerkits/cert_manager_standard/main/include",
]
@ -40,7 +39,6 @@ ohos_static_library("libcert_manager_service_os_dependency_standard_static") {
"../../../../../frameworks/cert_manager_standard/main/common:libcert_manager_common_standard_static",
"../../../../../frameworks/cert_manager_standard/main/os_dependency:libcert_manager_log_mem_static",
"idl:libcm_service_idl_standard_static",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [

3
services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/BUILD.gn
View File

@ -31,7 +31,6 @@ ohos_static_library("libcm_service_idl_standard_static") {
ubsan = true
}
include_dirs = [
"//third_party/openssl/include",
"../../../../../../interfaces/innerkits/cert_manager_standard/main/include",
"../../../../cert_manager_engine/main/core/include",
]
@ -49,12 +48,12 @@ ohos_static_library("libcm_service_idl_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",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
"c_utils:utils",
"huks:libhukssdk",
"ipc:ipc_core",
"openssl:libcrypto_shared",
"os_account:os_account_innerkits",
]

13
test/BUILD.gn
View File

@ -36,10 +36,7 @@ ohos_unittest("cm_sdk_test") {
"unittest/src/cm_user_cert_test.cpp",
]
include_dirs = [
"//third_party/bounds_checking_function/include",
"unittest/include",
]
include_dirs = [ "unittest/include" ]
cflags_cc = [
"-Wall",
"-Werror",
@ -58,20 +55,20 @@ ohos_unittest("cm_sdk_test") {
deps = [
"../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
"../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gtest_main",
"//third_party/openssl:libcrypto_shared",
]
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"bounds_checking_function:libsec_static",
"c_utils:utils",
"googletest:gtest",
"openssl:libcrypto_shared",
]
resource_config_file = "./resource/certificate_manager/ohos_test.xml"
defines = []
if (deps_huks_security_level == "software") {
if (certificate_manager_deps_huks_enabled == "software") {
defines += [ "DEPS_HKS_UNTRUSTED_RUNNING_ENV" ]
}
}

9
test/unittest/common_permission_test/BUILD.gn
View File

@ -22,10 +22,7 @@ ohos_unittest("cm_common_permission_test") {
"cm_common_permission_test.cpp",
]
include_dirs = [
"../include",
"//third_party/bounds_checking_function/include",
]
include_dirs = [ "../include" ]
cflags_cc = [
"-Wall",
"-Werror",
@ -44,14 +41,14 @@ 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",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gtest_main",
]
defines = [ "_CM_LOG_ENABLE_" ]
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"bounds_checking_function:libsec_static",
"c_utils:utils",
"googletest:gtest",
]
}

9
test/unittest/inner_permission_test/BUILD.gn
View File

@ -22,10 +22,7 @@ ohos_unittest("cm_inner_permission_test") {
"cm_inner_permission_test.cpp",
]
include_dirs = [
"../include",
"//third_party/bounds_checking_function/include",
]
include_dirs = [ "../include" ]
cflags_cc = [
"-Wall",
"-Werror",
@ -44,14 +41,14 @@ 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",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gtest_main",
]
defines = [ "_CM_LOG_ENABLE_" ]
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"bounds_checking_function:libsec_static",
"c_utils:utils",
"googletest:gtest",
]
}

12
test/unittest/module_test/BUILD.gn
View File

@ -24,8 +24,6 @@ ohos_unittest("cm_module_test") {
]
include_dirs = [
"//third_party/bounds_checking_function/include",
"//third_party/openssl/include",
"include",
"../include",
]
@ -47,10 +45,12 @@ ohos_unittest("cm_module_test") {
deps = [
"../../../frameworks/cert_manager_standard/main:cert_manager_standard_frameworks",
"../../../interfaces/innerkits/cert_manager_standard/main:cert_manager_sdk",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gtest_main",
"//third_party/openssl:libcrypto_shared",
]
defines = [ "_CM_LOG_ENABLE_" ]
external_deps = [ "c_utils:utils" ]
external_deps = [
"bounds_checking_function:libsec_static",
"c_utils:utils",
"googletest:gtest",
"openssl:libcrypto_shared",
]
}

9
test/unittest/multi_thread_test/BUILD.gn
View File

@ -25,10 +25,7 @@ ohos_unittest("cm_multi_thread_test") {
"src/cm_remove_grant_multi_thread_test.cpp",
]
include_dirs = [
"../include",
"//third_party/bounds_checking_function/include",
]
include_dirs = [ "../include" ]
cflags_cc = [
"-Wall",
"-Werror",
@ -47,14 +44,14 @@ 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",
"//third_party/bounds_checking_function:libsec_static",
"//third_party/googletest:gtest_main",
]
defines = [ "_CM_LOG_ENABLE_" ]
external_deps = [
"access_token:libaccesstoken_sdk",
"access_token:libnativetoken",
"access_token:libtoken_setproc",
"bounds_checking_function:libsec_static",
"c_utils:utils",
"googletest:gtest",
]
}