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 45a75a2a0eed570cbf3784cea1679dc3a5690daf..68a35900a78ab89341de92bcf2a81e72cee61345 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 @@ -309,7 +309,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 faild ret:%d", ret); + CM_LOG_E("App cert get list failed ret:%d", ret); return ret; } 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 e069787cc8a4b3ff6ec2ecb5ac8bd9f20a78ed28..9e1bdc20e574dd5e5f1e072ace86c5fe9a4fe2e7 100644 --- a/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp +++ b/interfaces/kits/napi/src/dialog/cm_napi_dialog_common.cpp @@ -26,7 +26,7 @@ #define BYTE_SHIFT_16 0x10 #define BYTE_SHIFT_8 0x08 -#define BYTE_SHIFT_6 6 +#define BYTE_SHIFT_6 0x06 #define BASE64_URL_TABLE_SIZE 0x3F #define BASE64_GROUP_NUM 3 #define BYTE_INDEX_ZONE 0 @@ -50,7 +50,7 @@ static const std::string DIALOG_INSTALL_FAILED_MSG = "the user install certifica " in the certificate manager dialog"; static const std::string DIALOG_NOT_SUPPORTED_MSG = "the API is not supported on this device"; -static const std::string DIOLOG_OPERATION_FAILED_MSG = "the user operation failed " +static const std::string DIALOG_OPERATION_FAILED_MSG = "the user operation failed " "in the certification manager dialog: "; static const std::string PARSE_CERT_FAILED_MSG = "parse the certificate failed."; static const std::string ADVANCED_SECURITY_MSG = "the device enters advanced security mode."; @@ -94,12 +94,12 @@ static const std::unordered_map DIALOG_CODE_TO_MSG_MAP = { { CMR_DIALOG_ERROR_NOT_ENTERPRISE_DEVICE, NOT_ENTERPRISE_DEVICE_MSG }, { CMR_DIALOG_ERROR_PARAM_INVALID, DIALOG_INVALID_PARAMS_MSG }, - { CMR_DIALOG_ERROR_PARSE_CERT_FAILED, DIOLOG_OPERATION_FAILED_MSG + PARSE_CERT_FAILED_MSG }, - { CMR_DIALOG_ERROR_ADVANCED_SECURITY, DIOLOG_OPERATION_FAILED_MSG + ADVANCED_SECURITY_MSG }, - { CMR_DIALOG_ERROR_INCORRECT_FORMAT, DIOLOG_OPERATION_FAILED_MSG + INCORRECT_FORMAT_MSG }, - { CMR_DIALOG_ERROR_MAX_QUANTITY_REACHED, DIOLOG_OPERATION_FAILED_MSG + MAX_QUANTITY_REACHED_MSG }, - { CMR_DIALOG_ERROR_SA_INTERNAL_ERROR, DIOLOG_OPERATION_FAILED_MSG + SA_INTERNAL_ERROR_MSG }, - { CMR_DIALOG_ERROR_NOT_EXIST, DIOLOG_OPERATION_FAILED_MSG + NOT_EXIST_MSG }, + { CMR_DIALOG_ERROR_PARSE_CERT_FAILED, DIALOG_OPERATION_FAILED_MSG + PARSE_CERT_FAILED_MSG }, + { CMR_DIALOG_ERROR_ADVANCED_SECURITY, DIALOG_OPERATION_FAILED_MSG + ADVANCED_SECURITY_MSG }, + { CMR_DIALOG_ERROR_INCORRECT_FORMAT, DIALOG_OPERATION_FAILED_MSG + INCORRECT_FORMAT_MSG }, + { CMR_DIALOG_ERROR_MAX_QUANTITY_REACHED, DIALOG_OPERATION_FAILED_MSG + MAX_QUANTITY_REACHED_MSG }, + { CMR_DIALOG_ERROR_SA_INTERNAL_ERROR, DIALOG_OPERATION_FAILED_MSG + SA_INTERNAL_ERROR_MSG }, + { CMR_DIALOG_ERROR_NOT_EXIST, DIALOG_OPERATION_FAILED_MSG + NOT_EXIST_MSG }, }; } // namespace