From 0d58128013f136d103e1f3c5fab12aee64561160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8A=E5=AE=98=E6=99=AF=E5=A8=81?= Date: Tue, 4 Mar 2025 20:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 上官景威 --- .../main/common/BUILD.gn | 1 + .../main/common/include/cm_log.h | 22 +-- .../main/common/src/cm_pfx.c | 4 +- .../main/os_dependency/BUILD.gn | 2 - .../os_dependency/cm_ipc/src/cm_ipc_client.c | 48 ++--- .../os_dependency/cm_ipc/src/cm_request.cpp | 4 +- .../source/cert_manager_api.c | 64 +++--- interfaces/kits/napi/BUILD.gn | 1 + interfaces/kits/napi/src/cm_napi_common.cpp | 8 +- .../src/cm_napi_get_app_cert_info_common.cpp | 4 +- .../src/cm_napi_get_app_cert_list_common.cpp | 2 +- .../napi/src/cm_napi_get_cert_store_path.cpp | 6 +- .../napi/src/cm_napi_get_system_cert_list.cpp | 2 +- .../src/cm_napi_install_app_cert_common.cpp | 4 +- .../src/cm_napi_uninstall_app_cert_common.cpp | 4 +- .../napi/src/dialog/cm_napi_dialog_common.cpp | 10 +- .../napi/src/dialog/cm_napi_open_dialog.cpp | 6 +- .../cert_manager_engine/main/core/BUILD.gn | 1 + .../main/core/include/cert_manager_status.h | 8 +- .../main/core/include/cert_manager_uri.h | 2 +- .../main/core/src/cert_manager.c | 78 ++++---- .../core/src/cert_manager_app_cert_process.c | 16 +- .../core/src/cert_manager_auth_list_mgr.c | 14 +- .../main/core/src/cert_manager_auth_mgr.c | 102 +++++----- .../main/core/src/cert_manager_check.c | 44 ++--- .../main/core/src/cert_manager_file.c | 6 +- .../core/src/cert_manager_file_operator.c | 10 +- .../core/src/cert_manager_key_operation.c | 44 ++--- .../main/core/src/cert_manager_query.c | 26 +-- .../main/core/src/cert_manager_service.c | 59 +++--- .../main/core/src/cert_manager_session_mgr.c | 14 +- .../main/core/src/cert_manager_status.c | 30 +-- .../main/core/src/cert_manager_storage.c | 28 +-- .../main/core/src/cert_manager_updateflag.c | 18 +- .../main/core/src/cert_manager_uri.c | 12 +- .../main/core/src/cm_event_process.c | 36 ++-- .../main/core/src/rbtree.c | 6 +- .../main/rdb/src/cm_cert_property_rdb.cpp | 14 +- .../main/hisysevent_wrapper/BUILD.gn | 1 + .../src/hisysevent_wrapper.cpp | 2 +- .../main/os_dependency/idl/BUILD.gn | 1 + .../os_dependency/idl/cm_ipc/cm_ipc_service.c | 186 +++++++++--------- .../idl/cm_ipc/cm_ipc_service_serialization.c | 8 +- .../os_dependency/idl/cm_ipc/cm_response.cpp | 2 +- .../os_dependency/sa/cm_event_observer.cpp | 4 +- .../main/os_dependency/sa/cm_sa.cpp | 20 +- .../main/security_guard_report/BUILD.gn | 1 + test/BUILD.gn | 1 + test/unittest/module_test/BUILD.gn | 1 + test/unittest/module_test/src/cm_log_test.cpp | 3 - 50 files changed, 495 insertions(+), 495 deletions(-) diff --git a/frameworks/cert_manager_standard/main/common/BUILD.gn b/frameworks/cert_manager_standard/main/common/BUILD.gn index 0a78b6c..84d9abd 100644 --- a/frameworks/cert_manager_standard/main/common/BUILD.gn +++ b/frameworks/cert_manager_standard/main/common/BUILD.gn @@ -47,6 +47,7 @@ ohos_static_library("libcert_manager_common_standard_static") { "c_utils:utils", "init:libbegetutil", "openssl:libcrypto_shared", + "hilog:libhilog", ] cflags = [ "-Wall", 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 0b591ef..500223b 100644 --- a/frameworks/cert_manager_standard/main/common/include/cm_log.h +++ b/frameworks/cert_manager_standard/main/common/include/cm_log.h @@ -17,6 +17,7 @@ #define CM_LOG_H #include "cm_type.h" +#include "hilog/log.h" #ifdef __cplusplus extern "C" { @@ -27,19 +28,14 @@ extern "C" { #undef LOG_DOMAIN #define LOG_DOMAIN 0xD002F09 /* CertManager's domain id */ -enum CmLogLevel { - CM_LOG_LEVEL_I, - CM_LOG_LEVEL_E, - CM_LOG_LEVEL_W, - CM_LOG_LEVEL_D, -}; - -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__) +#define CM_LOG_I(fmt, arg...) \ + HILOG_INFO(LOG_CORE, "%{public}s[%{public}u]: " fmt "\n", __func__, __LINE__, ##arg) +#define CM_LOG_W(fmt, arg...) \ + HILOG_WARN(LOG_CORE, "%{public}s[%{public}u]: " fmt "\n", __func__, __LINE__, ##arg) +#define CM_LOG_E(fmt, arg...) \ + HILOG_ERROR(LOG_CORE, "%{public}s[%{public}u]: " fmt "\n", __func__, __LINE__, ##arg) +#define CM_LOG_D(fmt, arg...) \ + HILOG_DEBUG(LOG_CORE, "%{public}s[%{public}u]: " fmt "\n", __func__, __LINE__, ##arg) #ifdef __cplusplus } diff --git a/frameworks/cert_manager_standard/main/common/src/cm_pfx.c b/frameworks/cert_manager_standard/main/common/src/cm_pfx.c index fd2bd7c..003370f 100644 --- a/frameworks/cert_manager_standard/main/common/src/cm_pfx.c +++ b/frameworks/cert_manager_standard/main/common/src/cm_pfx.c @@ -106,13 +106,13 @@ int32_t CmParsePkcs12Cert(const struct CmBlob *p12Cert, char *passWd, EVP_PKEY * p12 = d2i_PKCS12_bio(bio, NULL); if (p12 == NULL) { ret = CMR_ERROR_INVALID_CERT_FORMAT; - CM_LOG_E("D2i_PKCS12_bio faild:%s", ERR_error_string(ERR_get_error(), NULL)); + CM_LOG_E("D2i_PKCS12_bio faild:%{public}s", ERR_error_string(ERR_get_error(), NULL)); break; } /* 1 the return value of PKCS12_parse 1 is success */ if (PKCS12_parse(p12, passWd, pkey, &cert, &caCert) != 1) { ret = CMR_ERROR_PASSWORD_IS_ERR; - CM_LOG_E("Parsing PKCS#12 file faild:%s", ERR_error_string(ERR_get_error(), NULL)); + CM_LOG_E("Parsing PKCS#12 file faild:%{public}s", ERR_error_string(ERR_get_error(), NULL)); break; } diff --git a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn index 8f40c5a..4867b17 100644 --- a/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn +++ b/frameworks/cert_manager_standard/main/os_dependency/BUILD.gn @@ -29,14 +29,12 @@ ohos_static_library("libcert_manager_log_mem_static") { 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 = [ "-Wall", diff --git a/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_ipc_client.c b/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_ipc_client.c index fe4fd0f..7296988 100644 --- a/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_ipc_client.c +++ b/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_ipc_client.c @@ -141,7 +141,7 @@ static int32_t GetCertificateInfo(enum CertManagerInterfaceCode type, const stru ret = CmCertificateInfoUnpackFromService(&outBlob, certUri, certificateInfo); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertificateInfo unpack failed, ret = %d", ret); + CM_LOG_E("GetCertificateInfo unpack failed, ret = %{public}d", ret); break; } } while (0); @@ -302,7 +302,7 @@ static int32_t CmAppCertListGetCertCount(const struct CmBlob *outData, uint32_t credCount = 0; int32_t ret = GetUint32FromBuffer(&credCount, outData, offset); if (ret != CM_SUCCESS) { - CM_LOG_E("App cert get list failed ret:%d", ret); + CM_LOG_E("App cert get list failed ret:%{public}d", ret); return ret; } @@ -311,7 +311,7 @@ static int32_t CmAppCertListGetCertCount(const struct CmBlob *outData, } if (credCount > certificateList->credentialCount) { - CM_LOG_E("Caller buff too small count:%u, count:%u", credCount, + CM_LOG_E("Caller buff too small count:%{public}u, count:%u", credCount, certificateList->credentialCount); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -492,7 +492,7 @@ static int32_t CmAppCertInfoUnpackFromService(const struct CmBlob *outData, stru int32_t ret = GetUint32FromBuffer(&certificateInfo->isExist, outData, &offset); if (ret != CM_SUCCESS || certificateInfo->isExist == 0) { - CM_LOG_E("Get certificateInfo->isExist failed ret:%d, is exist:%u", ret, certificateInfo->isExist); + CM_LOG_E("Get certificateInfo->isExist failed ret:%{public}d, is exist:%u", ret, certificateInfo->isExist); return ret; } @@ -589,14 +589,14 @@ static int32_t ClientSerializationAndSend(enum CertManagerInterfaceCode message, struct CmParamSet *sendParamSet = NULL; int32_t ret = CmParamsToParamSet(params, paramCount, &sendParamSet); if (ret != CM_SUCCESS) { - CM_LOG_E("pack params failed, ret = %d", ret); + CM_LOG_E("pack params failed, ret = %{public}d", ret); return ret; } struct CmBlob parcelBlob = { sendParamSet->paramSetSize, (uint8_t *)sendParamSet }; ret = SendRequest(message, &parcelBlob, outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("send request failed, ret = %d", ret); + CM_LOG_E("send request failed, ret = %{public}d", ret); } CmFreeParamSet(&sendParamSet); @@ -606,7 +606,7 @@ static int32_t ClientSerializationAndSend(enum CertManagerInterfaceCode message, static int32_t FormatAppUidList(const struct CmBlob *replyBlob, struct CmAppUidList *appUidList) { if (replyBlob->size < sizeof(uint32_t)) { /* app uid count: 4 bytes */ - CM_LOG_E("invalid reply size[%u]", replyBlob->size); + CM_LOG_E("invalid reply size[%{public}u]", replyBlob->size); return CMR_ERROR_INVALID_ARGUMENT; } @@ -617,12 +617,12 @@ static int32_t FormatAppUidList(const struct CmBlob *replyBlob, struct CmAppUidL /* check reply total len */ if ((count > MAX_OUT_BLOB_SIZE) || (replyBlob->size < (sizeof(uint32_t) + count * sizeof(uint32_t)))) { - CM_LOG_E("invalid reply size[%u]", replyBlob->size); + CM_LOG_E("invalid reply size[%{public}u]", replyBlob->size); return CMR_ERROR_INVALID_ARGUMENT; } if (appUidList->appUidCount < count) { - CM_LOG_E("input app list count[%u] too small", appUidList->appUidCount); + CM_LOG_E("input app list count[%{public}u] too small", appUidList->appUidCount); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -652,7 +652,7 @@ int32_t CmClientGrantAppCertificate(const struct CmBlob *keyUri, uint32_t appUid int32_t ret = ClientSerializationAndSend(CM_MSG_GRANT_APP_CERT, params, CM_ARRAY_SIZE(params), authUri); if (ret != CM_SUCCESS) { - CM_LOG_E("grant app serialization and send failed, ret = %d", ret); + CM_LOG_E("grant app serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -665,7 +665,7 @@ int32_t CmClientGetAuthorizedAppList(const struct CmBlob *keyUri, struct CmAppUi } if (appUidList->appUidCount > MAX_OUT_BLOB_SIZE) { /* ensure not out of bounds */ - CM_LOG_E("invalid app uid list count[%u]", appUidList->appUidCount); + CM_LOG_E("invalid app uid list count[%{public}u]", appUidList->appUidCount); return CMR_ERROR_INVALID_ARGUMENT; } @@ -684,7 +684,7 @@ int32_t CmClientGetAuthorizedAppList(const struct CmBlob *keyUri, struct CmAppUi int32_t ret = ClientSerializationAndSend(CM_MSG_GET_AUTHED_LIST, params, CM_ARRAY_SIZE(params), &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("get authed list serialization and send failed, ret = %d", ret); + CM_LOG_E("get authed list serialization and send failed, ret = %{public}d", ret); CmFree(outData); return ret; } @@ -708,7 +708,7 @@ int32_t CmClientIsAuthorizedApp(const struct CmBlob *authUri) struct CmBlob outBlob = { 0, NULL }; int32_t ret = ClientSerializationAndSend(CM_MSG_CHECK_IS_AUTHED_APP, params, CM_ARRAY_SIZE(params), &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("check is authed serialization and send failed, ret = %d", ret); + CM_LOG_E("check is authed serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -728,7 +728,7 @@ int32_t CmClientRemoveGrantedApp(const struct CmBlob *keyUri, uint32_t appUid) struct CmBlob outBlob = { 0, NULL }; int32_t ret = ClientSerializationAndSend(CM_MSG_REMOVE_GRANT_APP, params, CM_ARRAY_SIZE(params), &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("remove granted app serialization and send failed, ret = %d", ret); + CM_LOG_E("remove granted app serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -748,7 +748,7 @@ int32_t CmClientInit(const struct CmBlob *authUri, const struct CmSignatureSpec int32_t ret = ClientSerializationAndSend(CM_MSG_INIT, params, CM_ARRAY_SIZE(params), handle); if (ret != CM_SUCCESS) { - CM_LOG_E("update serialization and send failed, ret = %d", ret); + CM_LOG_E("update serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -768,7 +768,7 @@ int32_t CmClientUpdate(const struct CmBlob *handle, const struct CmBlob *inData) struct CmBlob outBlob = { 0, NULL }; int32_t ret = ClientSerializationAndSend(CM_MSG_UPDATE, params, CM_ARRAY_SIZE(params), &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("update serialization and send failed, ret = %d", ret); + CM_LOG_E("update serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -787,7 +787,7 @@ int32_t CmClientFinish(const struct CmBlob *handle, const struct CmBlob *inData, int32_t ret = ClientSerializationAndSend(CM_MSG_FINISH, params, CM_ARRAY_SIZE(params), outData); if (ret != CM_SUCCESS) { - CM_LOG_E("finish serialization and send failed, ret = %d", ret); + CM_LOG_E("finish serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -806,7 +806,7 @@ int32_t CmClientAbort(const struct CmBlob *handle) struct CmBlob outBlob = { 0, NULL }; int32_t ret = ClientSerializationAndSend(CM_MSG_ABORT, params, CM_ARRAY_SIZE(params), &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("abort serialization and send failed, ret = %d", ret); + CM_LOG_E("abort serialization and send failed, ret = %{public}d", ret); } return ret; } @@ -839,7 +839,7 @@ static int32_t GetUserCertList(enum CertManagerInterfaceCode type, const struct ret = SendRequest(type, &parcelBlob, &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertList request failed, ret: %d", ret); + CM_LOG_E("GetCertList request failed, ret: %{public}d", ret); break; } @@ -888,7 +888,7 @@ static int32_t GetUserCertInfo(enum CertManagerInterfaceCode type, const struct ret = SendRequest(type, &parcelBlob, &outBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertInfo request failed, ret: %d", ret); + CM_LOG_E("GetCertInfo request failed, ret: %{public}d", ret); break; } @@ -930,7 +930,7 @@ static int32_t SetUserCertStatus(enum CertManagerInterfaceCode type, const struc ret = SendRequest(type, &parcelBlob, NULL); if (ret != CM_SUCCESS) { - CM_LOG_E("SetCertStatus request failed, ret: %d", ret); + CM_LOG_E("SetCertStatus request failed, ret: %{public}d", ret); break; } } while (0); @@ -972,7 +972,7 @@ int32_t CmClientInstallUserTrustedCert(const struct CmBlob *userCert, const stru ret = SendRequest(CM_MSG_INSTALL_USER_CERTIFICATE, &parcelBlob, certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmClientInstallUserTrustedCert request failed, ret: %d", ret); + CM_LOG_E("CmClientInstallUserTrustedCert request failed, ret: %{public}d", ret); break; } } while (0); @@ -998,7 +998,7 @@ static int32_t UninstallUserCert(enum CertManagerInterfaceCode type, const struc ret = SendRequest(type, &parcelBlob, NULL); if (ret != CM_SUCCESS) { - CM_LOG_E("UninstallUserCert request failed, ret: %d", ret); + CM_LOG_E("UninstallUserCert request failed, ret: %{public}d", ret); break; } } while (0); @@ -1019,7 +1019,7 @@ static int32_t UninstallAllUserCert(enum CertManagerInterfaceCode type) ret = SendRequest(type, &parcelBlob, NULL); if (ret != CM_SUCCESS) { - CM_LOG_E("UninstallAllUserCert request failed, ret: %d", ret); + CM_LOG_E("UninstallAllUserCert request failed, ret: %{public}d", ret); } return ret; } diff --git a/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_request.cpp b/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_request.cpp index 5b9e4e1..bbe8fc3 100644 --- a/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_request.cpp +++ b/frameworks/cert_manager_standard/main/os_dependency/cm_ipc/src/cm_request.cpp @@ -74,7 +74,7 @@ static int32_t CmReadRequestReply(MessageParcel &reply, struct CmBlob *outBlob) return CMR_ERROR_NULL_POINTER; } if (outBlob->size < outLen) { - CM_LOG_E("outBlob size[%u] smaller than outLen[%u]", outBlob->size, outLen); + CM_LOG_E("outBlob size[%{public}u] smaller than outLen[%{public}u]", outBlob->size, outLen); return CMR_ERROR_BUFFER_TOO_SMALL; } if (memcpy_s(outBlob->data, outBlob->size, outData, outLen) != EOK) { @@ -111,7 +111,7 @@ int32_t SendRequest(enum CertManagerInterfaceCode type, const struct CmBlob *inB int error = cmProxy->SendRequest(static_cast(type), data, reply, option); if (error != 0) { - CM_LOG_E("SendRequest error:%d", error); + CM_LOG_E("SendRequest error:%{public}d", error); return error; } return CmReadRequestReply(reply, outBlob); diff --git a/interfaces/innerkits/cert_manager_standard/source/cert_manager_api.c b/interfaces/innerkits/cert_manager_standard/source/cert_manager_api.c index 11a4036..d3e06cf 100644 --- a/interfaces/innerkits/cert_manager_standard/source/cert_manager_api.c +++ b/interfaces/innerkits/cert_manager_standard/source/cert_manager_api.c @@ -30,12 +30,12 @@ CM_API_EXPORT int32_t CmGetCertList(uint32_t store, struct CertList *certificate } if ((certificateList->certAbstract == NULL) || (store != CM_SYSTEM_TRUSTED_STORE)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT; } int32_t ret = CmClientGetCertList(store, certificateList); - CM_LOG_I("leave get certificate list, result = %d", ret); + CM_LOG_I("leave get certificate list, result = %{public}d", ret); return ret; } @@ -50,12 +50,12 @@ CM_API_EXPORT int32_t CmGetCertInfo(const struct CmBlob *certUri, uint32_t store if ((certificateInfo->certInfo.data == NULL) || (certificateInfo->certInfo.size == 0) || (store != CM_SYSTEM_TRUSTED_STORE)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT; } int32_t ret = CmClientGetCertInfo(certUri, store, certificateInfo); - CM_LOG_I("leave get certificate info, result = %d", ret); + CM_LOG_I("leave get certificate info, result = %{public}d", ret); return ret; } @@ -69,14 +69,14 @@ CM_API_EXPORT int32_t CmSetCertStatus(const struct CmBlob *certUri, const uint32 } if (store != CM_SYSTEM_TRUSTED_STORE) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT; } uint32_t uStatus = status ? 0 : 1; // 0 indicates the certificate enabled status int32_t ret = CmClientSetCertStatus(certUri, store, uStatus); - CM_LOG_I("leave set certificate status, result = %d", ret); + CM_LOG_I("leave set certificate status, result = %{public}d", ret); return ret; } @@ -92,7 +92,7 @@ CM_API_EXPORT int32_t CmInstallAppCertEx(const struct CmAppCertParam *certParam, } int32_t ret = CmClientInstallAppCert(certParam, keyUri); - CM_LOG_I("leave install app certificate extension, result = %d", ret); + CM_LOG_I("leave install app certificate extension, result = %{public}d", ret); return ret; } @@ -114,7 +114,7 @@ CM_API_EXPORT int32_t CmInstallAppCert(const struct CmBlob *appCert, const struc (struct CmBlob *)certAlias, store, INIT_INVALID_VALUE, level }; int32_t ret = CmClientInstallAppCert(&certParam, keyUri); - CM_LOG_I("leave install app certificate, result = %d", ret); + CM_LOG_I("leave install app certificate, result = %{public}d", ret); return ret; } @@ -126,7 +126,7 @@ CM_API_EXPORT int32_t CmUninstallAppCert(const struct CmBlob *keyUri, const uint } int32_t ret = CmClientUninstallAppCert(keyUri, store); - CM_LOG_I("leave uninstall app certificate, result = %d", ret); + CM_LOG_I("leave uninstall app certificate, result = %{public}d", ret); return ret; } @@ -136,7 +136,7 @@ CM_API_EXPORT int32_t CmUninstallAllAppCert(void) int32_t ret = CmClientUninstallAllAppCert(CM_MSG_UNINSTALL_ALL_APP_CERTIFICATE); - CM_LOG_I("leave uninstall all app certificate, result = %d", ret); + CM_LOG_I("leave uninstall all app certificate, result = %{public}d", ret); return ret; } @@ -148,7 +148,7 @@ CM_API_EXPORT int32_t CmGetAppCertList(const uint32_t store, struct CredentialLi } int32_t ret = CmClientGetAppCertList(store, certificateList); - CM_LOG_I("leave get app certificatelist, result = %d", ret); + CM_LOG_I("leave get app certificatelist, result = %{public}d", ret); return ret; } @@ -161,7 +161,7 @@ CM_API_EXPORT int32_t CmCallingGetAppCertList(const uint32_t store, struct Crede } int32_t ret = CmClientGetCallingAppCertList(store, certificateList); - CM_LOG_I("leave get calling app certificate, result = %d", ret); + CM_LOG_I("leave get calling app certificate, result = %{public}d", ret); return ret; } @@ -175,7 +175,7 @@ CM_API_EXPORT int32_t CmGetAppCert(const struct CmBlob *keyUri, const uint32_t s } int32_t ret = CmClientGetAppCert(keyUri, store, certificate); - CM_LOG_I("leave get app certificate, result = %d", ret); + CM_LOG_I("leave get app certificate, result = %{public}d", ret); return ret; } @@ -188,7 +188,7 @@ CM_API_EXPORT int32_t CmGrantAppCertificate(const struct CmBlob *keyUri, uint32_ } int32_t ret = CmClientGrantAppCertificate(keyUri, appUid, authUri); - CM_LOG_I("leave grant app certificate, result = %d", ret); + CM_LOG_I("leave grant app certificate, result = %{public}d", ret); return ret; } @@ -201,7 +201,7 @@ CM_API_EXPORT int32_t CmGetAuthorizedAppList(const struct CmBlob *keyUri, struct } int32_t ret = CmClientGetAuthorizedAppList(keyUri, appUidList); - CM_LOG_I("leave get authorized app list, result = %d", ret); + CM_LOG_I("leave get authorized app list, result = %{public}d", ret); return ret; } @@ -214,7 +214,7 @@ CM_API_EXPORT int32_t CmIsAuthorizedApp(const struct CmBlob *authUri) } int32_t ret = CmClientIsAuthorizedApp(authUri); - CM_LOG_I("leave check is app authed, result = %d", ret); + CM_LOG_I("leave check is app authed, result = %{public}d", ret); return ret; } @@ -227,7 +227,7 @@ CM_API_EXPORT int32_t CmRemoveGrantedApp(const struct CmBlob *keyUri, uint32_t a } int32_t ret = CmClientRemoveGrantedApp(keyUri, appUid); - CM_LOG_I("leave remove granted app, result = %d", ret); + CM_LOG_I("leave remove granted app, result = %{public}d", ret); return ret; } @@ -240,7 +240,7 @@ CM_API_EXPORT int32_t CmInit(const struct CmBlob *authUri, const struct CmSignat } int32_t ret = CmClientInit(authUri, spec, handle); - CM_LOG_I("leave cert manager init, result = %d", ret); + CM_LOG_I("leave cert manager init, result = %{public}d", ret); return ret; } @@ -253,7 +253,7 @@ CM_API_EXPORT int32_t CmUpdate(const struct CmBlob *handle, const struct CmBlob } int32_t ret = CmClientUpdate(handle, inData); - CM_LOG_I("leave cert manager update, result = %d", ret); + CM_LOG_I("leave cert manager update, result = %{public}d", ret); return ret; } @@ -266,7 +266,7 @@ CM_API_EXPORT int32_t CmFinish(const struct CmBlob *handle, const struct CmBlob } int32_t ret = CmClientFinish(handle, inData, outData); - CM_LOG_I("leave cert manager finish, result = %d", ret); + CM_LOG_I("leave cert manager finish, result = %{public}d", ret); return ret; } @@ -279,7 +279,7 @@ CM_API_EXPORT int32_t CmAbort(const struct CmBlob *handle) } int32_t ret = CmClientAbort(handle); - CM_LOG_I("leave cert manager abort, result = %d", ret); + CM_LOG_I("leave cert manager abort, result = %{public}d", ret); return ret; } @@ -292,7 +292,7 @@ CM_API_EXPORT int32_t CmGetUserCertList(uint32_t store, struct CertList *certifi const struct UserCAProperty property = { INIT_INVALID_VALUE, CM_ALL_USER }; int32_t ret = CmClientGetUserCertList(&property, store, certificateList); - CM_LOG_I("leave get cert list, result = %d", ret); + CM_LOG_I("leave get cert list, result = %{public}d", ret); return ret; } @@ -304,7 +304,7 @@ CM_API_EXPORT int32_t CmGetUserCertInfo(const struct CmBlob *certUri, uint32_t s } int32_t ret = CmClientGetUserCertInfo(certUri, store, certificateInfo); - CM_LOG_I("leave get cert info, result = %d", ret); + CM_LOG_I("leave get cert info, result = %{public}d", ret); return ret; } @@ -318,7 +318,7 @@ CM_API_EXPORT int32_t CmSetUserCertStatus(const struct CmBlob *certUri, uint32_t uint32_t uStatus = status ? 0 : 1; // 0 indicates the certificate enabled status int32_t ret = CmClientSetUserCertStatus(certUri, store, uStatus); - CM_LOG_I("leave set cert status, result = %d", ret); + CM_LOG_I("leave set cert status, result = %{public}d", ret); return ret; } @@ -333,7 +333,7 @@ CM_API_EXPORT int32_t CmInstallUserTrustedCert(const struct CmBlob *userCert, co uint32_t userId = INIT_INVALID_VALUE; bool status = true; int32_t ret = CmInstallUserCACert(userCert, certAlias, userId, status, certUri); - CM_LOG_I("leave install user trusted cert, result = %d", ret); + CM_LOG_I("leave install user trusted cert, result = %{public}d", ret); return ret; } @@ -345,7 +345,7 @@ CM_API_EXPORT int32_t CmUninstallUserTrustedCert(const struct CmBlob *certUri) } int32_t ret = CmClientUninstallUserTrustedCert(certUri); - CM_LOG_I("leave uninstall user trusted cert, result = %d", ret); + CM_LOG_I("leave uninstall user trusted cert, result = %{public}d", ret); return ret; } @@ -354,7 +354,7 @@ CM_API_EXPORT int32_t CmUninstallAllUserTrustedCert(void) CM_LOG_I("enter uninstall all user trusted cert"); int32_t ret = CmClientUninstallAllUserTrustedCert(); - CM_LOG_I("leave uninstall all user trusted cert, result = %d", ret); + CM_LOG_I("leave uninstall all user trusted cert, result = %{public}d", ret); return ret; } @@ -369,7 +369,7 @@ CM_API_EXPORT int32_t CmInstallSystemAppCert(const struct CmAppCertParam *certPa } int32_t ret = CmClientInstallSystemAppCert(certParam, keyUri); - CM_LOG_I("leave install system app certificate, result = %d", ret); + CM_LOG_I("leave install system app certificate, result = %{public}d", ret); return ret; } @@ -393,7 +393,7 @@ CM_API_EXPORT int32_t CmInstallUserCACert(const struct CmBlob *userCert, uint32_t uStatus = status ? 0 : 1; // 0 indicates the certificate enabled status ret = CmClientInstallUserTrustedCert(userCert, certAlias, userId, uStatus, certUri); - CM_LOG_I("leave install user ca cert, result = %d", ret); + CM_LOG_I("leave install user ca cert, result = %{public}d", ret); return ret; } @@ -406,7 +406,7 @@ CM_API_EXPORT int32_t CmGetUserCACertList(const struct UserCAProperty *property, const uint32_t store = CM_USER_TRUSTED_STORE; int32_t ret = CmClientGetUserCertList(property, store, certificateList); - CM_LOG_I("leave get user ca cert list, result = %d", ret); + CM_LOG_I("leave get user ca cert list, result = %{public}d", ret); return ret; } @@ -419,7 +419,7 @@ CM_API_EXPORT int32_t CmGetCertStorePath(const enum CmCertType type, const uint3 if (type == CM_CA_CERT_SYSTEM) { if (strcpy_s(path, pathLen, CA_STORE_PATH_SYSTEM) != EOK) { - CM_LOG_E("get system ca path: out path len[%u] too small.", pathLen); + CM_LOG_E("get system ca path: out path len[%{public}u] too small.", pathLen); return CMR_ERROR_BUFFER_TOO_SMALL; } return CM_SUCCESS; @@ -427,7 +427,7 @@ CM_API_EXPORT int32_t CmGetCertStorePath(const enum CmCertType type, const uint3 if (type == CM_CA_CERT_USER) { if (sprintf_s(path, pathLen, "%s%u", CA_STORE_PATH_USER_SERVICE_BASE, userId) < 0) { - CM_LOG_E("get user ca path: out path len[%u] too small.", pathLen); + CM_LOG_E("get user ca path: out path len[%{public}u] too small.", pathLen); return CMR_ERROR_BUFFER_TOO_SMALL; } return CM_SUCCESS; diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index 03db8cb..362b88e 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -56,6 +56,7 @@ ohos_shared_library("certmanager") { "napi:ace_napi", "os_account:os_account_innerkits", "samgr:samgr_proxy", + "hilog:libhilog", ] cflags_cc = [ "-Wall", diff --git a/interfaces/kits/napi/src/cm_napi_common.cpp b/interfaces/kits/napi/src/cm_napi_common.cpp index 3c708e5..5c1d9d2 100644 --- a/interfaces/kits/napi/src/cm_napi_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_common.cpp @@ -116,7 +116,7 @@ napi_value ParseCertAlias(napi_env env, napi_value napiObj, CmBlob *&certAlias) return nullptr; } if (length > CM_MAX_DATA_LEN) { /* alias can be empty */ - CM_LOG_E("input alias length is too large, length: %d", length); + CM_LOG_E("input alias length is too large, length: %{public}d", length); return nullptr; } @@ -167,7 +167,7 @@ napi_value ParseString(napi_env env, napi_value object, CmBlob *&stringBlob) // add 0 length check if ((length == 0) || (length > CM_MAX_DATA_LEN)) { - CM_LOG_E("input string length is 0 or too large, length: %d", length); + CM_LOG_E("input string length is 0 or too large, length: %{public}d", length); return nullptr; } @@ -216,7 +216,7 @@ napi_value GetUint8Array(napi_env env, napi_value object, CmBlob &arrayBlob) return nullptr; } if (length > CM_MAX_DATA_LEN) { - CM_LOG_E("Data is too large, length = %x", length); + CM_LOG_E("Data is too large, length = %{public}x", length); return nullptr; } if (length == 0) { @@ -232,7 +232,7 @@ napi_value GetUint8Array(napi_env env, napi_value object, CmBlob &arrayBlob) } (void)memset_s(arrayBlob.data, length, 0, length); if (memcpy_s(arrayBlob.data, length, rawData, length) != EOK) { - CM_LOG_E("memcpy_s fail, length = %x", length); + CM_LOG_E("memcpy_s fail, length = %{public}x", length); return nullptr; } arrayBlob.size = static_cast(length); diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_info_common.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_info_common.cpp index a009ccf..d241b9a 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_info_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_info_common.cpp @@ -69,7 +69,7 @@ napi_value GetAppCertInfoParseParams( if ((argc != CM_NAPI_GET_APP_CERT_INFO_MIN_ARGS) && (argc != CM_NAPI_GET_APP_CERT_INFO_MAX_ARGS)) { ThrowError(env, PARAM_ERROR, "arguments count invalid, arguments count need between 1 and 2."); - CM_LOG_E("arguments count invalid. argc = %d", argc); + CM_LOG_E("arguments count invalid. argc = %{public}d", argc); return nullptr; } @@ -173,7 +173,7 @@ napi_value GetAppCertInfoAsyncWork(napi_env env, GetAppCertInfoAsyncContext asyn napi_value CMNapiGetAppCertInfoCommon(napi_env env, napi_callback_info info, uint32_t store) { - CM_LOG_I("get app cert info enter, store = %u", store); + CM_LOG_I("get app cert info enter, store = %{public}u", store); GetAppCertInfoAsyncContext context = CreateGetAppCertInfoAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_get_app_cert_list_common.cpp b/interfaces/kits/napi/src/cm_napi_get_app_cert_list_common.cpp index b10e264..258c49e 100644 --- a/interfaces/kits/napi/src/cm_napi_get_app_cert_list_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_app_cert_list_common.cpp @@ -214,7 +214,7 @@ napi_value GetCallingAppCertListAsyncWork(napi_env env, GetAppCertListAsyncConte napi_value CMNapiGetAppCertListCommon(napi_env env, napi_callback_info info, uint32_t store) { - CM_LOG_I("get app cert list enter, store = %u", store); + CM_LOG_I("get app cert list enter, store = %{public}u", store); GetAppCertListAsyncContext context = CreateGetAppCertListAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp b/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp index 66b074e..349bc68 100644 --- a/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_cert_store_path.cpp @@ -75,7 +75,7 @@ static int32_t GetUserCaStorePath(const enum CmCertScope certScope, string &path ret = AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(bundleInfo.applicationInfo.uid, userId); if (ret != 0) { - CM_LOG_E("Failed to get userid from uid[%d]", bundleInfo.applicationInfo.uid); + CM_LOG_E("Failed to get userid from uid[%{public}d]", bundleInfo.applicationInfo.uid); return CM_FAILURE; } @@ -142,7 +142,7 @@ static int32_t GetCertScope(napi_env env, napi_value arg, uint32_t &scope) } if (!IsValidCertScope(scope)) { /* the scope needs to be checked regardless of the certType type */ - CM_LOG_E("certScope[%u] is invalid", scope); + CM_LOG_E("certScope[%{public}u] is invalid", scope); return CM_FAILURE; } @@ -165,7 +165,7 @@ static int32_t GetAndCheckCertType(napi_env env, napi_value arg, uint32_t &type) } if (!IsValidCertType(type)) { - CM_LOG_E("certType[%u] is invalid", type); + CM_LOG_E("certType[%{public}u] is invalid", type); return CM_FAILURE; } return CM_SUCCESS; diff --git a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp index 4468842..5f725e4 100644 --- a/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp +++ b/interfaces/kits/napi/src/cm_napi_get_system_cert_list.cpp @@ -78,7 +78,7 @@ static int32_t GetAndCheckScope(napi_env env, napi_value arg, enum CmCertScope & } if (!IsValidCertScope(scope)) { - CM_LOG_E("scope[%u] is invalid", scope); + CM_LOG_E("scope[%{public}u] is invalid", scope); return CM_FAILURE; } diff --git a/interfaces/kits/napi/src/cm_napi_install_app_cert_common.cpp b/interfaces/kits/napi/src/cm_napi_install_app_cert_common.cpp index c3d2193..484b5e8 100644 --- a/interfaces/kits/napi/src/cm_napi_install_app_cert_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_install_app_cert_common.cpp @@ -108,7 +108,7 @@ napi_value InstallAppCertParseParams( NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr)); if ((argc != CM_NAPI_INSTALL_APP_CERT_MIN_ARGS) && (argc != CM_NAPI_INSTALL_APP_CERT_MAX_ARGS)) { ThrowError(env, PARAM_ERROR, "arguments count invalid, arguments count need between 3 and 4."); - CM_LOG_E("arguments count invalid. argc = %d", argc); + CM_LOG_E("arguments count invalid. argc = %{public}d", argc); return nullptr; } size_t index = 0; @@ -254,7 +254,7 @@ napi_value InstallAppCertAsyncWork(napi_env env, InstallAppCertAsyncContext asyn napi_value CMNapiInstallAppCertCommon(napi_env env, napi_callback_info info, uint32_t store) { - CM_LOG_I("install app cert enter, store = %u", store); + CM_LOG_I("install app cert enter, store = %{public}u", store); InstallAppCertAsyncContext context = CreateInstallAppCertAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert_common.cpp b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert_common.cpp index 83ff35b..1d3203d 100644 --- a/interfaces/kits/napi/src/cm_napi_uninstall_app_cert_common.cpp +++ b/interfaces/kits/napi/src/cm_napi_uninstall_app_cert_common.cpp @@ -66,7 +66,7 @@ napi_value UninstallAppCertParseParams( if ((argc != CM_NAPI_UNINSTALL_APP_CERT_MIN_ARGS) && (argc != CM_NAPI_UNINSTALL_APP_CERT_MAX_ARGS)) { ThrowError(env, PARAM_ERROR, "arguments count invalid, arguments count need between 1 and 2."); - CM_LOG_E("arguments count invalid. argc = %d", argc); + CM_LOG_E("arguments count invalid. argc = %{public}d", argc); return nullptr; } @@ -143,7 +143,7 @@ napi_value UninstallAppCertAsyncWork(napi_env env, UninstallAppCertAsyncContext napi_value CMNapiUninstallAppCertCommon(napi_env env, napi_callback_info info, uint32_t store) { - CM_LOG_I("uninstall app cert enter, store = %u", store); + CM_LOG_I("uninstall app cert enter, store = %{public}u", store); UninstallAppCertAsyncContext context = CreateUninstallAppCertAsyncContext(); if (context == nullptr) { diff --git a/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp b/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp index 2635285..88684f3 100644 --- a/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp +++ b/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp @@ -275,7 +275,7 @@ napi_value ParseString(napi_env env, napi_value obj, CmBlob *&blob) } if ((length == 0) || (length > CM_MAX_DATA_LEN)) { - CM_LOG_E("input string length is 0 or too large, length: %d", length); + CM_LOG_E("input string length is 0 or too large, length: %{public}d", length); return nullptr; } @@ -327,7 +327,7 @@ napi_value GetUint8ArrayToBase64Str(napi_env env, napi_value object, std::string return nullptr; } if (length > CM_MAX_DATA_LEN) { - CM_LOG_E("certData is too large, length = %x", length); + CM_LOG_E("certData is too large, length = %{public}x", length); return nullptr; } uint8_t *data = nullptr; @@ -345,7 +345,7 @@ napi_value GetUint8ArrayToBase64Str(napi_env env, napi_value object, std::string (void)memset_s(data, length, 0, length); if (memcpy_s(data, length, certData, length) != EOK) { CmFree(data); - CM_LOG_E("memcpy_s fail, length = %x", length); + CM_LOG_E("memcpy_s fail, length = %{public}x", length); return nullptr; } std::string encode = EncodeBase64(data, length); @@ -448,7 +448,7 @@ int32_t GetCallerLabelName(std::shared_ptr asyncCon static_cast(OHOS::AppExecFwk::GetBundleInfoFlag::GET_BUNDLE_INFO_WITH_ABILITY); int32_t resCode = bundleMgrProxy->GetBundleInfoForSelf(flags, bundleInfo); if (resCode != CM_SUCCESS) { - CM_LOG_E("Failed to get bundleInfo, resCode is %d", resCode); + CM_LOG_E("Failed to get bundleInfo, resCode is %{public}d", resCode); return CM_FAILURE; } @@ -460,7 +460,7 @@ int32_t GetCallerLabelName(std::shared_ptr asyncCon resCode = asyncContext->context->GetResourceManager()->GetStringById(bundleInfo.applicationInfo.labelId, asyncContext->labelName); if (resCode != CM_SUCCESS) { - CM_LOG_E("getStringById is faild, resCode is %d", resCode); + CM_LOG_E("getStringById is faild, resCode is %{public}d", resCode); return CM_FAILURE; } return CM_SUCCESS; diff --git a/interfaces/kits/napi/src/dialog/cm_napi_open_dialog.cpp b/interfaces/kits/napi/src/dialog/cm_napi_open_dialog.cpp index 1d77a35..4a27ef0 100644 --- a/interfaces/kits/napi/src/dialog/cm_napi_open_dialog.cpp +++ b/interfaces/kits/napi/src/dialog/cm_napi_open_dialog.cpp @@ -69,7 +69,7 @@ bool CmUIExtensionCallback::SetErrorCode(int32_t code) void CmUIExtensionCallback::OnRelease(const int32_t releaseCode) { - CM_LOG_D("UIExtensionComponent OnRelease(), releaseCode = %d", releaseCode); + CM_LOG_D("UIExtensionComponent OnRelease(), releaseCode = %{public}d", releaseCode); if (SetErrorCode(releaseCode)) { SendMessageBack(); } @@ -77,7 +77,7 @@ void CmUIExtensionCallback::OnRelease(const int32_t releaseCode) void CmUIExtensionCallback::OnResult(const int32_t resultCode, const OHOS::AAFwk::Want& result) { - CM_LOG_D("UIExtensionComponent OnResult(), resultCode = %d", resultCode); + CM_LOG_D("UIExtensionComponent OnResult(), resultCode = %{public}d", resultCode); this->resultCode_ = resultCode; this->resultWant_ = result; if (SetErrorCode(0)) { @@ -95,7 +95,7 @@ void CmUIExtensionCallback::OnReceive(const OHOS::AAFwk::WantParams& request) void CmUIExtensionCallback::OnError(const int32_t errorCode, const std::string& name, const std::string& message) { - CM_LOG_E("UIExtensionComponent OnError(), errorCode = %d, name = %s, message = %s", + CM_LOG_E("UIExtensionComponent OnError(), errorCode = %{public}d, name = %{public}s, message = %{public}s", errorCode, name.c_str(), message.c_str()); if (SetErrorCode(errorCode)) { SendMessageBack(); 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 a201b57..0fb7848 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 @@ -72,6 +72,7 @@ ohos_static_library("cert_manager_engine_core_standard") { "huks:libhukssdk", "ipc:ipc_core", "openssl:libcrypto_shared", + "hilog:libhilog", ] complete_static_lib = true diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_status.h b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_status.h index 321e6b0..1604fb9 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_status.h +++ b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_status.h @@ -45,13 +45,13 @@ #define CM_ERROR(rc) (int32_t) (rc) -#define ASSERT_ARGS(c) if (!(c)) { CM_LOG_W("Invalid args: %s\n", #c); return CMR_ERROR_INVALID_ARGUMENT; } -#define ASSERT_FUNC(f) if (CMR_OK != (f)) { CM_LOG_W("Failed: %s\n", #f); return CMR_ERROR; } +#define ASSERT_ARGS(c) if (!(c)) { CM_LOG_W("Invalid args: %{public}s\n", #c); return CMR_ERROR_INVALID_ARGUMENT; } +#define ASSERT_FUNC(f) if (CMR_OK != (f)) { CM_LOG_W("Failed: %{public}s\n", #f); return CMR_ERROR; } #define ASSERT_CM_CALL(f) do {int32_t _rc = (f); if ((_rc) != CM_SUCCESS) { return CM_ERROR((_rc)); }} while (0) #define TRY_FUNC(f, rc) do { \ - (rc) = (f); if ((rc)) { CM_LOG_W("Failed: %s, %d\n", #f, (rc)); goto finally; }} while (0) + (rc) = (f); if ((rc)) { CM_LOG_W("Failed: %{public}s, %{public}d\n", #f, (rc)); goto finally; }} while (0) #define FREE_PTR(p) if ((p) != NULL) { CMFree((p)); (p) = NULL; } @@ -60,7 +60,7 @@ #define HKS_BLOB(b) (struct HksBlob) { .size = (b)->size, .data = (uint8_t *) (b)->data } #define TRY_HKS_CALL(f, rc) do {int32_t _rc = (f); if ((_rc) != HKS_SUCCESS) { \ - CM_LOG_W("Failed: %s, %d\n", #f, (_rc)); (rc) = CM_ERROR((_rc)); goto finally; }} while (0) + CM_LOG_W("Failed: %{public}s, %{public}d\n", #f, (_rc)); (rc) = CM_ERROR((_rc)); goto finally; }} while (0) typedef int (*RbTreeValueEncoder)(RbTreeValue value, uint8_t *buf, uint32_t *size); diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_uri.h b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_uri.h index b509d8f..0064821 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_uri.h +++ b/services/cert_manager_standard/cert_manager_engine/main/core/include/cert_manager_uri.h @@ -37,7 +37,7 @@ extern "C" { #define FREE CMFree #define ASSERT_MALLOC(p, sz) do { (p) = MALLOC(sz); if ( (p) == NULL) { \ - CM_LOG_E("Failed to allocate memory of size: %u\n", (uint32_t) (sz)); return CMR_ERROR_MALLOC_FAIL; } } while (0) + CM_LOG_E("Failed to allocate memory of size: %{public}u\n", (uint32_t) (sz)); return CMR_ERROR_MALLOC_FAIL; } } while (0) // object types: certificate, mac-key, app-key, WLAN-key static const char *g_types[] = { "c", "m", "ak", "wk", "sk" }; diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c index 2340b3b..c752e0a 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager.c @@ -54,7 +54,7 @@ int32_t CertManagerInitialize(void) if (!g_hksInitialized) { ret = HksInitialize(); if (ret != HKS_SUCCESS) { - CM_LOG_E("HUKS init failed, ret = %d", ret); + CM_LOG_E("HUKS init failed, ret = %{public}d", ret); return CMR_ERROR_SA_START_HUKS_INIT_FAILED; } g_hksInitialized = true; @@ -114,7 +114,7 @@ static int32_t GetFilePath(const struct CmContext *context, uint32_t store, char } if (ret < 0) { - CM_LOG_E("Construct file Path failed ret: %d", ret); + CM_LOG_E("Construct file Path failed ret: %{public}d", ret); return CMR_ERROR_MEM_OPERATION_PRINT; } @@ -122,7 +122,7 @@ static int32_t GetFilePath(const struct CmContext *context, uint32_t store, char if (store != CM_SYSTEM_TRUSTED_STORE) { ret = sprintf_s(suffix, MAX_SUFFIX_LEN, "%u", context->uid); if (ret < 0) { - CM_LOG_E("Construct file suffix failed ret: %d", ret); + CM_LOG_E("Construct file suffix failed ret: %{public}d", ret); return CMR_ERROR_MEM_OPERATION_PRINT; } } @@ -181,7 +181,7 @@ static int32_t FindObjectCert(const struct CmBlob *certUri, const struct CmMutab { for (uint32_t i = 0; i < certCount; i++) { if (fNames[i].data == NULL) { - CM_LOG_E("Corrupted file name at index: %u", i); + CM_LOG_E("Corrupted file name at index: %{public}u", i); return CMR_ERROR_STORAGE; } /* Check if url is matching with the cert filename */ @@ -225,7 +225,7 @@ int32_t CertManagerFindCertFileNameByUri(const struct CmContext *context, const ret = GetGmSystemCaCertPath(path); } if (ret != CM_SUCCESS) { - CM_LOG_E("Failed obtain path for store %x\n", store); + CM_LOG_E("Failed obtain path for store %{public}x\n", store); return ret; } @@ -240,7 +240,7 @@ int32_t CertManagerFindCertFileNameByUri(const struct CmContext *context, const ret = FindObjectCert(certUri, fNames, fileNames.size); FreeFileNames(fNames, fileNames.size); if (ret != CM_SUCCESS) { - CM_LOG_E("No cert matched, err: %d", ret); + CM_LOG_E("No cert matched, err: %{public}d", ret); } return ret; } @@ -253,7 +253,7 @@ int32_t CmRemoveAppCert(const struct CmContext *context, const struct CmBlob *ke enum CmAuthStorageLevel level; int32_t ret = GetRdbAuthStorageLevel(keyUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); return ret; } @@ -266,7 +266,7 @@ int32_t CmRemoveAppCert(const struct CmContext *context, const struct CmBlob *ke ret = DeleteCertProperty((char *)keyUri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed delete cert: %s rdbData", (char *)keyUri->data); + CM_LOG_E("Failed delete cert: %{public}s rdbData", (char *)keyUri->data); return ret; } @@ -275,17 +275,17 @@ int32_t CmRemoveAppCert(const struct CmContext *context, const struct CmBlob *ke ret = CmGetFilePath(context, store, &path); if (ret != CMR_OK) { - CM_LOG_E("Failed obtain path for store %u", store); + CM_LOG_E("Failed obtain path for store %{public}u", store); return ret; } ret = CertManagerFileRemove(pathBuf, (char *)keyUri->data); if (ret != CMR_OK) { - CM_LOG_E("CertManagerFileRemove failed ret: %d", ret); + CM_LOG_E("CertManagerFileRemove failed ret: %{public}d", ret); return ret; } ret = CmKeyOpDeleteKey(keyUri, level); if (ret != CM_SUCCESS) { /* ignore the return of deleteKey */ - CM_LOG_E("CertManagerKeyRemove failed, ret: %d", ret); + CM_LOG_E("CertManagerKeyRemove failed, ret: %{public}d", ret); } return CMR_OK; @@ -414,13 +414,13 @@ static int32_t GetUriAndDeleteRdbData(const char *filePath, struct CmBlob *uriBl ret = GetRdbAuthStorageLevel(uriBlob, level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); return ret; } ret = DeleteCertProperty((char *)uriBlob->data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed delete cert: %s rdbData", (char *)uriBlob->data); + CM_LOG_E("Failed delete cert: %{public}s rdbData", (char *)uriBlob->data); return ret; } return CM_SUCCESS; @@ -441,7 +441,7 @@ static int32_t CmRemoveSpecifiedAppCert(const struct CmContext *context, const u do { ret = CmAppCertGetFilePath(context, store, &path); if (ret != CM_SUCCESS) { - CM_LOG_E("Get file path for store:%u faild", store); + CM_LOG_E("Get file path for store:%{public}u faild", store); break; } @@ -457,7 +457,7 @@ static int32_t CmRemoveSpecifiedAppCert(const struct CmContext *context, const u for (uint32_t i = 0; i < fileCount; i++) { if (CertManagerFileRemove(NULL, (char *)fileNames[i].data) != CM_SUCCESS) { - CM_LOG_E("App cert %u remove faild", i); + CM_LOG_E("App cert %{public}u remove faild", i); continue; } @@ -471,7 +471,7 @@ static int32_t CmRemoveSpecifiedAppCert(const struct CmContext *context, const u int32_t retCode = CmKeyOpDeleteKey(&uriBlob, level); if (retCode != CM_SUCCESS) { /* ignore the return of deleteKey */ - CM_LOG_E("App key %u remove failed ret: %d", i, retCode); + CM_LOG_E("App key %{public}u remove failed ret: %{public}d", i, retCode); } ClearAuthInfo(context, &uriBlob, store, level); } @@ -521,7 +521,7 @@ int32_t CmServiceGetAppCertList(const struct CmContext *context, uint32_t store, int32_t ret = CmAppCertGetFilePath(context, store, &path); if (ret != CM_SUCCESS) { - CM_LOG_E("Get file path for store:%u faild", store); + CM_LOG_E("Get file path for store:%{public}u faild", store); return CM_FAILURE; } @@ -531,7 +531,7 @@ int32_t CmServiceGetAppCertList(const struct CmContext *context, uint32_t store, ret = CmUserIdLayerGetFileCountAndNames(pathBuf, fileNames, fileSize, fileCount); } if (ret != CM_SUCCESS) { - CM_LOG_E("Get file count and names from path faild ret:%d", ret); + CM_LOG_E("Get file count and names from path faild ret:%{public}d", ret); return ret; } @@ -546,13 +546,13 @@ int32_t CmServiceGetCallingAppCertList(const struct CmContext *context, uint32_t int32_t ret = CmCallingAppCertGetFilePath(context, store, &path); if (ret != CM_SUCCESS) { - CM_LOG_E("Get file path for store:%u faild", store); + CM_LOG_E("Get file path for store:%{public}u faild", store); return CM_FAILURE; } ret = CmUidLayerGetFileCountAndNames(pathBuf, fileNames, fileSize, fileCount); if (ret != CM_SUCCESS) { - CM_LOG_E("Get file count and names from path faild ret:%d", ret); + CM_LOG_E("Get file count and names from path faild ret:%{public}d", ret); return ret; } @@ -588,7 +588,7 @@ int32_t CmCheckCertCount(const struct CmContext *context, const uint32_t store, uint32_t certCount = 0; int32_t retVal = GetCertOrCredCount(context, store, &certCount); if (retVal != CM_SUCCESS) { - CM_LOG_E("Failed obtain cert count for store:%u", store); + CM_LOG_E("Failed obtain cert count for store:%{public}u", store); break; } if (certCount < MAX_COUNT_CERTIFICATE) { @@ -599,7 +599,7 @@ int32_t CmCheckCertCount(const struct CmContext *context, const uint32_t store, char pathBuf[CERT_MAX_PATH_LEN] = {0}; retVal = ConstructUidPath(context, store, pathBuf, sizeof(pathBuf)); if (retVal != CM_SUCCESS) { - CM_LOG_E("Failed obtain path for store:%u", store); + CM_LOG_E("Failed obtain path for store:%{public}u", store); break; } @@ -631,7 +631,7 @@ static int32_t ConstructCertUri(const struct CmContext *context, const struct Cm } if (certUri->size < commonUri.size) { - CM_LOG_E("out cert uri size[%u] too small", certUri->size); + CM_LOG_E("out cert uri size[%{public}u] too small", certUri->size); ret = CMR_ERROR_BUFFER_TOO_SMALL; break; } @@ -653,7 +653,7 @@ int32_t CmWriteUserCert(const struct CmContext *context, struct CmMutableBlob *p const struct CmBlob *userCert, const struct CmBlob *certAlias, struct CmBlob *certUri) { if (certAlias->size > MAX_LEN_CERT_ALIAS) { - CM_LOG_E("alias size[%u] is too large", certAlias->size); + CM_LOG_E("alias size[%{public}u] is too large", certAlias->size); return CMR_ERROR_ALIAS_LENGTH_REACHED_LIMIT; } @@ -699,7 +699,7 @@ int32_t CmGetDisplayNameByURI(const struct CmBlob *uri, const char *object, stru (void)memset_s(&certProperty, sizeof(struct CertProperty), 0, sizeof(struct CertProperty)); ret = QueryCertProperty((char *)uri->data, &certProperty); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to query certProperty, ret=%d", ret); + CM_LOG_E("Failed to query certProperty, ret=%{public}d", ret); return ret; } const char *temp = NULL; @@ -837,13 +837,13 @@ int32_t CmBackupRemove(uint32_t userId, const char *path, const struct CmBlob *c char userCertConfigFilePath[CERT_MAX_PATH_LEN] = { 0 }; int32_t ret = CmGetCertConfPath(userId, uid, certUri, userCertConfigFilePath, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Get user cert config path failed ret = %d", ret); + CM_LOG_E("Get user cert config path failed ret = %{public}d", ret); return CM_FAILURE; } ret = CmRemoveBackupUserCert(NULL, NULL, userCertConfigFilePath); if (ret != CMR_OK) { - CM_LOG_E("User Cert remove config and backup file failed, ret: %d", ret); + CM_LOG_E("User Cert remove config and backup file failed, ret: %{public}d", ret); } return ret; } @@ -866,22 +866,22 @@ static int32_t RemoveAllUserCert(const struct CmContext *context, uint32_t store certUri.size = fNames[i].size - 1; ret = DeleteCertProperty((char *)certUri.data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri.data); + CM_LOG_E("Failed delete cert: %{public}s rdbData", (char *)certUri.data); continue; } ret = CmBackupRemove(context->userId, path, &certUri); if (ret != CMR_OK) { - CM_LOG_E("User Cert %u remove config and backup file failed, ret: %d", i, ret); + CM_LOG_E("User Cert %{public}u remove config and backup file failed, ret: %{public}d", i, ret); continue; } ret = CertManagerFileRemove(path, (char *)fNames[i].data); if (ret != CMR_OK) { - CM_LOG_E("User Cert %u remove failed, ret: %d", i, ret); + CM_LOG_E("User Cert %{public}u remove failed, ret: %{public}d", i, ret); continue; } ret = CmSetStatusEnable(context, &pathBlob, (struct CmBlob *)(&fNames[i]), store); if (ret != CM_SUCCESS) { - CM_LOG_E("Update StatusFile %u fail, ret = %d", i, ret); + CM_LOG_E("Update StatusFile %{public}u fail, ret = %{public}d", i, ret); continue; } } @@ -911,13 +911,13 @@ static int32_t RemoveAllConfUidDir(uint32_t userId, const char *uidPath) int32_t ret = CmGetCertConfUidDir(userId, uid, configUidDirPath, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Get user cert config file UidDirPath failed, ret = %d", ret); + CM_LOG_E("Get user cert config file UidDirPath failed, ret = %{public}d", ret); return ret; } ret = CmDirRemove(configUidDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove user cert config file configUidDirPath fail, ret = %d", ret); + CM_LOG_E("Remove user cert config file configUidDirPath fail, ret = %{public}d", ret); } return ret; } @@ -931,17 +931,17 @@ int32_t CmRemoveAllUserCert(const struct CmContext *context, uint32_t store, con for (uint32_t i = 0; i < pathList->size; i++) { ret = RemoveAllUserCert(context, store, (char *)path[i].data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed remove usercert at %u_th dir", i); + CM_LOG_E("Failed remove usercert at %{public}u_th dir", i); continue; } ret = RemoveAllUidDir((char *)path[i].data); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove UidPath fail, ret = %d", ret); + CM_LOG_E("Remove UidPath fail, ret = %{public}d", ret); continue; } ret = RemoveAllConfUidDir(context->userId, (char *)path[i].data); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove all config UidPath fail, ret = %d", ret); + CM_LOG_E("Remove all config UidPath fail, ret = %{public}d", ret); continue; } } @@ -963,7 +963,7 @@ int32_t CmRemoveBackupUserCert(const struct CmContext *context, const struct CmB ret = CmGetCertConfPath(context->userId, context->uid, certUri, userConfigFilePath, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("CmGetCertConfPath failed, ret = %d", ret); + CM_LOG_E("CmGetCertConfPath failed, ret = %{public}d", ret); return ret; } userConfFilePath = userConfigFilePath; @@ -973,13 +973,13 @@ int32_t CmRemoveBackupUserCert(const struct CmContext *context, const struct CmB ret = CmRmUserCert(userConfFilePath); if (ret != CM_SUCCESS) { - CM_LOG_E("RmUserCertFile failed, ret = %d", ret); + CM_LOG_E("RmUserCertFile failed, ret = %{public}d", ret); return ret; } ret = CmRmSaConf(userConfFilePath); if (ret != CM_SUCCESS) { - CM_LOG_E("RmSaConfFile fail, ret = %d", ret); + CM_LOG_E("RmSaConfFile fail, ret = %{public}d", ret); return ret; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_app_cert_process.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_app_cert_process.c index dc0abc2..fa1f895 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_app_cert_process.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_app_cert_process.c @@ -195,7 +195,7 @@ static int32_t SaveKeyMaterialCurve25519(uint32_t algType, const EVP_PKEY *pKey, uint32_t totalSize = sizeof(struct HksKeyMaterial25519) + (CURVE25519_KEY_LEN_BYTES << 1); uint8_t *buffer = (uint8_t *)CMMalloc(totalSize); if (buffer == NULL) { - CM_LOG_E("malloc size %u failed", totalSize); + CM_LOG_E("malloc size %{public}u failed", totalSize); return CMR_ERROR_MALLOC_FAIL; } (void)memset_s(buffer, totalSize, 0, totalSize); @@ -239,7 +239,7 @@ static int32_t ImportRsaKey(const EVP_PKEY *priKey, const struct CmBlob *keyUri, do { const RSA *rsa = EVP_PKEY_get0_RSA((EVP_PKEY *)priKey); if (rsa == NULL) { - CM_LOG_E("EVP_PKEY_get1_RSA error %s", ERR_reason_error_string(ERR_get_error())); + CM_LOG_E("EVP_PKEY_get1_RSA error %{public}s", ERR_reason_error_string(ERR_get_error())); ret = CMR_ERROR_OPENSSL_FAIL; break; } @@ -247,7 +247,7 @@ static int32_t ImportRsaKey(const EVP_PKEY *priKey, const struct CmBlob *keyUri, ret = SaveKeyMaterialRsa(rsa, keySize, &keyPair); if (ret != CMR_OK) { - CM_LOG_E("save rsa key material failed ret=0x%x", ret); + CM_LOG_E("save rsa key material failed ret=0x%{public}x", ret); break; } @@ -291,7 +291,7 @@ static int32_t ImportEccKey(const EVP_PKEY *priKey, const struct CmBlob *keyUri, } ret = SaveKeyMaterialEcc(eccKey, keyLen, algType, &keyPair); if (ret != CMR_OK) { - CM_LOG_E("save ec key material failed ret=0x%x, curveName = %d", ret, curveName); + CM_LOG_E("save ec key material failed ret=0x%{public}x, curveName = %{public}d", ret, curveName); break; } @@ -368,7 +368,7 @@ static int32_t StoreAppCert(const struct CmContext *context, struct AppCert *app char pathBuf[CERT_MAX_PATH_LEN] = {0}; int32_t ret = ConstructUidPath(context, store, pathBuf, sizeof(pathBuf)); if (ret != CMR_OK) { - CM_LOG_E("Failed obtain path for store:%u", store); + CM_LOG_E("Failed obtain path for store:%{public}u", store); return ret; } @@ -402,7 +402,7 @@ static int32_t ConstructKeyUri( } if (keyUri->size < commonUri.size) { - CM_LOG_E("out key uri size[%u] too small", keyUri->size); + CM_LOG_E("out key uri size[%{public}u] too small", keyUri->size); ret = CMR_ERROR_BUFFER_TOO_SMALL; break; } @@ -462,7 +462,7 @@ static int32_t StoreKeyAndCert(const struct CmContext *context, const struct CmA ret = GetRdbAuthStorageLevel(keyUri, &level); /* Return "CM_SUCCESS" when no results are found in the query. */ if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); return ret; } @@ -473,7 +473,7 @@ static int32_t StoreKeyAndCert(const struct CmContext *context, const struct CmA ret = CmRemoveAppCert(context, keyUri, CM_PRI_CREDENTIAL_STORE); if (ret != CM_SUCCESS) { /* Don't return when the deletion fails to increase fault tolerance. */ - CM_LOG_E("remove private app cert failed, ret = %d", ret); + CM_LOG_E("remove private app cert failed, ret = %{public}d", ret); } } level = param->level; diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_list_mgr.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_list_mgr.c index be5de09..1cff25b 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_list_mgr.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_list_mgr.c @@ -32,20 +32,20 @@ static int32_t CheckAuthListFileSizeValid(const struct CmBlob *originList, uint32_t *authCount) { if (originList->size < (sizeof(uint32_t) + sizeof(uint32_t))) { /* version and count size */ - CM_LOG_E("invalid authlist size[%u]", originList->size); + CM_LOG_E("invalid authlist size[%{public}u]", originList->size); return CMR_ERROR_STORAGE; } uint32_t count = 0; (void)memcpy_s(&count, sizeof(count), originList->data + sizeof(uint32_t), sizeof(count)); if (count > MAX_OUT_BLOB_SIZE) { - CM_LOG_E("invalid auth count[%u]", count); + CM_LOG_E("invalid auth count[%{public}u]", count); return CMR_ERROR_MEM_OPERATION_COPY; } uint32_t size = sizeof(uint32_t) + sizeof(uint32_t) + sizeof(uint32_t) * count; if (originList->size != size) { - CM_LOG_E("invalid auth list file size[%u], count[%u]", originList->size, count); + CM_LOG_E("invalid auth list file size[%{public}u], count[%{public}u]", originList->size, count); return CMR_ERROR_STORAGE; } @@ -99,7 +99,7 @@ static int32_t InsertUid(const struct CmBlob *originList, uint32_t uid, struct C } if (count >= MAX_AUTH_COUNT) { - CM_LOG_E("max granted uid count reached, count = %u", count); + CM_LOG_E("max granted uid count reached, count = %{public}u", count); return CMR_ERROR_MAX_GRANT_COUNT_REACHED; } @@ -341,7 +341,7 @@ int32_t CmAddAuthUid(const struct CmContext *context, const struct CmBlob *uri, ret = RefreshAuthList(authListPath, (char *)uri->data, uid, true); if (ret != CM_SUCCESS) { - CM_LOG_E("refresh auth list failed, ret = %d", ret); + CM_LOG_E("refresh auth list failed, ret = %{public}d", ret); } return ret; } @@ -356,7 +356,7 @@ int32_t CmRemoveAuthUid(const struct CmContext *context, const struct CmBlob *ur ret = RefreshAuthList(authListPath, (char *)uri->data, uid, false); if (ret != CM_SUCCESS) { - CM_LOG_E("refresh auth list failed, ret = %d", ret); + CM_LOG_E("refresh auth list failed, ret = %{public}d", ret); } return ret; } @@ -403,7 +403,7 @@ int32_t CmDeleteAuthListFile(const struct CmContext *context, const struct CmBlo ret = CmFileRemove(authListPath, (char *)uri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("remove file failed, ret = %d", ret); + CM_LOG_E("remove file failed, ret = %{public}d", ret); } return ret; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_mgr.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_mgr.c index da710de..9da5043 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_mgr.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_auth_mgr.c @@ -95,7 +95,7 @@ static int32_t GetAndCheckUriObj(struct CMUri *uriObj, const struct CmBlob *uri, { int32_t ret = CertManagerUriDecode(uriObj, (char *)uri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } @@ -202,28 +202,28 @@ static int32_t CalcUriMac(const struct CMUri *uriObj, uint32_t clientUid, struct /* construct to be authed URI */ ret = ConstructToBeAuthedUri(uriObj, clientUid, &toBeAuthedUri); if (ret != CM_SUCCESS) { - CM_LOG_E("construct to be authed uri failed, ret = %d", ret); + CM_LOG_E("construct to be authed uri failed, ret = %{public}d", ret); break; } /* construct mac key URI */ ret = ConstructMacKeyUri(uriObj, clientUid, &macKeyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("construct mac key uri, ret = %d", ret); + CM_LOG_E("construct mac key uri, ret = %{public}d", ret); break; } if (isNeedGenKey) { ret = CmKeyOpGenMacKey(&macKeyUri, level); if (ret != CM_SUCCESS) { - CM_LOG_E("generate mac key failed, ret = %d", ret); + CM_LOG_E("generate mac key failed, ret = %{public}d", ret); break; } } ret = CmKeyOpCalcMac(&macKeyUri, &toBeAuthedUri, mac, level); if (ret != CM_SUCCESS) { - CM_LOG_E("calc mac failed, ret = %d", ret); + CM_LOG_E("calc mac failed, ret = %{public}d", ret); break; } } while (0); @@ -242,13 +242,13 @@ static int32_t DeleteMacKey(const struct CMUri *uriObj, uint32_t clientUid, enum /* construct mac key URI */ ret = ConstructMacKeyUri(uriObj, clientUid, &macKeyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("construct mac key uri, ret = %d", ret); + CM_LOG_E("construct mac key uri, ret = %{public}d", ret); break; } ret = CmKeyOpDeleteKey(&macKeyUri, level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete mac key failed, ret = %d", ret); + CM_LOG_E("delete mac key failed, ret = %{public}d", ret); break; } @@ -282,7 +282,7 @@ static int32_t ConstructAuthUri(const struct CMUri *uriObj, uint32_t clientUid, ret = ByteToHexString(mac->data, mac->size, macHex, macHexLen); if (ret != CM_SUCCESS) { - CM_LOG_E("byte to hex string failed, ret = %d", ret); + CM_LOG_E("byte to hex string failed, ret = %{public}d", ret); CMFree(macHex); return ret; } @@ -307,19 +307,19 @@ static int32_t GenerateAuthUri(const struct CMUri *uriObj, uint32_t clientUid, struct CmBlob mac = { sizeof(macData), macData }; ret = CalcUriMac(uriObj, clientUid, &mac, true, level); if (ret != CM_SUCCESS) { - CM_LOG_E("calc uri mac failed, ret = %d", ret); + CM_LOG_E("calc uri mac failed, ret = %{public}d", ret); break; } /* construct auth URI */ ret = ConstructAuthUri(uriObj, clientUid, &mac, &tempAuthUri); if (ret != CM_SUCCESS) { - CM_LOG_E("construct auth uri failed, ret = %d", ret); + CM_LOG_E("construct auth uri failed, ret = %{public}d", ret); break; } if (authUri->size < tempAuthUri.size) { - CM_LOG_E("auth uri out size[%u] too small, need at least[%u]", authUri->size, tempAuthUri.size); + CM_LOG_E("auth uri out size[%{public}u] too small, need at least[%{public}u]", authUri->size, tempAuthUri.size); ret = CMR_ERROR_BUFFER_TOO_SMALL; break; } @@ -342,7 +342,7 @@ int32_t CmAuthGrantAppCertificate(const struct CmContext *context, const struct pthread_mutex_lock(&g_authMgrLock); int32_t ret = CmCheckCredentialExist(context, keyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("credential not exist when grant auth, ret = %d", ret); + CM_LOG_E("credential not exist when grant auth, ret = %{public}d", ret); pthread_mutex_unlock(&g_authMgrLock); return ret; } @@ -351,7 +351,7 @@ int32_t CmAuthGrantAppCertificate(const struct CmContext *context, const struct (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); ret = GetAndCheckUriObj(&uriObj, keyUri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); pthread_mutex_unlock(&g_authMgrLock); return ret; } @@ -360,27 +360,27 @@ int32_t CmAuthGrantAppCertificate(const struct CmContext *context, const struct enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(keyUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); break; } ret = CheckCallerIsProducer(context, &uriObj); if (ret != CM_SUCCESS) { - CM_LOG_E("check caller userId/uid failed when grant, ret = %d", ret); + CM_LOG_E("check caller userId/uid failed when grant, ret = %{public}d", ret); break; } /* auth URI */ ret = GenerateAuthUri(&uriObj, appUid, authUri, level); if (ret != CM_SUCCESS) { - CM_LOG_E("construct auth URI failed, ret = %d", ret); + CM_LOG_E("construct auth URI failed, ret = %{public}d", ret); break; } /* add auth uid */ ret = CmAddAuthUid(context, keyUri, appUid); if (ret != CM_SUCCESS) { - CM_LOG_E("add auth uid to auth list failed, ret = %d", ret); + CM_LOG_E("add auth uid to auth list failed, ret = %{public}d", ret); break; } } while (0); @@ -401,7 +401,7 @@ int32_t CmAuthGetAuthorizedAppList(const struct CmContext *context, const struct (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = GetAndCheckUriObj(&uriObj, keyUri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); pthread_mutex_unlock(&g_authMgrLock); return ret; } @@ -410,19 +410,19 @@ int32_t CmAuthGetAuthorizedAppList(const struct CmContext *context, const struct do { ret = CheckCallerIsProducer(context, &uriObj); if (ret != CM_SUCCESS) { - CM_LOG_E("check caller userId/uid failed, ret = %d", ret); + CM_LOG_E("check caller userId/uid failed, ret = %{public}d", ret); break; } ret = CmGetAuthList(context, keyUri, &tempAppUidList); if (ret != CM_SUCCESS) { - CM_LOG_E("get auth list failed, ret = %d", ret); + CM_LOG_E("get auth list failed, ret = %{public}d", ret); break; } if (tempAppUidList.appUidCount != 0) { if (appUidList->appUidCount < tempAppUidList.appUidCount) { - CM_LOG_E("out auth list buffer too small, input[%u] < expect[%u]", + CM_LOG_E("out auth list buffer too small, input[%{public}u] < expect[%{public}u]", appUidList->appUidCount, tempAppUidList.appUidCount); ret = CMR_ERROR_BUFFER_TOO_SMALL; break; @@ -458,7 +458,7 @@ static int32_t GetMacByteFromString(const char *macString, struct CmBlob *macByt int32_t ret = HexStringToByte(macString, data, size); if (ret != CM_SUCCESS) { - CM_LOG_E("mac hex string to byte failed, ret = %d", ret); + CM_LOG_E("mac hex string to byte failed, ret = %{public}d", ret); CM_FREE_PTR(data); return ret; } @@ -478,7 +478,7 @@ static int32_t CheckIsAuthorizedApp(const struct CMUri *uriObj, enum CmAuthStora struct CmBlob macByte = { 0, NULL }; int32_t ret = GetMacByteFromString(uriObj->mac, &macByte); if (ret != CM_SUCCESS) { - CM_LOG_E("get mac byte from string failed, ret = %d", ret); + CM_LOG_E("get mac byte from string failed, ret = %{public}d", ret); return ret; } @@ -494,13 +494,13 @@ static int32_t CheckIsAuthorizedApp(const struct CMUri *uriObj, enum CmAuthStora ret = CalcUriMac(uriObj, clientUid, &mac, false, level); if (ret != CM_SUCCESS) { - CM_LOG_E("calc uri mac failed, ret = %d", ret); + CM_LOG_E("calc uri mac failed, ret = %{public}d", ret); CM_FREE_PTR(macByte.data); return CMR_ERROR_AUTH_FAILED_MAC_FAILED; } if ((macByte.size != mac.size) || (memcmp(macByte.data, mac.data, macByte.size) != 0)) { - CM_LOG_E("mac size[%u] invalid or mac check failed", macByte.size); + CM_LOG_E("mac size[%{public}u] invalid or mac check failed", macByte.size); CM_FREE_PTR(macByte.data); return CMR_ERROR_AUTH_FAILED_MAC_MISMATCH; } @@ -515,7 +515,7 @@ int32_t CmAuthIsAuthorizedApp(const struct CmContext *context, const struct CmBl (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = GetAndCheckUriObj(&uriObj, authUri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } struct CmBlob commonUri = { 0, NULL }; @@ -523,20 +523,20 @@ int32_t CmAuthIsAuthorizedApp(const struct CmContext *context, const struct CmBl do { ret = ConstructCommonUri(&uriObj, &commonUri, CM_CREDENTIAL_STORE); if (ret != CM_SUCCESS) { - CM_LOG_E("construct common uri failed, ret = %d", ret); + CM_LOG_E("construct common uri failed, ret = %{public}d", ret); break; } enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(&commonUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); break; } ret = CheckIsAuthorizedApp(&uriObj, level); if (ret != CM_SUCCESS) { - CM_LOG_E("check is authed app failed, ret = %d", ret); + CM_LOG_E("check is authed app failed, ret = %{public}d", ret); break; } } while (0); @@ -553,7 +553,7 @@ int32_t CmAuthRemoveGrantedApp(const struct CmContext *context, const struct CmB (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = GetAndCheckUriObj(&uriObj, keyUri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); pthread_mutex_unlock(&g_authMgrLock); return ret; } @@ -562,27 +562,27 @@ int32_t CmAuthRemoveGrantedApp(const struct CmContext *context, const struct CmB enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(keyUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); break; } ret = CheckCallerIsProducer(context, &uriObj); if (ret != CM_SUCCESS) { - CM_LOG_E("check caller userId/uid failed when remove grant, ret = %d", ret); + CM_LOG_E("check caller userId/uid failed when remove grant, ret = %{public}d", ret); break; } /* delete mac key */ ret = DeleteMacKey(&uriObj, appUid, level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete mac key failed, ret = %d", ret); + CM_LOG_E("delete mac key failed, ret = %{public}d", ret); break; } /* remove auth uid */ ret = CmRemoveAuthUid(context, keyUri, appUid); if (ret != CM_SUCCESS) { - CM_LOG_E("remove auth uid from auth list failed, ret = %d", ret); + CM_LOG_E("remove auth uid from auth list failed, ret = %{public}d", ret); break; } @@ -603,7 +603,7 @@ static int32_t DeleteAuthInfo(uint32_t userId, const struct CmBlob *uri, const s (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = GetAndCheckUriObj(&uriObj, uri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } @@ -611,7 +611,7 @@ static int32_t DeleteAuthInfo(uint32_t userId, const struct CmBlob *uri, const s for (uint32_t i = 0; i < appUidList->appUidCount; ++i) { ret = DeleteMacKey(&uriObj, appUidList->appUid[i], level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete mac key failed, ret = %d", ret); + CM_LOG_E("delete mac key failed, ret = %{public}d", ret); break; } } @@ -630,19 +630,19 @@ int32_t CmAuthDeleteAuthInfo(const struct CmContext *context, const struct CmBlo do { ret = CmGetAuthList(context, uri, &appUidList); if (ret != CM_SUCCESS) { - CM_LOG_E("get auth list failed, ret = %d", ret); + CM_LOG_E("get auth list failed, ret = %{public}d", ret); break; } ret = DeleteAuthInfo(context->userId, uri, &appUidList, level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete auth failed, ret = %d", ret); + CM_LOG_E("delete auth failed, ret = %{public}d", ret); break; } ret = CmDeleteAuthListFile(context, uri); if (ret != CM_SUCCESS) { - CM_LOG_E("delete auth list file failed, ret = %d", ret); + CM_LOG_E("delete auth list file failed, ret = %{public}d", ret); break; } @@ -666,25 +666,25 @@ int32_t CmAuthDeleteAuthInfoByUserId(uint32_t userId, const struct CmBlob *uri) do { ret = CmGetAuthListByUserId(userId, uri, &appUidList); if (ret != CM_SUCCESS) { - CM_LOG_E("get auth list by user id failed, ret = %d", ret); + CM_LOG_E("get auth list by user id failed, ret = %{public}d", ret); break; } ret = GetRdbAuthStorageLevel(uri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); break; } ret = DeleteAuthInfo(userId, uri, &appUidList, level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete auth failed, ret = %d", ret); + CM_LOG_E("delete auth failed, ret = %{public}d", ret); break; } ret = CmDeleteAuthListFileByUserId(userId, uri); if (ret != CM_SUCCESS) { - CM_LOG_E("delete auth list file failed, ret = %d", ret); + CM_LOG_E("delete auth list file failed, ret = %{public}d", ret); break; } } while (0); @@ -703,7 +703,7 @@ int32_t CmAuthDeleteAuthInfoByUid(uint32_t userId, uint32_t targetUid, const str bool isInAuthList = false; ret = CmCheckIsAuthUidExistByUserId(userId, targetUid, uri, &isInAuthList); if (ret != CM_SUCCESS) { - CM_LOG_E("check is in auth list failed, ret = %d", ret); + CM_LOG_E("check is in auth list failed, ret = %{public}d", ret); break; } @@ -715,7 +715,7 @@ int32_t CmAuthDeleteAuthInfoByUid(uint32_t userId, uint32_t targetUid, const str enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(uri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); break; } @@ -723,13 +723,13 @@ int32_t CmAuthDeleteAuthInfoByUid(uint32_t userId, uint32_t targetUid, const str struct CmAppUidList appUidList = { sizeof(appUid) / sizeof(uint32_t), appUid }; ret = DeleteAuthInfo(userId, uri, &appUidList, level); if (ret != CM_SUCCESS) { - CM_LOG_E("delete mac key info failed, ret = %d", ret); + CM_LOG_E("delete mac key info failed, ret = %{public}d", ret); break; } ret = CmRemoveAuthUidByUserId(userId, targetUid, uri); if (ret != CM_SUCCESS) { - CM_LOG_E("remove auth uid by user id failed, ret = %d", ret); + CM_LOG_E("remove auth uid by user id failed, ret = %{public}d", ret); break; } } while (0); @@ -743,7 +743,7 @@ static int32_t CheckCommonPermission(const struct CmContext *context, const stru enum CmAuthStorageLevel level; int32_t ret = GetRdbAuthStorageLevel(commonUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); return ret; } @@ -781,14 +781,14 @@ int32_t CmCheckAndGetCommonUri(const struct CmContext *context, uint32_t store, uint32_t type = (store == CM_SYS_CREDENTIAL_STORE) ? CM_URI_TYPE_SYS_KEY : CM_URI_TYPE_APP_KEY; ret = GetAndCheckUriObj(&uriObj, uri, type); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } do { ret = ConstructCommonUri(&uriObj, commonUri, store); if (ret != CM_SUCCESS) { - CM_LOG_E("construct common uri failed, ret = %d", ret); + CM_LOG_E("construct common uri failed, ret = %{public}d", ret); break; } @@ -811,7 +811,7 @@ int32_t CmCheckCallerIsProducer(const struct CmContext *context, const struct Cm (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = GetAndCheckUriObj(&uriObj, uri, CM_URI_TYPE_APP_KEY); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_check.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_check.c index e3ad627..f48537a 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_check.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_check.c @@ -31,7 +31,7 @@ int32_t CheckUri(const struct CmBlob *keyUri) } if (keyUri->size > MAX_AUTH_LEN_URI) { - CM_LOG_E("invalid uri len:%u", keyUri->size); + CM_LOG_E("invalid uri len:%{public}u", keyUri->size); return CMR_ERROR_INVALID_ARGUMENT; } @@ -46,7 +46,7 @@ int32_t CheckUri(const struct CmBlob *keyUri) int32_t CmServiceGetSystemCertListCheck(const uint32_t store) { if (store != CM_SYSTEM_TRUSTED_STORE) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -61,7 +61,7 @@ int32_t CmServiceGetSystemCertListCheck(const uint32_t store) int32_t CmServiceGetSystemCertCheck(const uint32_t store, const struct CmBlob *certUri) { if (store != CM_SYSTEM_TRUSTED_STORE) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -81,7 +81,7 @@ int32_t CmServiceGetSystemCertCheck(const uint32_t store, const struct CmBlob *c int32_t CmServiceSetCertStatusCheck(const uint32_t store, const struct CmBlob *certUri, const uint32_t status) { if (store != CM_SYSTEM_TRUSTED_STORE) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -91,7 +91,7 @@ int32_t CmServiceSetCertStatusCheck(const uint32_t store, const struct CmBlob *c } if ((status != 0) && (status != 1)) { - CM_LOG_E("invalid input status:%u", status); + CM_LOG_E("invalid input status:%{public}u", status); return CMR_ERROR_INVALID_ARGUMENT_STATUS; } @@ -116,7 +116,7 @@ static int32_t CmCheckAppCert(const struct CmBlob *appCert) } if (appCert->size > MAX_LEN_APP_CERT) { - CM_LOG_E("appCert size max check fail, appCert size:%u", appCert->size); + CM_LOG_E("appCert size max check fail, appCert size:%{public}u", appCert->size); return CMR_ERROR_INVALID_ARGUMENT_APP_CERT; } return CM_SUCCESS; @@ -130,7 +130,7 @@ static int32_t CmCheckAppCertPwd(const struct CmBlob *appCertPwd) } if (appCertPwd->size > MAX_LEN_APP_CERT_PASSWD) { - CM_LOG_E("appCertPwd size max check fail, appCertPwd size:%u", appCertPwd->size); + CM_LOG_E("appCertPwd size max check fail, appCertPwd size:%{public}u", appCertPwd->size); return CMR_ERROR_INVALID_ARGUMENT_APP_PWD; } @@ -192,17 +192,17 @@ static bool CmCheckUserIdAndUpdateContext(const uint32_t inputUserId, uint32_t * { if (*callerUserId == 0) { /* caller is sa */ if (inputUserId == 0 || inputUserId == INIT_INVALID_VALUE) { - CM_LOG_E("caller is sa, input userId %u is invalid", inputUserId); + CM_LOG_E("caller is sa, input userId %{public}u is invalid", inputUserId); return false; } - CM_LOG_D("update caller userId from %u to %u", *callerUserId, inputUserId); + CM_LOG_D("update caller userId from %{public}u to %{public}u", *callerUserId, inputUserId); *callerUserId = inputUserId; return true; } /* caller is hap */ if (inputUserId != INIT_INVALID_VALUE) { - CM_LOG_E("caller is hap, input userId %u is not supported", inputUserId); + CM_LOG_E("caller is hap, input userId %{public}u is not supported", inputUserId); return false; } return true; @@ -215,12 +215,12 @@ int32_t CmServiceInstallAppCertCheck(const struct CmAppCertParam *certParam, str } if (CM_STORE_CHECK(certParam->store)) { - CM_LOG_E("CmInstallAppCertCheck store check fail, store:%u", certParam->store); + CM_LOG_E("CmInstallAppCertCheck store check fail, store:%{public}u", certParam->store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } if (CM_LEVEL_CHECK(certParam->level)) { - CM_LOG_E("CmInstallAppCertCheck level check fail, level:%u", certParam->level); + CM_LOG_E("CmInstallAppCertCheck level check fail, level:%{public}u", certParam->level); return CMR_ERROR_INVALID_ARGUMENT; } @@ -264,7 +264,7 @@ static int32_t CheckAndUpdateCallerAndUri(struct CmContext *cmContext, const str struct CMUri uriObj; int32_t ret = CertManagerUriDecode(&uriObj, (char *)uri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to decode uri, ret = %d", ret); + CM_LOG_E("Failed to decode uri, ret = %{public}d", ret); return ret; } @@ -286,12 +286,12 @@ static int32_t CheckAndUpdateCallerAndUri(struct CmContext *cmContext, const str (void)CertManagerFreeUri(&uriObj); if (type == CM_URI_TYPE_SYS_KEY) { if ((cmContext->userId != 0) && (cmContext->userId != userId)) { - CM_LOG_E("caller is hap, current user is %u, userid[%u] is invalid", cmContext->userId, userId); + CM_LOG_E("caller is hap, current user is %{public}u, userid[%{public}u] is invalid", cmContext->userId, userId); return CMR_ERROR_INVALID_ARGUMENT_USER_ID; } } else if (type == CM_URI_TYPE_CERTIFICATE) { if ((cmContext->userId != 0) && (cmContext->userId != userId) && (userId != 0)) { - CM_LOG_E("caller is hap, current user is %u, userid[%u] is invalid", cmContext->userId, userId); + CM_LOG_E("caller is hap, current user is %{public}u, userid[%{public}u] is invalid", cmContext->userId, userId); return CMR_ERROR_INVALID_ARGUMENT_USER_ID; } } else { @@ -329,7 +329,7 @@ int32_t CmServiceUninstallAppCertCheck(struct CmContext *cmContext, const uint32_t store, const struct CmBlob *keyUri) { if (CM_STORE_CHECK(store)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -377,7 +377,7 @@ static int32_t CmGetSysAppCertListCheck(const struct CmContext *cmContext, const int32_t CmServiceGetAppCertListCheck(const struct CmContext *cmContext, const uint32_t store) { if (CM_STORE_CHECK(store)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -401,7 +401,7 @@ int32_t CmServiceGetAppCertListCheck(const struct CmContext *cmContext, const ui int32_t CmServiceGetCallingAppCertListCheck(const struct CmContext *cmContext, const uint32_t store) { if (CM_STORE_CHECK(store)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -434,7 +434,7 @@ int32_t CmServiceGetCallingAppCertListCheck(const struct CmContext *cmContext, c int32_t CmServiceGetAppCertCheck(struct CmContext *cmContext, const uint32_t store, const struct CmBlob *keyUri) { if (CM_STORE_CHECK(store)) { - CM_LOG_E("invalid input arguments store:%u", store); + CM_LOG_E("invalid input arguments store:%{public}u", store); return CMR_ERROR_INVALID_ARGUMENT_STORE_TYPE; } @@ -475,18 +475,18 @@ static bool CmCheckAndUpdateCallerUserId(const uint32_t inputUserId, uint32_t *c CM_LOG_D("caller is sa"); return true; } - CM_LOG_D("sa designates the userid: update caller userId from %u to %u", *callerUserId, inputUserId); + CM_LOG_D("sa designates the userid: update caller userId from %{public}u to %{public}u", *callerUserId, inputUserId); *callerUserId = inputUserId; return true; } /* caller is hap, callerUserId can be 0 or 0xFFFFFFFF */ if (inputUserId != 0 && inputUserId != INIT_INVALID_VALUE) { - CM_LOG_E("caller is hap, input userId %u is not supported", inputUserId); + CM_LOG_E("caller is hap, input userId %{public}u is not supported", inputUserId); return false; } if (inputUserId == 0) { - CM_LOG_D("hap install in public location: update caller userId from %u to 0", *callerUserId); + CM_LOG_D("hap install in public location: update caller userId from %{public}u to 0", *callerUserId); *callerUserId = 0; } return true; diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file.c index 1f6638f..f3ede83 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file.c @@ -89,7 +89,7 @@ static int32_t MallocFileNames(struct CmMutableBlob **fNames, const char *path, } if (fileNums > MAX_COUNT_CERTIFICATE) { - CM_LOG_E("cert count %d beyond MAX", fileNums); + CM_LOG_E("cert count %{public}d beyond MAX", fileNums); return CMR_ERROR_MAX_CERT_COUNT_REACHED; } @@ -121,7 +121,7 @@ static int32_t GetFileNames(const char *path, struct CmMutableBlob *fNames, uint while (CmGetDirFile(d, &dire) == CMR_OK) { /* get fileCount files first, verify in follow-up process, no need return err code */ if (i >= fileCount) { - CM_LOG_D("only get %u certfiles", fileCount); + CM_LOG_D("only get %{public}u certfiles", fileCount); break; } @@ -146,7 +146,7 @@ static int32_t GetFileNames(const char *path, struct CmMutableBlob *fNames, uint (void) CmCloseDir(d); if (i != fileCount) { - CM_LOG_E("get certfiles no enough, i(%u), fileCount(%u)", i, fileCount); + CM_LOG_E("get certfiles no enough, i(%{public}u), fileCount(%{public}u)", i, fileCount); ret = CMR_ERROR_CERT_COUNT_MISMATCH; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file_operator.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file_operator.c index 5eecc4a..cebc1e8 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file_operator.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_file_operator.c @@ -103,7 +103,7 @@ static uint32_t FileRead(const char *fileName, uint32_t offset, uint8_t *buf, ui char filePath[PATH_MAX + 1] = {0}; if (realpath(fileName, filePath) == NULL) { - CM_LOG_E("invalid filepath: %s", fileName); + CM_LOG_E("invalid filepath: %{public}s", fileName); return 0; } @@ -169,14 +169,14 @@ static int32_t FileWrite(const char *fileName, uint32_t offset, const uint8_t *b fd = open(filePath, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); } if (fd < 0) { - CM_LOG_E("open file failed, errno = 0x%x", errno); + CM_LOG_E("open file failed, errno = 0x%{public}x", errno); return CMR_ERROR_OPEN_FILE_FAIL; } uint64_t new_tag = CreateFdsanOwnTag(&fd); fdsan_exchange_owner_tag(fd, 0, new_tag); if (write(fd, buf, len) < 0) { - CM_LOG_E("write file failed, errno = 0x%x", errno); + CM_LOG_E("write file failed, errno = 0x%{public}x", errno); fdsan_close_with_tag(fd, new_tag); return CMR_ERROR_WRITE_FILE_FAIL; } @@ -206,7 +206,7 @@ static int32_t FileRemove(const char *fileName) } if ((unlink(fileName) != 0) && (errno != ENOENT)) { - CM_LOG_E("failed to remove file: errno = 0x%x", errno); + CM_LOG_E("failed to remove file: errno = 0x%{public}x", errno); return CMR_ERROR_REMOVE_FILE_FAIL; } @@ -385,7 +385,7 @@ static int32_t CmUidLayerGetFileNames(const char *filePath, struct CmBlob *fileN } uint32_t filePathLen = strlen(filePath); if (filePathLen >= CM_MAX_FILE_NAME_LEN) { - CM_LOG_E("CmUidLayerGetFileNames filePathLen:%u", filePathLen); + CM_LOG_E("CmUidLayerGetFileNames filePathLen:%{public}u", filePathLen); return CMR_ERROR_BUFFER_TOO_SMALL; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_key_operation.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_key_operation.c index 495e251..87665a0 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_key_operation.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_key_operation.c @@ -81,7 +81,7 @@ static int32_t AddUserIdParam(struct HksParamSet *paramSet, enum CmAuthStorageLe int32_t ret = CertManagerUriDecode(&uriObj, (char *)uri->data); //uri->data已被校验有\0结尾 if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to decode uri, ret = %d", ret); + CM_LOG_E("Failed to decode uri, ret = %{public}d", ret); return ret; } do { @@ -122,27 +122,27 @@ static int32_t ConstructParamSet(const struct HksParam *params, uint32_t paramCo struct HksParamSet *paramSet = NULL; int32_t ret = HksInitParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("init huks paramset failed, ret = %d", ret); + CM_LOG_E("init huks paramset failed, ret = %{public}d", ret); return ret; } ret = AddUserIdParam(paramSet, level, uri); if (ret != HKS_SUCCESS) { - CM_LOG_E("add userid param failed, ret = %d", ret); + CM_LOG_E("add userid param failed, ret = %{public}d", ret); HksFreeParamSet(¶mSet); return ret; } ret = HksAddParams(paramSet, params, paramCount); if (ret != HKS_SUCCESS) { - CM_LOG_E("add huks params failed, ret = %d", ret); + CM_LOG_E("add huks params failed, ret = %{public}d", ret); HksFreeParamSet(¶mSet); return ret; } ret = HksBuildParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("build huks paramSet failed, ret = %d", ret); + CM_LOG_E("build huks paramSet failed, ret = %{public}d", ret); HksFreeParamSet(¶mSet); return ret; } @@ -210,7 +210,7 @@ int32_t CmKeyOpGenMacKey(const struct CmBlob *alias, enum CmAuthStorageLevel lev ret = HksGenerateKey(&keyAlias, paramSet, NULL); HksFreeParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("hks generate key failed, ret = %d", ret); + CM_LOG_E("hks generate key failed, ret = %{public}d", ret); return CMR_ERROR_KEY_GENERATE_FAILED; } return CM_SUCCESS; @@ -246,7 +246,7 @@ int32_t CmKeyOpGenMacKeyIfNotExist(const struct CmBlob *alias) return ret; } if (ret != HKS_ERROR_NOT_EXIST) { - CM_LOG_E("find mac key failed, ret = %d", ret); + CM_LOG_E("find mac key failed, ret = %{public}d", ret); return CMR_ERROR_KEY_CHECK_EXIST_FAILED; } @@ -281,7 +281,7 @@ int32_t CmKeyOpDeleteKey(const struct CmBlob *alias, enum CmAuthStorageLevel lev ret = HksDeleteKey(&keyAlias, paramSet); HksFreeParamSet(¶mSet); if ((ret != HKS_SUCCESS) && (ret != HKS_ERROR_NOT_EXIST)) { - CM_LOG_E("hks delete key failed, ret = %d", ret); + CM_LOG_E("hks delete key failed, ret = %{public}d", ret); return CMR_ERROR_KEY_OPERATION_FAILED; } @@ -323,7 +323,7 @@ int32_t CmKeyOpCalcMac(const struct CmBlob *alias, const struct CmBlob *srcData, ret = HksInit(&keyAlias, paramSet, &handle, NULL); if (ret != HKS_SUCCESS) { - CM_LOG_E("mac calc init failed, ret = %d", ret); + CM_LOG_E("mac calc init failed, ret = %{public}d", ret); ret = CMR_ERROR_KEY_MAC_INIT_FAILED; break; } @@ -332,7 +332,7 @@ int32_t CmKeyOpCalcMac(const struct CmBlob *alias, const struct CmBlob *srcData, struct HksBlob outMac = { mac->size, mac->data }; ret = HksFinish(&handle, paramSet, &inData, &outMac); if (ret != HKS_SUCCESS) { - CM_LOG_E("mac calc finish failed, ret = %d", ret); + CM_LOG_E("mac calc finish failed, ret = %{public}d", ret); ret = CMR_ERROR_KEY_MAC_FINISH_FAILED; break; } @@ -378,7 +378,7 @@ int32_t CmKeyOpImportKey(const struct CmBlob *alias, const struct CmKeyPropertie ret = HksImportKey(&keyAlias, paramSet, &key); HksFreeParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("hks import key failed, ret = %d", ret); + CM_LOG_E("hks import key failed, ret = %{public}d", ret); return CMR_ERROR_KEY_IMPORT_FAILED; } return CM_SUCCESS; @@ -428,7 +428,7 @@ static void TranslateToHuksProperties(const struct CmSignatureSpec *spec, struct } } - CM_LOG_D("purpose[%u], digest[%u], padding[%u]", spec->purpose, spec->digest, spec->padding); + CM_LOG_D("purpose[%{public}u], digest[%{public}u], padding[%{public}u]", spec->purpose, spec->digest, spec->padding); } static int32_t GetKeyProperties(const struct CmBlob *commonUri, struct CmKeyProperties *keySpec, @@ -469,7 +469,7 @@ static int32_t GetKeyProperties(const struct CmBlob *commonUri, struct CmKeyProp HksFreeParamSet(&inParamSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("get paramSet from huks failed, ret = %d", ret); + CM_LOG_E("get paramSet from huks failed, ret = %{public}d", ret); CM_FREE_PTR(outParamSet); return ret; } @@ -490,7 +490,7 @@ static int32_t AddParamsToParamSet(const struct CmBlob *commonUri, const struct struct CmKeyProperties keySpec = {0}; ret = GetKeyProperties(commonUri, &keySpec, level); if (ret != HKS_SUCCESS) { - CM_LOG_E("Failed to get key properties, ret = %d", ret); + CM_LOG_E("Failed to get key properties, ret = %{public}d", ret); break; } @@ -539,7 +539,7 @@ static int32_t ConstructInitParamSet(const struct CmBlob *commonUri, const struc struct HksParamSet *paramSet = NULL; int32_t ret = HksInitParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("init paramSet failed, ret = %d", ret); + CM_LOG_E("init paramSet failed, ret = %{public}d", ret); return CMR_ERROR_KEY_OPERATION_FAILED; } @@ -552,7 +552,7 @@ static int32_t ConstructInitParamSet(const struct CmBlob *commonUri, const struc ret = HksBuildParamSet(¶mSet); if (ret != HKS_SUCCESS) { - CM_LOG_E("build params failed, ret = %d", ret); + CM_LOG_E("build params failed, ret = %{public}d", ret); HksFreeParamSet(¶mSet); return CMR_ERROR_KEY_OPERATION_FAILED; } @@ -572,7 +572,7 @@ static int32_t ServiceSignVerifyUpdate(const struct CmBlob *handle, const struct int32_t ret = HksUpdate(&handleHks, paramSet, &inDataHks, &tempOut); if (ret != HKS_SUCCESS) { - CM_LOG_E("huks update fail, ret = %d", ret); + CM_LOG_E("huks update fail, ret = %{public}d", ret); CmDeleteSession(handle); return CMR_ERROR_KEY_UPDATE_FAILED; } @@ -589,7 +589,7 @@ static int32_t ServiceSignVerifyFinish(const struct CmBlob *handle, const struct int32_t ret = HksFinish(&handleHks, paramSet, &inDataHks, &outDataHks); CmDeleteSession(handle); if (ret != HKS_SUCCESS) { - CM_LOG_E("huks finish fail, ret = %d", ret); + CM_LOG_E("huks finish fail, ret = %{public}d", ret); return CMR_ERROR_KEY_FINISH_FAILED; } outData->size = outDataHks.size; @@ -603,7 +603,7 @@ static int32_t ServiceSignVerifyAbort(const struct CmBlob *handle, const struct int32_t ret = HksAbort(&handleHks, paramSet); CmDeleteSession(handle); if (ret != HKS_SUCCESS) { - CM_LOG_E("huks abort fail, ret = %d", ret); + CM_LOG_E("huks abort fail, ret = %{public}d", ret); return CMR_ERROR_KEY_ABORT_FAILED; } return CM_SUCCESS; @@ -615,7 +615,7 @@ int32_t CmKeyOpInit(const struct CmContext *context, const struct CmBlob *alias, struct HksParamSet *paramSet = NULL; int32_t ret = ConstructInitParamSet(alias, spec, ¶mSet, level); if (ret != CM_SUCCESS) { - CM_LOG_E("construct init paramSet failed, ret = %d", ret); + CM_LOG_E("construct init paramSet failed, ret = %{public}d", ret); return CMR_ERROR_KEY_INIT_PARAM_FAILED; } @@ -632,7 +632,7 @@ int32_t CmKeyOpInit(const struct CmContext *context, const struct CmBlob *alias, struct HksBlob handleOut = { handle->size, handle->data }; ret = HksInit(&keyAlias, paramSet, &handleOut, NULL); if (ret != HKS_SUCCESS) { - CM_LOG_E("Huks init failed, ret = %d", ret); + CM_LOG_E("Huks init failed, ret = %{public}d", ret); ret = CMR_ERROR_KEY_INIT_FAILED; break; } @@ -641,7 +641,7 @@ int32_t CmKeyOpInit(const struct CmContext *context, const struct CmBlob *alias, struct CmSessionNodeInfo info = { context->userId, context->uid, *alias }; ret = CmCreateSession(&info, handle, true); if (ret != CM_SUCCESS) { - CM_LOG_E("create session failed, ret = %d", ret); + CM_LOG_E("create session failed, ret = %{public}d", ret); break; } } while (0); diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_query.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_query.c index eef37da..458cf1c 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_query.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_query.c @@ -94,7 +94,7 @@ static int32_t ConstrutPathList(const char *useridPath, struct CmMutableBlob *cP (void) CmCloseDir(d); if (dealCert != dirCount) { /* real dir count less than dirCount */ - CM_LOG_E("cert count mismatch, dealCert(%u), dirCount(%u)", dealCert, dirCount); + CM_LOG_E("cert count mismatch, dealCert(%{public}u), dirCount(%{public}u)", dealCert, dirCount); ret = CMR_ERROR_CERT_COUNT_MISMATCH; } return ret; @@ -113,7 +113,7 @@ static int32_t CreateCertPathList(const char *useridPath, struct CmMutableBlob * } if (uidCount > MAX_COUNT_CERTIFICATE) { - CM_LOG_E("uidCount beyond max, uidCount: %d", uidCount); + CM_LOG_E("uidCount beyond max, uidCount: %{public}d", uidCount); return CMR_ERROR_MAX_CERT_COUNT_REACHED; } @@ -144,13 +144,13 @@ int32_t CmGetCertPathList(const struct CmContext *context, uint32_t store, struc int32_t ret = ConstructUserIdPath(context, store, userIdPath, MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed obtain userpath for store %u", store); + CM_LOG_E("Failed obtain userpath for store %{public}u", store); return ret; } ret = CreateCertPathList(userIdPath, pathList); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed create pathList for userid %u", context->userId); + CM_LOG_E("Failed create pathList for userid %{public}u", context->userId); return ret; } @@ -324,7 +324,7 @@ static int32_t CreateCertFile(struct CertFileInfo *cFileList, const char *path, uint32_t realCount = getCount - *certCount; *certCount += realCount; if (realCount != (uint32_t)fileNums) { - CM_LOG_E("cert count mismatch, realCount(%u), fileCount(%d)", realCount, fileNums); + CM_LOG_E("cert count mismatch, realCount(%{public}u), fileCount(%{public}d)", realCount, fileNums); return CMR_ERROR_CERT_COUNT_MISMATCH; } return ret; @@ -351,7 +351,7 @@ int32_t CreateCertFileList(const struct CmMutableBlob *pathList, struct CmMutabl for (uint32_t i = 0; i < pathList->size; i++) { ret = CreateCertFile(cFileList, (char *)uidPath[i].data, &certCount); if (ret != CM_SUCCESS) { - CM_LOG_E("Create CertFile fail of %u_th", i); + CM_LOG_E("Create CertFile fail of %{public}u_th", i); CmFreeCertFiles(cFileList, certCount); return ret; } @@ -400,7 +400,7 @@ static int32_t GetUserCertAlias(const char *uri, struct CmBlob *alias) ret = CertManagerUriDecode(&certUri, uri); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } if (certUri.object == NULL) { @@ -413,7 +413,7 @@ static int32_t GetUserCertAlias(const char *uri, struct CmBlob *alias) (void)memset_s(&certProperty, sizeof(struct CertProperty), 0, sizeof(struct CertProperty)); ret = QueryCertProperty(uri, &certProperty); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to QueryCertProperty, ret: %d", ret); + CM_LOG_E("Failed to QueryCertProperty, ret: %{public}d", ret); (void)CertManagerFreeUri(&certUri); return ret; } @@ -448,7 +448,7 @@ static int32_t GetSysCertAlias(const struct CmBlob *certData, struct CmBlob *ali if (aliasLen <= 0) { aliasLen = GetX509SubjectName(cert, CM_COMMON_NAME, (char *)alias->data, alias->size); if (aliasLen <= 0) { - CM_LOG_E("Failed to get certificates CN name, aliasLen = %d", aliasLen); + CM_LOG_E("Failed to get certificates CN name, aliasLen = %{public}d", aliasLen); FreeCertContext(cert); return CMR_ERROR_GET_CERT_SUBJECT_ITEM; } @@ -490,7 +490,7 @@ static int32_t CmGetCertSubjectName(const struct CmBlob *certData, struct CmBlob int32_t subjectLen = GetX509SubjectNameLongFormat(cert, (char *)subjectName->data, subjectName->size); if (subjectLen <= 0) { - CM_LOG_E("get cert subjectName failed, subjectLen = %d", subjectLen); + CM_LOG_E("get cert subjectName failed, subjectLen = %{public}d", subjectLen); FreeCertContext(cert); return CMR_ERROR_GET_CERT_SUBJECT_ITEM; } @@ -512,7 +512,7 @@ static int32_t GetCertContext(const struct CmBlob *fileName, struct CmContext *c struct CMUri uriObj; int32_t ret = CertManagerUriDecode(&uriObj, (char *)fileName->data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to decode uri, ret = %d", ret); + CM_LOG_E("Failed to decode uri, ret = %{public}d", ret); return ret; } @@ -615,7 +615,7 @@ uint32_t CmGetMatchedCertIndex(const struct CmMutableBlob *certFileList, const s for (uint32_t i = 0; i < certFileList->size; i++) { if (cFileList[i].fileName.data == NULL) { - CM_LOG_E("Corrupted file name at index: %u.\n", i); + CM_LOG_E("Corrupted file name at index: %{public}u.\n", i); continue; } @@ -642,7 +642,7 @@ int32_t GetRdbAuthStorageLevel(const struct CmBlob *keyUri, enum CmAuthStorageLe certProp.level = ERROR_LEVEL; int32_t ret = QueryCertProperty((char *)keyUri->data, &certProp); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to QueryCertProperty, ret: %d", ret); + CM_LOG_E("Failed to QueryCertProperty, ret: %{public}d", ret); return ret; } /* If the return value of level is ERROR_LEVEL, nothing is found */ diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c index c36ae2e..4de5f38 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_service.c @@ -71,13 +71,13 @@ int32_t CmServicInstallAppCert(struct CmContext *context, const struct CmAppCert { int32_t ret = CmServiceInstallAppCertCheck(certParam, context); if (ret != CM_SUCCESS) { - CM_LOG_E("service intall app cert check params failed, ret = %d", ret); + CM_LOG_E("service intall app cert check params failed, ret = %{public}d", ret); return ret; } ret = CmInstallAppCertPro(context, certParam, keyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmInstallAppCert fail, ret = %d", ret); + CM_LOG_E("CmInstallAppCert fail, ret = %{public}d", ret); return ret; } return ret; @@ -89,20 +89,20 @@ static int32_t GetPublicAppCert(const struct CmContext *context, uint32_t store, struct CmBlob commonUri = { 0, NULL }; int32_t ret = CmCheckAndGetCommonUri(context, store, keyUri, &commonUri); if (ret != CM_SUCCESS) { - CM_LOG_E("check and get common uri when get app cert failed, ret = %d", ret); + CM_LOG_E("check and get common uri when get app cert failed, ret = %{public}d", ret); return ret; } do { ret = CmStorageGetAppCert(context, store, &commonUri, certBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("get app cert from storage failed, ret = %d", ret); + CM_LOG_E("get app cert from storage failed, ret = %{public}d", ret); break; } /* remove authinfo from uri */ if (keyUri->size < commonUri.size) { - CM_LOG_E("keyUri size[%u] smaller than commonUri size[%u]", keyUri->size, commonUri.size); + CM_LOG_E("keyUri size[%{public}u] smaller than commonUri size[%{public}u]", keyUri->size, commonUri.size); ret = CMR_ERROR_BUFFER_TOO_SMALL; break; } @@ -132,7 +132,7 @@ static int32_t GetPrivateAppCert(const struct CmContext *context, uint32_t store ret = CmStorageGetAppCert(context, store, keyUri, certBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("get app cert from storage failed, ret = %d", ret); + CM_LOG_E("get app cert from storage failed, ret = %{public}d", ret); } return ret; @@ -218,7 +218,7 @@ static int32_t CheckAndGetStore(const struct CmContext *context, const struct Cm struct CMUri uriObj; int32_t ret = CertManagerUriDecode(&uriObj, (char *)authUri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } @@ -282,14 +282,14 @@ int32_t CmServiceInit(const struct CmContext *context, const struct CmBlob *auth struct CmBlob commonUri = { 0, NULL }; ret = CmCheckAndGetCommonUri(context, store, authUri, &commonUri); if (ret != CM_SUCCESS) { - CM_LOG_E("check and get common uri failed, ret = %d", ret); + CM_LOG_E("check and get common uri failed, ret = %{public}d", ret); return ret; } enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(&commonUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get rdb auth storage level failed, ret = %d", ret); + CM_LOG_E("get rdb auth storage level failed, ret = %{public}d", ret); CM_FREE_PTR(commonUri.data); return ret; } @@ -420,7 +420,7 @@ static int32_t CmGetUserCertPathList(const struct CmContext *context, const stru /* user: caller */ ret = CmGetCertPathList(context, store, &callerPathList); if (ret != CM_SUCCESS) { - CM_LOG_E("get caller certPathList fail, ret = %d", ret); + CM_LOG_E("get caller certPathList fail, ret = %{public}d", ret); break; } @@ -431,7 +431,7 @@ static int32_t CmGetUserCertPathList(const struct CmContext *context, const stru struct CmContext targetContext = { targetUserId, context->uid, {0} }; ret = CmGetCertPathList(&targetContext, store, &targetPathList); if (ret != CM_SUCCESS) { - CM_LOG_E("get system service certPathList fail, ret = %d", ret); + CM_LOG_E("get system service certPathList fail, ret = %{public}d", ret); break; } } @@ -556,13 +556,13 @@ int32_t CmServiceGetCertList(const struct CmContext *context, const struct UserC /* get all uid path for caller and system service */ ret = CmServiceGetUserCACertList(context, prop, &pathList); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetUserCACertList fail, ret = %d", ret); + CM_LOG_E("CmServiceGetUserCACertList fail, ret = %{public}d", ret); break; } } else if (store == CM_SYSTEM_TRUSTED_STORE) { ret = CmGetSysCertPathList(context, &pathList); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertPathList fail, ret = %d", ret); + CM_LOG_E("GetCertPathList fail, ret = %{public}d", ret); break; } } else { @@ -574,7 +574,7 @@ int32_t CmServiceGetCertList(const struct CmContext *context, const struct UserC /* create certFilelist(path + name) from every uid */ ret = CreateCertFileList(&pathList, certFileList); if (ret != CM_SUCCESS) { - CM_LOG_E("CreateCertFileList fail, ret = %d", ret); + CM_LOG_E("CreateCertFileList fail, ret = %{public}d", ret); break; } } while (0); @@ -594,7 +594,7 @@ static int32_t CmServiceGetSysCertInfo(const struct CmContext *context, const st const struct UserCAProperty prop = { INIT_INVALID_VALUE, CM_ALL_USER }; ret = CmServiceGetCertList(context, &prop, store, &certFileList); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertList failed, ret = %d", ret); + CM_LOG_E("GetCertList failed, ret = %{public}d", ret); break; } @@ -767,7 +767,7 @@ static int32_t GetUserCertNameAndPath(const struct CmContext *context, const str ret = CmGetCertFilePath(context, CM_USER_TRUSTED_STORE, pathBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed obtain path for store:%u", CM_USER_TRUSTED_STORE); + CM_LOG_E("Failed obtain path for store:%{public}u", CM_USER_TRUSTED_STORE); break; } } while (0); @@ -839,7 +839,7 @@ static int32_t CmComparisonCallerIdWithUri(const struct CmContext *context, int32_t ret = CertManagerUriDecode(&uriObj, (char *)certUri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } @@ -870,7 +870,8 @@ static int32_t CmComparisonCallerIdWithUri(const struct CmContext *context, break; } - CM_LOG_E("userid(%u) or uid(%u) is mismatch, uri: userid(%u), uid(%u)", userId, uid); + CM_LOG_E("userid(%{public}u) or uid(%{public}u) is mismatch, uri: userid(%{public}u), uid(%{public}u)", + userId, uid, userId, uid); } while (0); (void)CertManagerFreeUri(&uriObj); @@ -928,25 +929,25 @@ int32_t CmUninstallUserCert(const struct CmContext *context, const struct CmBlob do { ret = CmComparisonCallerIdWithUri(context, certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CallerId don't match uri, ret = %d", ret); + CM_LOG_E("CallerId don't match uri, ret = %{public}d", ret); break; } ret = DeleteCertProperty((char *)certUri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed delete cert: %s rdbData", (char *)certUri->data); + CM_LOG_E("Failed delete cert: %{public}s rdbData", (char *)certUri->data); break; } ret = CmGetCertFilePath(context, store, &pathBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed obtain path for store %d", store); + CM_LOG_E("Failed obtain path for store %{public}d", store); break; } ret = CmRemoveUserCert(&pathBlob, certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("RemoveUserCertFile fail, ret = %d", ret); + CM_LOG_E("RemoveUserCertFile fail, ret = %{public}d", ret); break; } @@ -957,7 +958,7 @@ int32_t CmUninstallUserCert(const struct CmContext *context, const struct CmBlob } ret = CmSetStatusEnable(context, &pathBlob, certUri, store); if (ret != CM_SUCCESS) { - CM_LOG_E("UpdateStatusFile fail, ret = %d", ret); + CM_LOG_E("UpdateStatusFile fail, ret = %{public}d", ret); break; } } while (0); @@ -972,7 +973,7 @@ int32_t CmUninstallAllUserCert(const struct CmContext *context) int32_t ret = CmGetCertPathList(context, store, &pathList); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertPathList fail, ret = %d", ret); + CM_LOG_E("GetCertPathList fail, ret = %{public}d", ret); return ret; } @@ -984,7 +985,7 @@ int32_t CmUninstallAllUserCert(const struct CmContext *context) ret = CmRemoveAllUserCert(context, store, &pathList); CmFreePathList((struct CmMutableBlob *)pathList.data, pathList.size); if (ret != CM_SUCCESS) { - CM_LOG_E("RemoveAllUserCert fail, ret = %d", ret); + CM_LOG_E("RemoveAllUserCert fail, ret = %{public}d", ret); return ret; } @@ -1010,7 +1011,7 @@ int32_t CmSetStatusBackupCert( bool needUpdate = false; ret = IsCertNeedBackup(context->userId, context->uid, certUri, &needUpdate); if (ret != CM_SUCCESS) { - CM_LOG_E("Check cert is need update failed, ret = %d", ret); + CM_LOG_E("Check cert is need update failed, ret = %{public}d", ret); return ret; } else if (needUpdate == false) { /* No need to update */ @@ -1020,20 +1021,20 @@ int32_t CmSetStatusBackupCert( struct CmBlob certificateData = { 0, NULL }; ret = CmReadCertData(store, context, certUri, &certificateData); if (ret != CM_SUCCESS) { - CM_LOG_E("CmReadCertData failed, ret = %d", ret); + CM_LOG_E("CmReadCertData failed, ret = %{public}d", ret); return CM_FAILURE; } ret = CmBackupUserCert(context, certUri, &certificateData); if (ret != CM_SUCCESS) { - CM_LOG_E("CmBackupUserCert failed, ret = %d", ret); + CM_LOG_E("CmBackupUserCert failed, ret = %{public}d", ret); ret = CM_FAILURE; } CM_FREE_BLOB(certificateData); } else if (status == CERT_STATUS_DISABLED) { ret = CmRemoveBackupUserCert(context, certUri, NULL); if (ret != CM_SUCCESS) { - CM_LOG_E("CmRemoveBackupUserCert fail, ret = %d", ret); + CM_LOG_E("CmRemoveBackupUserCert fail, ret = %{public}d", ret); } } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_session_mgr.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_session_mgr.c index 33437d1..fd048ed 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_session_mgr.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_session_mgr.c @@ -75,7 +75,7 @@ static int32_t DeleteFirstAbortableSession(void) DeleteHuksInitInfo(&(sessionNode->handle)); RemoveAndFreeSessionNode(&sessionNode); --g_sessionCount; - CM_LOG_D("delete session count: %u", g_sessionCount); + CM_LOG_D("delete session count: %{public}u", g_sessionCount); return CM_SUCCESS; } } @@ -98,7 +98,7 @@ static int32_t AddSessionNode(struct CmSessionNode *sessionNode) CmAddNodeAtListTail(&g_sessionList, &sessionNode->listHead); ++g_sessionCount; - CM_LOG_D("add session count:%u", g_sessionCount); + CM_LOG_D("add session count:%{public}u", g_sessionCount); pthread_mutex_unlock(&g_lock); return HKS_SUCCESS; @@ -149,13 +149,13 @@ int32_t CmCreateSession(const struct CmSessionNodeInfo *info, const struct CmBlo do { ret = ConstructSessionInfo(info, node); if (ret != CM_SUCCESS) { - CM_LOG_E("construct session info failed, ret = %d", ret); + CM_LOG_E("construct session info failed, ret = %{public}d", ret); break; } ret = ConstructHandle(handle, node); if (ret != CM_SUCCESS) { - CM_LOG_E("construct handle failed, ret = %d", ret); + CM_LOG_E("construct handle failed, ret = %{public}d", ret); break; } @@ -163,7 +163,7 @@ int32_t CmCreateSession(const struct CmSessionNodeInfo *info, const struct CmBlo ret = AddSessionNode(node); if (ret != CM_SUCCESS) { - CM_LOG_E("add session node failed, ret = %d", ret); + CM_LOG_E("add session node failed, ret = %{public}d", ret); break; } } while (0); @@ -213,7 +213,7 @@ void CmDeleteSession(const struct CmBlob *handle) if (IsSameBlob(handle, &(node->handle))) { RemoveAndFreeSessionNode(&node); --g_sessionCount; - CM_LOG_D("delete session count: %u", g_sessionCount); + CM_LOG_D("delete session count: %{public}u", g_sessionCount); pthread_mutex_unlock(&g_lock); return; } @@ -246,7 +246,7 @@ static void DeleteSessionNode(enum CmSessionDeleteType deleteType, const struct DeleteHuksInitInfo(&(node->handle)); RemoveAndFreeSessionNode(nodeSession); --g_sessionCount; - CM_LOG_D("delete session count = %u", g_sessionCount); + CM_LOG_D("delete session count = %{public}u", g_sessionCount); } } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_status.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_status.c index dbd1a26..6a9c55d 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_status.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_status.c @@ -108,7 +108,7 @@ static int GetStoreIndex(uint32_t store) case CM_PRI_CREDENTIAL_STORE: return APPLICATION_TRUSTED_STORE; default: - CM_LOG_W("No index for store %u\n", store); + CM_LOG_W("No index for store %{public}u\n", store); return -1; } } @@ -251,7 +251,7 @@ static int32_t ReadFile(const char *file, uint8_t **bufptr, uint32_t *size) } if (sz < HEADER_LEN) { - CM_LOG_W("Status file size too small. Must be at least %u bytes.\n", HEADER_LEN); + CM_LOG_W("Status file size too small. Must be at least %{public}u bytes.\n", HEADER_LEN); rc = CMR_ERROR_STORAGE; goto finally; } @@ -264,7 +264,7 @@ static int32_t ReadFile(const char *file, uint8_t **bufptr, uint32_t *size) } nb = CertManagerFileRead(CERT_STATUS_DIR, file, 0, buf, sz); if (nb != sz) { - CM_LOG_W("Failed to read status file: %u bytes expected but only has %u\n", sz, nb); + CM_LOG_W("Failed to read status file: %{public}u bytes expected but only has %{public}u\n", sz, nb); rc = CMR_ERROR_STORAGE; goto finally; } @@ -291,7 +291,7 @@ static int32_t LoadTreeStatus(struct RbTree *tree, pthread_rwlock_t *treeLock, u uint32_t ver = DECODE_UINT32(buf); /* currently version 1 (with value 0) is supported */ if (ver != VERSION_1) { - CM_LOG_W("Unsupported version: %u\n", ver); + CM_LOG_W("Unsupported version: %{public}u\n", ver); return CMR_ERROR; } @@ -314,7 +314,7 @@ static int32_t LoadTreeStatus(struct RbTree *tree, pthread_rwlock_t *treeLock, u pthread_rwlock_unlock(treeLock); if (rc != CMR_OK) { - CM_LOG_E("Failed to decode status tree: %d", rc); + CM_LOG_E("Failed to decode status tree: %{public}d", rc); return rc; } } @@ -342,7 +342,7 @@ static int32_t LoadStatus(uint32_t store) pthread_rwlock_unlock(fileLock); if (rc != CMR_OK) { - CM_LOG_E("Failed to read status file: %d", rc); + CM_LOG_E("Failed to read status file: %{public}d", rc); return rc; } @@ -359,11 +359,11 @@ static int32_t EncodeTree(struct RbTree *tree, uint8_t **bufptr, uint32_t *size) uint32_t sz = 0; int32_t rc = RbTreeEncode(tree, EncodeStatus, NULL, &sz); if (rc != CM_SUCCESS) { - CM_LOG_E("get rbtree encode length failed, ret = %d", rc); + CM_LOG_E("get rbtree encode length failed, ret = %{public}d", rc); return rc; } if (sz > MAX_STATUS_TREE_MALLOC_SIZE) { - CM_LOG_E("invalid encode tree size[%u]", sz); + CM_LOG_E("invalid encode tree size[%{public}u]", sz); return CMR_ERROR_INVALID_ARGUMENT; } @@ -385,7 +385,7 @@ static int32_t EncodeTree(struct RbTree *tree, uint8_t **bufptr, uint32_t *size) uint32_t dataLen = sz - HEADER_LEN; rc = RbTreeEncode(tree, EncodeStatus, data, &dataLen); if (rc != CM_SUCCESS) { - CM_LOG_E("encode status tree failed, ret = %d", rc); + CM_LOG_E("encode status tree failed, ret = %{public}d", rc); FREE_PTR(buf); return rc; } @@ -415,7 +415,7 @@ static int32_t WriteStatus(uint32_t store) pthread_rwlock_unlock(treeLock); if (rc != CMR_OK) { - CM_LOG_E("Failed to encode status tree: %d", rc); + CM_LOG_E("Failed to encode status tree: %{public}d", rc); goto finally; } @@ -429,7 +429,7 @@ static int32_t WriteStatus(uint32_t store) rc = CertManagerFileWrite(CERT_STATUS_DIR, file, 0, buf, sz); pthread_rwlock_unlock(fileLock); if (rc != CMR_OK) { - CM_LOG_E("Failed to write status file: %d", rc); + CM_LOG_E("Failed to write status file: %{public}d", rc); } finally: @@ -588,7 +588,7 @@ static int32_t SetCertStatusNode(const struct CmContext *ctx, struct RbTree *tre cs->status = status; int rc = RbTreeInsert(tree, GetRbTreeKeyFromName(name), cs); if (rc != CMR_OK) { - CM_LOG_E("Failed to insert new node: %d\n", rc); + CM_LOG_E("Failed to insert new node: %{public}d\n", rc); CMFree(cs->fileName); CMFree(cs); } @@ -637,7 +637,7 @@ static int32_t SetUserCertStatusNode(const struct CertStatus *valInfo, struct Rb cStatus->status = status; int rc = RbTreeInsert(tree, GetRbTreeKey(store, name), cStatus); if (rc != CMR_OK) { - CM_LOG_E("Failed to insert new node: %d\n", rc); + CM_LOG_E("Failed to insert new node: %{public}d\n", rc); CMFree(cStatus->fileName); CMFree(cStatus); } @@ -810,7 +810,7 @@ int32_t SetcertStatus(const struct CmContext *context, const struct CmBlob *cert * If the store type is not CM_SYSTEM_TRUSTED_STORE, ret is returned. * Otherwise, try to obtain the gm system ca path. */ - CM_LOG_E("CertManagerFindCertFileNameByUri error = %d", ret); + CM_LOG_E("CertManagerFindCertFileNameByUri error = %{public}d", ret); if (store != CM_SYSTEM_TRUSTED_STORE) { return ret; } @@ -819,7 +819,7 @@ int32_t SetcertStatus(const struct CmContext *context, const struct CmBlob *cert (void)memset_s(path.data, path.size, 0, path.size); ret = CertManagerFindCertFileNameByUri(context, certUri, store, true, &path); if (ret != CMR_OK) { - CM_LOG_E("CertManagerFindCertFileNameByUri gm system ca error = %d", ret); + CM_LOG_E("CertManagerFindCertFileNameByUri gm system ca error = %{public}d", ret); return ret; } } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_storage.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_storage.c index acec816..d5f047b 100755 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_storage.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_storage.c @@ -51,7 +51,7 @@ int32_t GetRootPath(uint32_t store, char *rootPath, uint32_t pathLen) } if (ret != EOK) { - CM_LOG_E("copy path failed, store = %u", store); + CM_LOG_E("copy path failed, store = %{public}u", store); return CMR_ERROR_MEM_OPERATION_COPY; } @@ -131,7 +131,7 @@ int32_t CmStorageGetBuf(const char *path, const char *fileName, struct CmBlob *s { uint32_t fileSize = CmFileSize(path, fileName); if (fileSize > MAX_OUT_BLOB_SIZE) { - CM_LOG_E("file size[%u] invalid", fileSize); + CM_LOG_E("file size[%{public}u] invalid", fileSize); return CMR_ERROR_STORAGE; } @@ -221,7 +221,7 @@ static int32_t GetCertConfRootDir(char *confRootDir, uint32_t dirLen) } if (dirLen < sizeof(CERT_BACKUP_CONFIG_ROOT_DIR)) { - CM_LOG_E("dirLen(%u) is too small for save user cert backup config file root path", dirLen); + CM_LOG_E("dirLen(%{public}u) is too small for save user cert backup config file root path", dirLen); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -229,7 +229,7 @@ static int32_t GetCertConfRootDir(char *confRootDir, uint32_t dirLen) mode = S_IRWXU; /* The permission on the user_config directory should be 0700 */ ret = CmUserBakupMakeDir(CERT_BACKUP_CONFIG_ROOT_DIR, (const mode_t *)&mode); if (ret != CMR_OK) { - CM_LOG_E("Create CERT_BACKUP_CONFIG_ROOT_DIR failed, err code: %d", ret); + CM_LOG_E("Create CERT_BACKUP_CONFIG_ROOT_DIR failed, err code: %{public}d", ret); return CMR_ERROR_MAKE_DIR_FAIL; } @@ -259,13 +259,13 @@ int32_t CmGetCertConfUserIdDir(uint32_t userId, char *confUserIdDir, uint32_t di char pathTmp[CERT_MAX_PATH_LEN] = { 0 }; /* Concatenate the {confRootDir}/{userid} directory */ if (snprintf_s(pathTmp, CERT_MAX_PATH_LEN, CERT_MAX_PATH_LEN - 1, "%s/%u", rootPath, userId) < 0) { - CM_LOG_E("Construct userIdPath failed, rootPath: %s, userId: %u", rootPath, userId); + CM_LOG_E("Construct userIdPath failed, rootPath: %{public}s, userId: %{public}u", rootPath, userId); return CMR_ERROR_MEM_OPERATION_PRINT; } /* Create the {confRootDir}/{userid} directory */ ret = CmUserBakupMakeDir(pathTmp, NULL); if (ret != CMR_OK) { - CM_LOG_E("Create userIdPath failed, err code: %d", ret); + CM_LOG_E("Create userIdPath failed, err code: %{public}d", ret); return CMR_ERROR_MAKE_DIR_FAIL; } @@ -288,20 +288,20 @@ int32_t CmGetCertConfUidDir(uint32_t userId, uint32_t uid, char *certConfUidDir, char confUserIdDir[CERT_MAX_PATH_LEN] = { 0 }; ret = CmGetCertConfUserIdDir(userId, confUserIdDir, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Construct confUserIdDir(userId: %u) failed, ret = %d", userId, ret); + CM_LOG_E("Construct confUserIdDir(userId: %{public}u) failed, ret = %{public}d", userId, ret); return ret; } char pathTmp[CERT_MAX_PATH_LEN] = { 0 }; /* Concatenate the {confRootDir}/{userid}/{uid} directory */ if (snprintf_s(pathTmp, CERT_MAX_PATH_LEN, CERT_MAX_PATH_LEN - 1, "%s/%u", confUserIdDir, uid) < 0) { - CM_LOG_E("Construct uidPath failed, uid: %u", uid); + CM_LOG_E("Construct uidPath failed, uid: %{public}u", uid); return CMR_ERROR_MEM_OPERATION_PRINT; } /* Create the {confRootDir}/{userid}/{uid} directory */ ret = CmUserBakupMakeDir(pathTmp, NULL); if (ret != CMR_OK) { - CM_LOG_E("Create uidPath failed, err code: %d", ret); + CM_LOG_E("Create uidPath failed, err code: %{public}d", ret); return CMR_ERROR_MAKE_DIR_FAIL; } @@ -325,7 +325,7 @@ int32_t CmGetCertConfPath(uint32_t userId, uint32_t uid, const struct CmBlob *ce char certConfUidDir[CERT_MAX_PATH_LEN] = { 0 }; ret = CmGetCertConfUidDir(userId, uid, certConfUidDir, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Get user cert root path failed, ret = %d", ret); + CM_LOG_E("Get user cert root path failed, ret = %{public}d", ret); return ret; } @@ -354,7 +354,7 @@ static int32_t GetCertBackupRootDir(char *certBackupRootDir, uint32_t dirLen) } if (dirLen < sizeof(CERT_BACKUP_ROOT_DIR)) { - CM_LOG_E("dirLen(%u) is too small for save user cert backup root path", dirLen); + CM_LOG_E("dirLen(%{public}u) is too small for save user cert backup root path", dirLen); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -364,7 +364,7 @@ static int32_t GetCertBackupRootDir(char *certBackupRootDir, uint32_t dirLen) mode = S_IRWXU | S_IXOTH; /* The permission on the user_open directory should be 0701 */ ret = CmUserBakupMakeDir(CERT_BACKUP_ROOT_DIR, (const mode_t *)&mode); if (ret != CMR_OK) { - CM_LOG_E("Create CERT_BACKUP_ROOT_DIR failed, err code: %d", ret); + CM_LOG_E("Create CERT_BACKUP_ROOT_DIR failed, err code: %{public}d", ret); return CMR_ERROR_MAKE_DIR_FAIL; } @@ -396,7 +396,7 @@ int32_t CmGetCertBackupDir(uint32_t userId, char *certBackupDir, uint32_t certBa /* Create the {userId} directory for the certificate backup */ ret = CmUserBakupMakeDir(userIdPath, NULL); if (ret != CMR_OK) { - CM_LOG_E("Create userIdPath failed, err code: %d", ret); + CM_LOG_E("Create userIdPath failed, err code: %{public}d", ret); return CMR_ERROR_MAKE_DIR_FAIL; } @@ -445,7 +445,7 @@ static int32_t CmGetCertMinSeqNum(uint32_t userId, unsigned long certSubjectName } } - CM_LOG_D("Get sequenceNumber(%d)", sequenceNumber); + CM_LOG_D("Get sequenceNumber(%{public}d)", sequenceNumber); return sequenceNumber; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_updateflag.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_updateflag.c index 7382122..298d901 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_updateflag.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_updateflag.c @@ -123,7 +123,7 @@ int32_t IsCertNeedBackup(uint32_t userId, uint32_t uid, const struct CmBlob *cer ret = CmIsFileExist(NULL, (const char *)configPath); if (ret != CM_SUCCESS) { if (ret != CMR_ERROR_NOT_EXIST) { - CM_LOG_E("check cert config file return err code: %d.", ret); + CM_LOG_E("check cert config file return err code: %{public}d.", ret); } /* The cert config file does not exist or cannot be determined, need to * backup cert */ @@ -144,7 +144,7 @@ int32_t IsCertNeedBackup(uint32_t userId, uint32_t uid, const struct CmBlob *cer *needUpdate = false; break; } else if (ret != CMR_ERROR_NOT_EXIST) { - CM_LOG_E("check cert backup file return err code: %d.", ret); + CM_LOG_E("check cert backup file return err code: %{public}d.", ret); } *needUpdate = true; } while (0); @@ -173,7 +173,7 @@ int32_t CmReadCertData(uint32_t store, const struct CmContext *context, const st /* Reading certificate data */ ret = CmStorageGetBuf(uidPath, uriStr, userCertData); if (ret != CM_SUCCESS) { - CM_LOG_E("Failed to get certificate data, ret = %d", ret); + CM_LOG_E("Failed to get certificate data, ret = %{public}d", ret); return ret; } @@ -209,7 +209,7 @@ int32_t CmConstructContextFromUri(const char *certUri, struct CmContext *context struct CMUri cmUri = { 0 }; int32_t ret = CertManagerUriDecode(&cmUri, certUri); if ((ret != CM_SUCCESS)) { - CM_LOG_E("Failed to decode struct CMUri from certUri, ret = %d", ret); + CM_LOG_E("Failed to decode struct CMUri from certUri, ret = %{public}d", ret); return ret; } @@ -254,7 +254,7 @@ static int32_t BackupUserCert(const X509 *userCertX509, const struct CmBlob *use ret = CmRemoveBackupUserCert(context, certUri, userCertConfigFilePath); if (ret != CMR_OK) { - CM_LOG_E("Remove user cert config and backup file failed, ret: %d", ret); + CM_LOG_E("Remove user cert config and backup file failed, ret: %{public}d", ret); } ret = CmGetCertBackupFilePath(userCertX509, context->userId, userCertBackupFilePath, CERT_MAX_PATH_LEN); @@ -332,7 +332,7 @@ static int32_t UpdateUserCert(uint32_t userId, uint32_t uid, const char *certPat bool needUpdate = false; ret = IsCertNeedBackup(userId, uid, &certUri, &needUpdate); if (ret != CM_SUCCESS) { - CM_LOG_E("Check cert is need update failed, ret = %d", ret); + CM_LOG_E("Check cert is need update failed, ret = %{public}d", ret); return ret; } else if (needUpdate == false) { /* No need to update */ @@ -342,7 +342,7 @@ static int32_t UpdateUserCert(uint32_t userId, uint32_t uid, const char *certPat struct CmContext context = { 0 }; ret = CmConstructContextFromUri((const char *)uriStr, &context); if (ret != CM_SUCCESS) { - CM_LOG_E("ConstructContextFromUri failed, ret = %d", ret); + CM_LOG_E("ConstructContextFromUri failed, ret = %{public}d", ret); return CM_FAILURE; } @@ -350,13 +350,13 @@ static int32_t UpdateUserCert(uint32_t userId, uint32_t uid, const char *certPat struct CmBlob certificateData = { 0, NULL }; ret = CmReadCertData(store, &context, &certUri, &certificateData); if (ret != CM_SUCCESS) { - CM_LOG_E("CmReadCertData failed, ret = %d", ret); + CM_LOG_E("CmReadCertData failed, ret = %{public}d", ret); return CM_FAILURE; } ret = CmBackupUserCert(&context, &certUri, &certificateData); if (ret != CM_SUCCESS) { - CM_LOG_E("update user certUri failed, ret = %d", ret); + CM_LOG_E("update user certUri failed, ret = %{public}d", ret); ret = CM_FAILURE; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_uri.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_uri.c index d390646..20f62ed 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_uri.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cert_manager_uri.c @@ -288,7 +288,7 @@ int32_t CertManagerUriEncode(char *encoded, uint32_t *encodedLen, const struct C } if (*encodedLen < encLen) { - CM_LOG_W("Buffer to small for encoded URI (%u < %u).\n", *encodedLen, encLen); + CM_LOG_W("Buffer to small for encoded URI (%{public}u < %{public}u).\n", *encodedLen, encLen); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -503,7 +503,7 @@ int32_t CertManagerUriDecode(struct CMUri *uri, const char *encoded) uint32_t len = strlen(encoded); if (len > MAX_AUTH_LEN_URI) { - CM_LOG_E("invalid uri len[%u]", len); + CM_LOG_E("invalid uri len[%{public}u]", len); return CMR_ERROR_INVALID_ARGUMENT_URI; } @@ -540,7 +540,7 @@ int32_t CertManagerGetUidFromUri(const struct CmBlob *uri, uint32_t *uid) (void)memset_s(&uriObj, sizeof(uriObj), 0, sizeof(uriObj)); int32_t ret = CertManagerUriDecode(&uriObj, (char *)uri->data); if (ret != CM_SUCCESS) { - CM_LOG_E("uri decode failed, ret = %d", ret); + CM_LOG_E("uri decode failed, ret = %{public}d", ret); return ret; } @@ -565,12 +565,12 @@ int32_t CmConstructUri(const struct CMUri *uriObj, struct CmBlob *outUri) uint32_t outLen = 0; int32_t ret = CertManagerUriEncode(NULL, &outLen, uriObj); if (ret != CM_SUCCESS) { - CM_LOG_E("get uriObj len failed, ret = %d", ret); + CM_LOG_E("get uriObj len failed, ret = %{public}d", ret); return ret; } if ((outLen == 0) || (outLen > MAX_OUT_BLOB_SIZE)) { - CM_LOG_E("invalid outLen[%u]", outLen); + CM_LOG_E("invalid outLen[%{public}u]", outLen); return CMR_ERROR_INVALID_ARGUMENT; } @@ -629,7 +629,7 @@ int32_t CmConstructCommonUri(const struct CmContext *context, const uint32_t typ ret = CmConstructUri(&uriObj, outUri); if (ret != CM_SUCCESS) { - CM_LOG_E("construct uri failed, ret = %d", ret); + CM_LOG_E("construct uri failed, ret = %{public}d", ret); } return ret; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/cm_event_process.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/cm_event_process.c index 64720dd..d0424d3 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/cm_event_process.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/cm_event_process.c @@ -35,7 +35,7 @@ static void DeleteAuth(const struct CmContext *context, const char *fileName, bool isDeleteByUid) { - CM_LOG_D("isDeleteByUid:%d", isDeleteByUid); + CM_LOG_D("isDeleteByUid:%{public}d", isDeleteByUid); struct CmBlob keyUri = { strlen(fileName) + 1, (uint8_t *)fileName }; int32_t ret; @@ -45,7 +45,7 @@ static void DeleteAuth(const struct CmContext *context, const char *fileName, bo ret = CmAuthDeleteAuthInfoByUserId(context->userId, &keyUri); } if (ret != CM_SUCCESS) { - CM_LOG_E("delete auth info failed ret: %d", ret); /* only record logs */ + CM_LOG_E("delete auth info failed ret: %{public}d", ret); /* only record logs */ } return; } @@ -54,7 +54,7 @@ static int32_t CmTraversalDirActionCredential(const char *filePath, const char * { int32_t ret = remove(filePath); if (ret != CM_SUCCESS) { - CM_LOG_E("App cert delete faild, ret: %d", ret); + CM_LOG_E("App cert delete faild, ret: %{public}d", ret); return ret; } @@ -62,13 +62,13 @@ static int32_t CmTraversalDirActionCredential(const char *filePath, const char * enum CmAuthStorageLevel level; ret = GetRdbAuthStorageLevel(&keyUri, &level); if (ret != CM_SUCCESS) { - CM_LOG_E("get storage level failed, ret: %d", ret); + CM_LOG_E("get storage level failed, ret: %{public}d", ret); return ret; } ret = CmKeyOpDeleteKey(&keyUri, level); if (ret != CM_SUCCESS) { /* ignore the return of delete key */ - CM_LOG_E("App key delete failed ret: %d", ret); + CM_LOG_E("App key delete failed ret: %{public}d", ret); } return CM_SUCCESS; } @@ -78,21 +78,21 @@ static int32_t CmTraversalDirActionUserCa(const struct CmContext *context, const { int32_t ret = remove(filePath); if (ret != CM_SUCCESS) { - CM_LOG_E("User cert delete faild, ret: %d", ret); + CM_LOG_E("User cert delete faild, ret: %{public}d", ret); return ret; } struct CmBlob certUri = { strlen(fileName) + 1, (uint8_t *)fileName }; /* include '\0' at end. */ ret = DeleteCertProperty(fileName); if (ret != CM_SUCCESS) { - CM_LOG_E("delete user ca cert property failed, ret: %d", ret); + CM_LOG_E("delete user ca cert property failed, ret: %{public}d", ret); return ret; } struct CmMutableBlob pathBlob = { strlen(filePath) + 1, (uint8_t *)filePath }; ret = CmSetStatusEnable(context, &pathBlob, &certUri, store); if (ret != CM_SUCCESS) { - CM_LOG_E("User set status faild, ret: %d", ret); + CM_LOG_E("User set status faild, ret: %{public}d", ret); return ret; } @@ -119,7 +119,7 @@ static int32_t CmTraversalDirAction(const struct CmContext *context, const char break; } if (ret != CM_SUCCESS) { - CM_LOG_E("CmTraversalDirAction failed store:%u", store); + CM_LOG_E("CmTraversalDirAction failed store:%{public}u", store); } return CM_SUCCESS; @@ -163,7 +163,7 @@ static int32_t RemoveDir(const char *dirPath) if (dire->d_type == DT_REG) { /* only care about files. */ ret = CmFileRemove(dirPath, dire->d_name); if (ret != CM_SUCCESS) { /* Continue to delete remaining files */ - CM_LOG_E("remove file failed when remove authlist files, ret = %d.", ret); + CM_LOG_E("remove file failed when remove authlist files, ret = %{public}d.", ret); } } dire = readdir(dir); @@ -250,7 +250,7 @@ static int32_t TraversalUserIdLayerDir(const struct CmContext *context, const ch return CMR_ERROR_INVALID_ARGUMENT; } - CM_LOG_D("CmTraversalUserIdLayerDir userId:%u, uid:%u", context->userId, uid); + CM_LOG_D("CmTraversalUserIdLayerDir userId:%{public}u, uid:%{public}u", context->userId, uid); int32_t ret = CM_SUCCESS; if (isUserDeleteEvent) { /* user delete event */ @@ -365,7 +365,7 @@ static int32_t CmTraversalBackupUidDir(const char *certConfigUidDirPath) /* Gets all files under the certConfigUidDirPath */ int32_t ret = CmUidLayerGetFileCountAndNames(certConfigUidDirPath, fileNames, sizeof(fileNames), &fileCounts); if (ret != CM_SUCCESS) { - CM_LOG_E("Get file count and names for the certConfigUidDirPath, ret = %d", ret); + CM_LOG_E("Get file count and names for the certConfigUidDirPath, ret = %{public}d", ret); return ret; } @@ -414,14 +414,14 @@ static int32_t CmTraversalBackupUserIdDir(const char *certConfigUserIdDirPath) ret = CmTraversalBackupUidDir(certConfigUidDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("CmTraversalBackupUidDir failed, ret = %d", ret); + CM_LOG_E("CmTraversalBackupUidDir failed, ret = %{public}d", ret); continue; } /* Delete user cert config {configRootDir}/{userid}/{uid} directory */ ret = CmDirRemove(certConfigUidDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove user certConfigUidDirPath fail, ret = %d", ret); + CM_LOG_E("Remove user certConfigUidDirPath fail, ret = %{public}d", ret); continue; } }; @@ -436,20 +436,20 @@ static int32_t CmTraversalBackupUserCert(uint32_t userId) char certConfigUserIdDirPath[CERT_MAX_PATH_LEN] = { 0 }; ret = CmGetCertConfUserIdDir(userId, certConfigUserIdDirPath, CERT_MAX_PATH_LEN); if (ret != CM_SUCCESS) { - CM_LOG_E("Construct certConfigUserIdDirPath(userId: %u) failed", userId); + CM_LOG_E("Construct certConfigUserIdDirPath(userId: %{public}u) failed", userId); return CM_FAILURE; } ret = CmTraversalBackupUserIdDir(certConfigUserIdDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("CmTraversalBackupUserIdDir failed, ret = %d", ret); + CM_LOG_E("CmTraversalBackupUserIdDir failed, ret = %{public}d", ret); return CM_FAILURE; } /* Delete {configRootDir}/{userid} directory */ ret = CmDirRemove(certConfigUserIdDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove user certConfigUserIdDirPath fail, ret = %d", ret); + CM_LOG_E("Remove user certConfigUserIdDirPath fail, ret = %{public}d", ret); return CMR_ERROR_REMOVE_FILE_FAIL; } @@ -462,7 +462,7 @@ static int32_t CmTraversalBackupUserCert(uint32_t userId) } ret = CmDirRemove(certBackupUserIdDirPath); if (ret != CM_SUCCESS) { - CM_LOG_E("Remove user certBackupUserIdDirPath fail, ret = %d", ret); + CM_LOG_E("Remove user certBackupUserIdDirPath fail, ret = %{public}d", ret); return CMR_ERROR_REMOVE_FILE_FAIL; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/core/src/rbtree.c b/services/cert_manager_standard/cert_manager_engine/main/core/src/rbtree.c index 33e0361..5354a15 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/core/src/rbtree.c +++ b/services/cert_manager_standard/cert_manager_engine/main/core/src/rbtree.c @@ -430,14 +430,14 @@ static void Encoder(RbTreeKey key, RbTreeValue value, const void *context) { struct EncoderContext *ctx = (struct EncoderContext *)context; if (ctx->status != CM_SUCCESS) { - CM_LOG_E("already failed: %d", ctx->status); /* already failed. do not continue */ + CM_LOG_E("already failed: %{public}d", ctx->status); /* already failed. do not continue */ return; } uint32_t valueSize = 0; int rc = ctx->enc(value, NULL, &valueSize); /* get value size */ if (rc != CM_SUCCESS) { - CM_LOG_E("value encoder get length failed: %d", rc); + CM_LOG_E("value encoder get length failed: %{public}d", rc); ctx->status = rc; return; } @@ -475,7 +475,7 @@ static void Encoder(RbTreeKey key, RbTreeValue value, const void *context) buf += sizeof(uint32_t); rc = ctx->enc(value, buf, &valueSize); if (rc != CM_SUCCESS) { - CM_LOG_E("value encoder encoding failed: %d", rc); + CM_LOG_E("value encoder encoding failed: %{public}d", rc); ctx->status = rc; return; } diff --git a/services/cert_manager_standard/cert_manager_engine/main/rdb/src/cm_cert_property_rdb.cpp b/services/cert_manager_standard/cert_manager_engine/main/rdb/src/cm_cert_property_rdb.cpp index e684fbd..3027777 100644 --- a/services/cert_manager_standard/cert_manager_engine/main/rdb/src/cm_cert_property_rdb.cpp +++ b/services/cert_manager_standard/cert_manager_engine/main/rdb/src/cm_cert_property_rdb.cpp @@ -69,7 +69,7 @@ int32_t InsertCertProperty(const struct CertProperty *certProperty) insertBucket.PutInt(COLUMN_AUTH_STORAGE_LEVEL, certProperty->level); bool ret = cmRdbDataManager->InsertData(insertBucket); if (!ret) { - CM_LOG_E("Failed to insert cert:%s property data", certProperty->uri); + CM_LOG_E("Failed to insert cert:%{public}s property data", certProperty->uri); return CMR_ERROR_INSERT_RDB_DATA_FAIL; } return CM_SUCCESS; @@ -89,7 +89,7 @@ int32_t DeleteCertProperty(const char *uri) bool ret = cmRdbDataManager->DeleteData(std::string(uri), COLUMN_URI); if (!ret) { - CM_LOG_E("Failed to delete cert:%s property data", uri); + CM_LOG_E("Failed to delete cert:%{public}s property data", uri); return CMR_ERROR_DELETE_RDB_DATA_FAIL; } return CM_SUCCESS; @@ -117,7 +117,7 @@ int32_t UpdateCertProperty(const struct CertProperty *certProperty) updateBucket.PutInt(COLUMN_UID, certProperty->uid); bool ret = cmRdbDataManager->UpdateData(std::string(certProperty->uri), COLUMN_URI, updateBucket); if (!ret) { - CM_LOG_E("Failed to update cert:%s property data", certProperty->uri); + CM_LOG_E("Failed to update cert:%{public}s property data", certProperty->uri); return CMR_ERROR_UPDATE_RDB_DATA_FAIL; } return CM_SUCCESS; @@ -235,7 +235,7 @@ int32_t QueryCertProperty(const char *uri, struct CertProperty *certProperty) auto absSharedResultSet = cmRdbDataManager->QueryData(std::string(uri), COLUMN_URI); if (absSharedResultSet == nullptr) { - CM_LOG_E("Failed to query cert: %s property data", uri); + CM_LOG_E("Failed to query cert: %{public}s property data", uri); return CMR_ERROR_QUERY_RDB_DATA_FAIL; } @@ -243,17 +243,17 @@ int32_t QueryCertProperty(const char *uri, struct CertProperty *certProperty) int rowCount = 0; int ret = absSharedResultSet->GetRowCount(rowCount); if (ret != NativeRdb::E_OK) { - CM_LOG_E("Failed to get row count, ret: %d", ret); + CM_LOG_E("Failed to get row count, ret: %{public}d", ret); return CMR_ERROR_QUERY_RDB_DATA_FAIL; } if (rowCount <= 0) { - CM_LOG_D("Finish to query, cert: %s does not exist in the database", uri); + CM_LOG_D("Finish to query, cert: %{public}s does not exist in the database", uri); return CM_SUCCESS; } ret = absSharedResultSet->GoToFirstRow(); if (ret != NativeRdb::E_OK) { - CM_LOG_E("Failed to go to firstRow, ret: %d", ret); + CM_LOG_E("Failed to go to firstRow, ret: %{public}d", ret); return CMR_ERROR_QUERY_RDB_DATA_FAIL; } 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 682f6b6..4280eb1 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 @@ -46,6 +46,7 @@ ohos_static_library("libcert_manager_hisysevent_wrapper_static") { "bounds_checking_function:libsec_shared", "hisysevent:libhisysevent", "ipc:ipc_single", + "hilog:libhilog", ] complete_static_lib = true } diff --git a/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/src/hisysevent_wrapper.cpp b/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/src/hisysevent_wrapper.cpp index d9477b8..32bd1c6 100644 --- a/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/src/hisysevent_wrapper.cpp +++ b/services/cert_manager_standard/cert_manager_service/main/hisysevent_wrapper/src/hisysevent_wrapper.cpp @@ -261,7 +261,7 @@ int WriteEvent(const char *functionName, const struct EventValues *eventValues) CM_TAG_ERROR_MESSAGE, GetErrorMsg(eventValues->errorCode), CM_TAG_CALLER, callerName.c_str()); if (ret != CM_SUCCESS) { - CM_LOG_E("WriteEvent failed, ret = %d", ret); + CM_LOG_E("WriteEvent failed, ret = %{public}d", ret); return ret; } return ret; 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 7dc213c..64ee530 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 @@ -52,6 +52,7 @@ ohos_static_library("libcm_service_idl_standard_static") { "ipc:ipc_core", "openssl:libcrypto_shared", "os_account:os_account_innerkits", + "hilog:libhilog", ] if (support_jsapi) { diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service.c b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service.c index 5ab82f9..dc5f18e 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service.c +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service.c @@ -45,20 +45,20 @@ static int32_t GetInputParams(const struct CmBlob *paramSetBlob, struct CmParamS { int32_t ret = CmGetProcessInfoForIPC(cmContext); if (ret != CM_SUCCESS) { - CM_LOG_E("get ipc info failed, ret = %d", ret); + CM_LOG_E("get ipc info failed, ret = %{public}d", ret); return ret; } /* The paramSet blob pointer needs to be refreshed across processes. */ ret = CmGetParamSet((struct CmParamSet *)paramSetBlob->data, paramSetBlob->size, paramSet); if (ret != CM_SUCCESS) { - CM_LOG_E("get paramSet failed, ret = %d", ret); + CM_LOG_E("get paramSet failed, ret = %{public}d", ret); return ret; } ret = CmParamSetToParams(*paramSet, params, paramsCount); if (ret != CM_SUCCESS) { - CM_LOG_E("get params from paramSet failed, ret = %d", ret); + CM_LOG_E("get params from paramSet failed, ret = %{public}d", ret); } return ret; @@ -79,26 +79,26 @@ void CmIpcServiceGetCertificateList(const struct CmBlob *paramSetBlob, struct Cm do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCaCertList get input params failed, ret = %d", ret); + CM_LOG_E("GetCaCertList get input params failed, ret = %{public}d", ret); break; } ret = CmServiceGetSystemCertListCheck(store); if (ret != CM_SUCCESS) { - CM_LOG_E("CmIpcServiceGetSystemCertCheck fail, ret = %d", ret); + CM_LOG_E("CmIpcServiceGetSystemCertCheck fail, ret = %{public}d", ret); break; } const struct UserCAProperty prop = { INIT_INVALID_VALUE, CM_ALL_USER }; ret = CmServiceGetCertList(&cmContext, &prop, store, &certFileList); if (ret != CM_SUCCESS) { - CM_LOG_E("get cert list failed, ret = %d", ret); + CM_LOG_E("get cert list failed, ret = %{public}d", ret); break; } ret = CmServiceGetCertListPack(&cmContext, store, &certFileList, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("cert list data pack fail, ret = %d", ret); + CM_LOG_E("cert list data pack fail, ret = %{public}d", ret); break; } @@ -115,7 +115,7 @@ void CmIpcServiceGetCertificateList(const struct CmBlob *paramSetBlob, struct Cm } CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceGetCertificateInfo(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -136,25 +136,25 @@ void CmIpcServiceGetCertificateInfo(const struct CmBlob *paramSetBlob, struct Cm do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("GetUserCertInfo get input params failed, ret = %d", ret); + CM_LOG_E("GetUserCertInfo get input params failed, ret = %{public}d", ret); break; } ret = CmServiceGetSystemCertCheck(store, &certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetSystemCertCheck failed, ret = %d", ret); + CM_LOG_E("CmServiceGetSystemCertCheck failed, ret = %{public}d", ret); break; } ret = CmServiceGetCertInfo(&cmContext, &certUri, store, &certificateData, &status); if (ret != CM_SUCCESS) { - CM_LOG_E("get cert info failed, ret = %d", ret); + CM_LOG_E("get cert info failed, ret = %{public}d", ret); break; } ret = CmServiceGetCertInfoPack(store, &certificateData, status, &certUri, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("cert info data pack failed, ret = %d", ret); + CM_LOG_E("cert info data pack failed, ret = %{public}d", ret); break; } @@ -168,7 +168,7 @@ void CmIpcServiceGetCertificateInfo(const struct CmBlob *paramSetBlob, struct Cm CM_FREE_BLOB(certificateData); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceSetCertStatus(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -189,19 +189,19 @@ void CmIpcServiceSetCertStatus(const struct CmBlob *paramSetBlob, struct CmBlob do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("SetUserCertStatus get input params failed, ret = %d", ret); + CM_LOG_E("SetUserCertStatus get input params failed, ret = %{public}d", ret); break; } ret = CmServiceSetCertStatusCheck(store, &certUri, status); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceSetCertStatusCheck check failed, ret = %d", ret); + CM_LOG_E("CmServiceSetCertStatusCheck check failed, ret = %{public}d", ret); break; } ret = CmServiceSetCertStatus(&cmContext, &certUri, store, status); if (ret != CM_SUCCESS) { - CM_LOG_E("set system cert status failed, ret = %d", ret); + CM_LOG_E("set system cert status failed, ret = %{public}d", ret); break; } } while (0); @@ -211,7 +211,7 @@ void CmIpcServiceSetCertStatus(const struct CmBlob *paramSetBlob, struct CmBlob CmReportSGSetCertStatus(&certUri, store, status, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceInstallAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -239,7 +239,7 @@ void CmIpcServiceInstallAppCert(const struct CmBlob *paramSetBlob, struct CmBlob do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("install app cert get input params failed, ret = %d", ret); + CM_LOG_E("install app cert get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -248,7 +248,7 @@ void CmIpcServiceInstallAppCert(const struct CmBlob *paramSetBlob, struct CmBlob struct CmAppCertParam certParam = { &appCert, &appCertPwd, &certAlias, store, userId, level }; ret = CmServicInstallAppCert(&cmContext, &certParam, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("service install app cert failed, ret = %d", ret); + CM_LOG_E("service install app cert failed, ret = %{public}d", ret); break; } } while (0); @@ -260,7 +260,7 @@ void CmIpcServiceInstallAppCert(const struct CmBlob *paramSetBlob, struct CmBlob CmReportSGInstallAppCert(&certAlias, store, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceUninstallAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -282,7 +282,7 @@ void CmIpcServiceUninstallAppCert(const struct CmBlob *paramSetBlob, struct CmBl do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("UninstallAppCert get input params failed, ret = %d", ret); + CM_LOG_E("UninstallAppCert get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -290,7 +290,7 @@ void CmIpcServiceUninstallAppCert(const struct CmBlob *paramSetBlob, struct CmBl ret = CmServiceUninstallAppCertCheck(&cmContext, store, &keyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("UninstallAppCert CmServiceGetSystemCertCheck failed, ret = %d", ret); + CM_LOG_E("UninstallAppCert CmServiceGetSystemCertCheck failed, ret = %{public}d", ret); break; } @@ -305,7 +305,7 @@ void CmIpcServiceUninstallAppCert(const struct CmBlob *paramSetBlob, struct CmBl CmReportSGUninstallAppCert(&keyUri, store, false, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceUninstallAllAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -318,7 +318,7 @@ void CmIpcServiceUninstallAllAppCert(const struct CmBlob *paramSetBlob, struct C ret = CmGetProcessInfoForIPC(&cmContext); if (ret != CM_SUCCESS) { - CM_LOG_E("CmGetProcessInfoForIPC fail, ret = %d", ret); + CM_LOG_E("CmGetProcessInfoForIPC fail, ret = %{public}d", ret); } ret = CmRemoveAllAppCert(&cmContext); @@ -330,7 +330,7 @@ void CmIpcServiceUninstallAllAppCert(const struct CmBlob *paramSetBlob, struct C CmSendResponse(context, ret, NULL); CmReportSGUninstallAppCert(NULL, INIT_INVALID_VALUE, true, ret); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } static int32_t GetAppCertInfo(const struct CmBlob *keyUri, struct CmBlob *certType, @@ -347,7 +347,7 @@ static int32_t GetAppCertInfo(const struct CmBlob *keyUri, struct CmBlob *certTy break; } if ((uri.type >= TYPE_COUNT) || (uri.object == NULL)) { - CM_LOG_E("uri's type[%u] or object is invalid after decode", uri.type); + CM_LOG_E("uri's type[%{public}u] or object is invalid after decode", uri.type); ret = CMR_ERROR_INVALID_ARGUMENT_URI; break; } @@ -473,25 +473,25 @@ void CmIpcServiceGetAppCertList(const struct CmBlob *paramSetBlob, struct CmBlob do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("CmIpcServiceGetAppCertList get input params failed, ret = %d", ret); + CM_LOG_E("CmIpcServiceGetAppCertList get input params failed, ret = %{public}d", ret); break; } ret = CmServiceGetAppCertListCheck(&cmContext, store); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetAppCertListCheck fail, ret = %d", ret); + CM_LOG_E("CmServiceGetAppCertListCheck fail, ret = %{public}d", ret); break; } ret = CmServiceGetAppCertList(&cmContext, store, fileNames, MAX_COUNT_CERTIFICATE, &fileCount); if (ret != CM_SUCCESS) { - CM_LOG_E("Get App cert list fail, ret = %d", ret); + CM_LOG_E("Get App cert list fail, ret = %{public}d", ret); break; } ret = CmServiceGetAppCertListPack(&certificateList, fileNames, fileCount); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetAppCertListPack pack fail, ret = %d", ret); + CM_LOG_E("CmServiceGetAppCertListPack pack fail, ret = %{public}d", ret); } } while (0); @@ -501,7 +501,7 @@ void CmIpcServiceGetAppCertList(const struct CmBlob *paramSetBlob, struct CmBlob CmFreeFileNames(fileNames, fileCount); CM_FREE_BLOB(certificateList); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceGetCallingAppCertList(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -524,25 +524,25 @@ void CmIpcServiceGetCallingAppCertList(const struct CmBlob *paramSetBlob, struct do { ret = GetInputParams(paramSetBlob, ¶mSets, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("CmIpcServiceGetCallingAppCertList get input params failed, ret = %d", ret); + CM_LOG_E("CmIpcServiceGetCallingAppCertList get input params failed, ret = %{public}d", ret); break; } ret = CmServiceGetCallingAppCertListCheck(&cmContext, store); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetCallingAppCertListCheck fail, ret = %d", ret); + CM_LOG_E("CmServiceGetCallingAppCertListCheck fail, ret = %{public}d", ret); break; } ret = CmServiceGetCallingAppCertList(&cmContext, store, fileNamesBlob, MAX_COUNT_CERTIFICATE, &fileCount); if (ret != CM_SUCCESS) { - CM_LOG_E("Get calling App cert list fail, ret = %d", ret); + CM_LOG_E("Get calling App cert list fail, ret = %{public}d", ret); break; } ret = CmServiceGetAppCertListPack(&certificateList, fileNamesBlob, fileCount); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetAppCertListPack pack fail, ret = %d", ret); + CM_LOG_E("CmServiceGetAppCertListPack pack fail, ret = %{public}d", ret); } } while (0); @@ -552,20 +552,20 @@ void CmIpcServiceGetCallingAppCertList(const struct CmBlob *paramSetBlob, struct CmFreeFileNames(fileNamesBlob, fileCount); CM_FREE_BLOB(certificateList); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } static int32_t CopyCertificateInfoToBuffer(const struct CmBlob *certBlob, const struct CmBlob *certificateInfo, uint32_t *offset) { if (certBlob->size < (sizeof(struct AppCert) - MAX_LEN_CERTIFICATE_CHAIN)) { - CM_LOG_E("certInfo size[%u] invalid", certBlob->size); + CM_LOG_E("certInfo size[%{public}u] invalid", certBlob->size); return CMR_ERROR_INVALID_ARGUMENT; } struct AppCert *appCert = (struct AppCert *)certBlob->data; if ((certBlob->size - (sizeof(struct AppCert) - MAX_LEN_CERTIFICATE_CHAIN)) < appCert->certSize) { - CM_LOG_E("certInfo data size[%u] invalid, certSize[%u]", certBlob->size, appCert->certSize); + CM_LOG_E("certInfo data size[%{public}u] invalid, certSize[%{public}u]", certBlob->size, appCert->certSize); return CMR_ERROR_INVALID_ARGUMENT; } @@ -686,7 +686,7 @@ void CmIpcServiceGetAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *ou do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("CmIpcServiceGetAppCert get input params failed, ret = %d", ret); + CM_LOG_E("CmIpcServiceGetAppCert get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -694,19 +694,19 @@ void CmIpcServiceGetAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *ou ret = CmServiceGetAppCertCheck(&cmContext, store, &keyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("GCmServiceGetAppCertCheck fail, ret = %d", ret); + CM_LOG_E("GCmServiceGetAppCertCheck fail, ret = %{public}d", ret); break; } ret = CmServiceGetAppCert(&cmContext, store, &keyUri, &certBlob); if (ret != CM_SUCCESS) { - CM_LOG_E("Get App cert list fail, ret = %d", ret); + CM_LOG_E("Get App cert list fail, ret = %{public}d", ret); break; } ret = CmAppCertificateInfoPack(&certificateInfo, &certBlob, &keyUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmAppCertificateInfoPack fail, ret = %d", ret); + CM_LOG_E("CmAppCertificateInfoPack fail, ret = %{public}d", ret); } } while (0); @@ -716,13 +716,13 @@ void CmIpcServiceGetAppCert(const struct CmBlob *paramSetBlob, struct CmBlob *ou CM_FREE_BLOB(certBlob); CM_FREE_BLOB(certificateInfo); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } static int32_t GetAuthedList(const struct CmContext *context, const struct CmBlob *keyUri, struct CmBlob *outData) { if (outData->size < sizeof(uint32_t)) { /* appUidCount size */ - CM_LOG_E("invalid outData size[%u]", outData->size); + CM_LOG_E("invalid outData size[%{public}u]", outData->size); return CMR_ERROR_BUFFER_TOO_SMALL; } @@ -734,7 +734,7 @@ static int32_t GetAuthedList(const struct CmContext *context, const struct CmBlo int32_t ret = CmServiceGetAuthorizedAppList(context, keyUri, &appUidList); if (ret != CM_SUCCESS) { - CM_LOG_E("service get authed list failed, ret = %d", ret); + CM_LOG_E("service get authed list failed, ret = %{public}d", ret); return ret; } @@ -760,13 +760,13 @@ void CmIpcServiceGrantAppCertificate(const struct CmBlob *paramSetBlob, struct C }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceGrantAppCertificate(&cmContext, &keyUri, grantUid, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("service grant app failed, ret = %d", ret); + CM_LOG_E("service grant app failed, ret = %{public}d", ret); break; } } while (0); @@ -777,7 +777,7 @@ void CmIpcServiceGrantAppCertificate(const struct CmBlob *paramSetBlob, struct C CmReportSGGrantAppCert(&keyUri, grantUid, false, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceGetAuthorizedAppList(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -794,13 +794,13 @@ void CmIpcServiceGetAuthorizedAppList(const struct CmBlob *paramSetBlob, struct }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = GetAuthedList(&cmContext, &keyUri, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("get authed app list failed, ret = %d", ret); + CM_LOG_E("get authed app list failed, ret = %{public}d", ret); break; } } while (0); @@ -808,7 +808,7 @@ void CmIpcServiceGetAuthorizedAppList(const struct CmBlob *paramSetBlob, struct CmSendResponse(context, ret, outData); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceIsAuthorizedApp(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -826,13 +826,13 @@ void CmIpcServiceIsAuthorizedApp(const struct CmBlob *paramSetBlob, struct CmBlo }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceIsAuthorizedApp(&cmContext, &authUri); if (ret != CM_SUCCESS) { - CM_LOG_E("service check is authed app failed, ret = %d", ret); + CM_LOG_E("service check is authed app failed, ret = %{public}d", ret); break; } } while (0); @@ -841,7 +841,7 @@ void CmIpcServiceIsAuthorizedApp(const struct CmBlob *paramSetBlob, struct CmBlo CmSendResponse(context, ret, NULL); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceRemoveGrantedApp(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -860,13 +860,13 @@ void CmIpcServiceRemoveGrantedApp(const struct CmBlob *paramSetBlob, struct CmBl }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceRemoveGrantedApp(&cmContext, &keyUri, appUid); if (ret != CM_SUCCESS) { - CM_LOG_E("service remove grant app failed, ret = %d", ret); + CM_LOG_E("service remove grant app failed, ret = %{public}d", ret); break; } } while (0); @@ -876,7 +876,7 @@ void CmIpcServiceRemoveGrantedApp(const struct CmBlob *paramSetBlob, struct CmBl CmReportSGGrantAppCert(&keyUri, appUid, true, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceInit(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -895,7 +895,7 @@ void CmIpcServiceInit(const struct CmBlob *paramSetBlob, struct CmBlob *outData, }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } @@ -909,7 +909,7 @@ void CmIpcServiceInit(const struct CmBlob *paramSetBlob, struct CmBlob *outData, ret = CmServiceInit(&cmContext, &authUri, &spec, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("service init failed, ret = %d", ret); + CM_LOG_E("service init failed, ret = %{public}d", ret); break; } } while (0); @@ -918,7 +918,7 @@ void CmIpcServiceInit(const struct CmBlob *paramSetBlob, struct CmBlob *outData, CmSendResponse(context, ret, outData); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceUpdate(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -938,13 +938,13 @@ void CmIpcServiceUpdate(const struct CmBlob *paramSetBlob, struct CmBlob *outDat }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceUpdate(&cmContext, &handleUpdate, &inDataUpdate); if (ret != CM_SUCCESS) { - CM_LOG_E("service update failed, ret = %d", ret); + CM_LOG_E("service update failed, ret = %{public}d", ret); break; } } while (0); @@ -952,7 +952,7 @@ void CmIpcServiceUpdate(const struct CmBlob *paramSetBlob, struct CmBlob *outDat CmReport(__func__, &cmContext, NULL, ret); CmSendResponse(context, ret, NULL); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceFinish(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -971,13 +971,13 @@ void CmIpcServiceFinish(const struct CmBlob *paramSetBlob, struct CmBlob *outDat }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceFinish(&cmContext, &handleFinish, &inDataFinish, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("service finish failed, ret = %d", ret); + CM_LOG_E("service finish failed, ret = %{public}d", ret); break; } } while (0); @@ -986,7 +986,7 @@ void CmIpcServiceFinish(const struct CmBlob *paramSetBlob, struct CmBlob *outDat CmSendResponse(context, ret, outData); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceAbort(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1004,13 +1004,13 @@ void CmIpcServiceAbort(const struct CmBlob *paramSetBlob, struct CmBlob *outData }; ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("get input params failed, ret = %d", ret); + CM_LOG_E("get input params failed, ret = %{public}d", ret); break; } ret = CmServiceAbort(&cmContext, &handle); if (ret != CM_SUCCESS) { - CM_LOG_E("service abort failed, ret = %d", ret); + CM_LOG_E("service abort failed, ret = %{public}d", ret); break; } } while (0); @@ -1019,7 +1019,7 @@ void CmIpcServiceAbort(const struct CmBlob *paramSetBlob, struct CmBlob *outData CmSendResponse(context, ret, NULL); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceGetUserCertList(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1041,7 +1041,7 @@ void CmIpcServiceGetUserCertList(const struct CmBlob *paramSetBlob, struct CmBlo do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("GetUserCertList get input params failed, ret = %d", ret); + CM_LOG_E("GetUserCertList get input params failed, ret = %{public}d", ret); break; } @@ -1054,13 +1054,13 @@ void CmIpcServiceGetUserCertList(const struct CmBlob *paramSetBlob, struct CmBlo struct UserCAProperty prop = { userId, scope }; ret = CmServiceGetCertList(&cmContext, &prop, store, &certFileList); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertList failed, ret = %d", ret); + CM_LOG_E("GetCertList failed, ret = %{public}d", ret); break; } ret = CmServiceGetCertListPack(&cmContext, store, &certFileList, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetCertListPack pack fail, ret = %d", ret); + CM_LOG_E("CmServiceGetCertListPack pack fail, ret = %{public}d", ret); break; } @@ -1079,7 +1079,7 @@ void CmIpcServiceGetUserCertList(const struct CmBlob *paramSetBlob, struct CmBlo } CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceGetUserCertInfo(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1101,7 +1101,7 @@ void CmIpcServiceGetUserCertInfo(const struct CmBlob *paramSetBlob, struct CmBlo do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("GetUserCertInfo get input params failed, ret = %d", ret); + CM_LOG_E("GetUserCertInfo get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -1115,13 +1115,13 @@ void CmIpcServiceGetUserCertInfo(const struct CmBlob *paramSetBlob, struct CmBlo ret = CmServiceGetCertInfo(&cmContext, &certUri, store, &certificateData, &status); if (ret != CM_SUCCESS) { - CM_LOG_E("GetCertInfo failed, ret = %d", ret); + CM_LOG_E("GetCertInfo failed, ret = %{public}d", ret); break; } ret = CmServiceGetCertInfoPack(store, &certificateData, status, &certUri, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceGetCertInfoPack pack failed, ret = %d", ret); + CM_LOG_E("CmServiceGetCertInfoPack pack failed, ret = %{public}d", ret); break; } CmSendResponse(context, ret, outData); @@ -1133,7 +1133,7 @@ void CmIpcServiceGetUserCertInfo(const struct CmBlob *paramSetBlob, struct CmBlo CM_FREE_BLOB(certificateData); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceSetUserCertStatus(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1155,7 +1155,7 @@ void CmIpcServiceSetUserCertStatus(const struct CmBlob *paramSetBlob, struct CmB do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("SetUserCertStatus get input params failed, ret = %d", ret); + CM_LOG_E("SetUserCertStatus get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -1163,18 +1163,18 @@ void CmIpcServiceSetUserCertStatus(const struct CmBlob *paramSetBlob, struct CmB ret = CmServiceSetUserCertStatusCheck(&cmContext, &certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceSetUserCertStatusCheck fail, ret = %d", ret); + CM_LOG_E("CmServiceSetUserCertStatusCheck fail, ret = %{public}d", ret); break; } ret = CmServiceSetCertStatus(&cmContext, &certUri, store, status); if (ret != CM_SUCCESS) { - CM_LOG_E("set user cert status failed, ret = %d", ret); + CM_LOG_E("set user cert status failed, ret = %{public}d", ret); break; } ret = CmSetStatusBackupCert(&cmContext, &certUri, store, status); if (ret != CM_SUCCESS) { - CM_LOG_E("CmSetStatusBackupCert failed, ret = %d", ret); + CM_LOG_E("CmSetStatusBackupCert failed, ret = %{public}d", ret); break; } } while (0); @@ -1184,7 +1184,7 @@ void CmIpcServiceSetUserCertStatus(const struct CmBlob *paramSetBlob, struct CmB CmReportSGSetCertStatus(&certUri, store, status, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceInstallUserCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1208,7 +1208,7 @@ void CmIpcServiceInstallUserCert(const struct CmBlob *paramSetBlob, struct CmBlo do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("InstallUserCert get input params failed, ret = %d", ret); + CM_LOG_E("InstallUserCert get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -1216,13 +1216,13 @@ void CmIpcServiceInstallUserCert(const struct CmBlob *paramSetBlob, struct CmBlo ret = CmServiceInstallUserCertCheck(&cmContext, &userCert, &certAlias, userId); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceInstallUserCertCheck fail, ret = %d", ret); + CM_LOG_E("CmServiceInstallUserCertCheck fail, ret = %{public}d", ret); break; } ret = CmInstallUserCert(&cmContext, &userCert, &certAlias, status, outData); if (ret != CM_SUCCESS) { - CM_LOG_E("CertManagerInstallUserCert fail, ret = %d", ret); + CM_LOG_E("CertManagerInstallUserCert fail, ret = %{public}d", ret); break; } @@ -1238,7 +1238,7 @@ void CmIpcServiceInstallUserCert(const struct CmBlob *paramSetBlob, struct CmBlo CmReportSGInstallUserCert(&certAlias, outData, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceUninstallUserCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1257,7 +1257,7 @@ void CmIpcServiceUninstallUserCert(const struct CmBlob *paramSetBlob, struct CmB do { ret = GetInputParams(paramSetBlob, ¶mSet, &cmContext, params, CM_ARRAY_SIZE(params)); if (ret != CM_SUCCESS) { - CM_LOG_E("UninstallUserCert get input params failed, ret = %d", ret); + CM_LOG_E("UninstallUserCert get input params failed, ret = %{public}d", ret); break; } oriContext.userId = cmContext.userId; @@ -1265,13 +1265,13 @@ void CmIpcServiceUninstallUserCert(const struct CmBlob *paramSetBlob, struct CmB ret = CmServiceUninstallUserCertCheck(&cmContext, &certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CmServiceUninstallUserCertCheck fail, ret = %d", ret); + CM_LOG_E("CmServiceUninstallUserCertCheck fail, ret = %{public}d", ret); break; } ret = CmUninstallUserCert(&cmContext, &certUri); if (ret != CM_SUCCESS) { - CM_LOG_E("CertManagerUninstallUserCert fail, ret = %d", ret); + CM_LOG_E("CertManagerUninstallUserCert fail, ret = %{public}d", ret); break; } } while (0); @@ -1281,7 +1281,7 @@ void CmIpcServiceUninstallUserCert(const struct CmBlob *paramSetBlob, struct CmB CmReportSGUninstallUserCert(&certUri, false, ret); CmFreeParamSet(¶mSet); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } void CmIpcServiceUninstallAllUserCert(const struct CmBlob *paramSetBlob, struct CmBlob *outData, @@ -1294,7 +1294,7 @@ void CmIpcServiceUninstallAllUserCert(const struct CmBlob *paramSetBlob, struct do { ret = CmGetProcessInfoForIPC(&cmContext); if (ret != CM_SUCCESS) { - CM_LOG_E("CmGetProcessInfoForIPC fail, ret = %d", ret); + CM_LOG_E("CmGetProcessInfoForIPC fail, ret = %{public}d", ret); break; } @@ -1310,7 +1310,7 @@ void CmIpcServiceUninstallAllUserCert(const struct CmBlob *paramSetBlob, struct } ret = CmUninstallAllUserCert(&cmContext); if (ret != CM_SUCCESS) { - CM_LOG_E("CertManagerUninstallAllUserCert fail, ret = %d", ret); + CM_LOG_E("CertManagerUninstallAllUserCert fail, ret = %{public}d", ret); break; } } while (0); @@ -1318,6 +1318,6 @@ void CmIpcServiceUninstallAllUserCert(const struct CmBlob *paramSetBlob, struct CmSendResponse(context, ret, NULL); CmReportSGUninstallUserCert(NULL, true, ret); - CM_LOG_I("leave: ret = %d", ret); + CM_LOG_I("leave: ret = %{public}d", ret); } diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service_serialization.c b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service_serialization.c index ea2a4e3..7c0a22f 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service_serialization.c +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_ipc_service_serialization.c @@ -81,7 +81,7 @@ static int32_t GetNormalParam(const struct CmParam *param, struct CmParamOut *ou *(outParams->blob) = param->blob; break; default: - CM_LOG_E("invalid tag type:%x", GetTagType(outParams->tag)); + CM_LOG_E("invalid tag type:%{public}x", GetTagType(outParams->tag)); return CMR_ERROR_INVALID_PARAMSET_ARG; } return CM_SUCCESS; @@ -90,14 +90,14 @@ static int32_t GetNormalParam(const struct CmParam *param, struct CmParamOut *ou static int32_t GetNullBlobParam(const struct CmParamSet *paramSet, struct CmParamOut *outParams) { if (GetTagType(outParams->tag) != CM_TAG_TYPE_BYTES) { - CM_LOG_E("param tag[0x%x] is not bytes", outParams->tag); + CM_LOG_E("param tag[0x%{public}x] is not bytes", outParams->tag); return CMR_ERROR_PARAM_NOT_EXIST; } struct CmParam *param = NULL; int32_t ret = CmGetParam(paramSet, outParams->tag + CM_PARAM_BUFFER_NULL_INTERVAL, ¶m); if (ret != CM_SUCCESS) { - CM_LOG_E("get param tag[0x%x] from ipc buffer failed", outParams->tag + CM_PARAM_BUFFER_NULL_INTERVAL); + CM_LOG_E("get param tag[0x%{public}x] from ipc buffer failed", outParams->tag + CM_PARAM_BUFFER_NULL_INTERVAL); return ret; } @@ -120,7 +120,7 @@ int32_t CmParamSetToParams(const struct CmParamSet *paramSet, struct CmParamOut ret = GetNullBlobParam(paramSet, &outParams[i]); } if (ret != CM_SUCCESS) { - CM_LOG_E("get param failed, ret = %d", ret); + CM_LOG_E("get param failed, ret = %{public}d", ret); return ret; } } diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_response.cpp b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_response.cpp index d3a009d..27c0dbc 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_response.cpp +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/idl/cm_ipc/cm_response.cpp @@ -66,7 +66,7 @@ void CmSendResponse(const struct CmContext *context, int32_t result, const struc MessageParcel *reply = reinterpret_cast(const_cast(context)); reply->WriteInt32(ret); if (ret != CM_SUCCESS) { - CM_LOG_E("SendResponse result is %d.", ret); + CM_LOG_E("SendResponse result is %{public}d.", ret); return; } if (response == nullptr) { diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_event_observer.cpp b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_event_observer.cpp index aa456bf..8258b7c 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_event_observer.cpp +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_event_observer.cpp @@ -48,11 +48,11 @@ void SystemEventSubscriber::OnReceiveEvent(const OHOS::EventFwk::CommonEventData int userId = 0; OHOS::AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(context.uid, userId); context.userId = static_cast(userId); - CM_LOG_D("CmService package removed: uid is %u userId is %u", context.uid, context.userId); + CM_LOG_D("CmService package removed: uid is %{public}u userId is %{public}u", context.uid, context.userId); CmDeleteProcessInfo(&context); } else if (action == OHOS::EventFwk::CommonEventSupport::COMMON_EVENT_USER_REMOVED) { context.userId = static_cast(data.GetCode()); - CM_LOG_D("CmService user removed: userId is %d", context.userId); + CM_LOG_D("CmService user removed: userId is %{public}d", context.userId); CmDeleteProcessInfo(&context); } } diff --git a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp index d566885..9dd0290 100644 --- a/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp +++ b/services/cert_manager_standard/cert_manager_service/main/os_dependency/sa/cm_sa.cpp @@ -92,10 +92,10 @@ static void SubscribEvent() { for (uint32_t i = 0; i < MAX_DELAY_TIMES; ++i) { if (SystemEventObserver::SubscribeSystemEvent()) { - CM_LOG_D("subscribe system event success, i = %u", i); + CM_LOG_D("subscribe system event success, i = %{public}u", i); return; } else { - CM_LOG_E("subscribe system event failed %u times", i); + CM_LOG_E("subscribe system event failed %{public}u times", i); usleep(DELAY_INTERVAL); } } @@ -130,7 +130,7 @@ static int32_t ProcessMessage(uint32_t code, uint32_t outSize, const struct CmBl if (outSize != 0) { outData.size = outSize; if (outData.size > MAX_MALLOC_LEN) { - CM_LOG_E("outData size is invalid, size:%u", outData.size); + CM_LOG_E("outData size is invalid, size:%{public}u", outData.size); return CMR_ERROR_IPC_PARAM_SIZE_INVALID; } outData.data = static_cast(CmMalloc(outData.size)); @@ -188,7 +188,7 @@ int CertManagerService::OnRemoteRequest(uint32_t code, MessageParcel &data, { struct CmContext context = { 0, 0, {0} }; (void)CmGetProcessInfoForIPC(&context); - CM_LOG_I("OnRemoteRequest code: %u, callingUid = %u, userId = %u", code, context.uid, context.userId); + CM_LOG_I("OnRemoteRequest code: %{public}u, callingUid = %{public}u, userId = %{public}u", code, context.uid, context.userId); // this is the temporary version which comments the descriptor check std::u16string descriptor = CertManagerService::GetDescriptor(); @@ -200,7 +200,7 @@ int CertManagerService::OnRemoteRequest(uint32_t code, MessageParcel &data, // check the code is valid if (code < static_cast(CM_MSG_BASE) || code >= static_cast(CM_MSG_MAX)) { - CM_LOG_E("code[%u] invalid", code); + CM_LOG_E("code[%{public}u] invalid", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } @@ -209,7 +209,7 @@ int CertManagerService::OnRemoteRequest(uint32_t code, MessageParcel &data, struct CmBlob srcData = { 0, nullptr }; srcData.size = static_cast(data.ReadUint32()); if (IsInvalidLength(srcData.size)) { - CM_LOG_E("srcData size is invalid, size:%u", srcData.size); + CM_LOG_E("srcData size is invalid, size:%{public}u", srcData.size); return CMR_ERROR_IPC_PARAM_SIZE_INVALID; } @@ -264,12 +264,12 @@ void CertManagerService::OnStart(const SystemAbilityOnDemandReason& startReason) return; } - CM_LOG_I("certmanager start reason %s", startReason.GetName().c_str()); + CM_LOG_I("certmanager start reason %{public}s", startReason.GetName().c_str()); if (startReason.GetId() == OnDemandReasonId::COMMON_EVENT && startReason.GetName() == USER_REMOVED_EVENT) { struct CmContext context = { 0, INVALID_VALUE, {0} }; context.userId = (uint32_t)startReason.GetExtraData().GetCode(); - CM_LOG_D("user remove event, userId = %u", context.userId); + CM_LOG_D("user remove event, userId = %{public}u", context.userId); CmDeleteProcessInfo(&context); } @@ -284,13 +284,13 @@ void CertManagerService::OnStart(const SystemAbilityOnDemandReason& startReason) void CertManagerService::OnAddSystemAbility(int32_t systemAbilityId, const std::string &deviceId) { - CM_LOG_D("systemAbilityId is %d!", systemAbilityId); + CM_LOG_D("systemAbilityId is %{public}d!", systemAbilityId); CmSubscribeSystemEvent(); } void CertManagerService::OnRemoveSystemAbility(int32_t systemAbilityId, const std::string& deviceId) { - CM_LOG_D("systemAbilityId is %d!", systemAbilityId); + CM_LOG_D("systemAbilityId is %{public}d!", systemAbilityId); } void CertManagerService::OnStop() 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 39e56eb..8036917 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 @@ -51,6 +51,7 @@ ohos_static_library("libcert_manager_sg_report_static") { "bounds_checking_function:libsec_shared", "c_utils:utils", "ipc:ipc_single", + "hilog:libhilog", ] if (support_security_guard) { cflags += [ "-DSUPPORT_SECURITY_GUARD" ] diff --git a/test/BUILD.gn b/test/BUILD.gn index 8a86075..6be5db2 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -66,6 +66,7 @@ ohos_unittest("cm_sdk_test") { "c_utils:utils", "googletest:gtest", "openssl:libcrypto_shared", + "hilog:libhilog", ] resource_config_file = "./resource/certificate_manager/ohos_test.xml" diff --git a/test/unittest/module_test/BUILD.gn b/test/unittest/module_test/BUILD.gn index 773ddd4..6dd8bbf 100644 --- a/test/unittest/module_test/BUILD.gn +++ b/test/unittest/module_test/BUILD.gn @@ -52,5 +52,6 @@ ohos_unittest("cm_module_test") { "c_utils:utils", "googletest:gtest", "openssl:libcrypto_shared", + "hilog:libhilog", ] } diff --git a/test/unittest/module_test/src/cm_log_test.cpp b/test/unittest/module_test/src/cm_log_test.cpp index e71dc3d..7755e09 100644 --- a/test/unittest/module_test/src/cm_log_test.cpp +++ b/test/unittest/module_test/src/cm_log_test.cpp @@ -170,9 +170,6 @@ HWTEST_F(CmLogTest, CmIpcClientTest004, TestSize.Level0) /* Test Log Warn */ CM_LOG_W("this is test for log"); - /* Test Log ID INVALID */ - CmLog(CM_LOG_LEVEL_D + 1, __func__, __LINE__, "this is test for default branch"); - /* Test Log info length more than 512 */ CM_LOG_W("MoreThan512Bytes................................................" "................................................................" -- Gitee