diff --git a/frameworks/common/src/random_mbedtls.cpp b/frameworks/common/src/random_mbedtls.cpp index f7cf0f8f1bc43ea1d1d08f9f3413906822ab6da9..082298f5dadccf80d374831a7852a26fe18f3820 100644 --- a/frameworks/common/src/random_mbedtls.cpp +++ b/frameworks/common/src/random_mbedtls.cpp @@ -34,7 +34,7 @@ extern "C" unsigned int GetRandomUint32() int RandomMbedtls::GenerateRandomArray(unsigned char *randStr, unsigned int len) { - if (randStr == NULL || len == 0) { + if (randStr == nullptr || len == 0) { return RET_FAILED; } int ret; diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/interfaces/innerkits/nativetoken/src/nativetoken.c index 89837e5331e336e88f1a5a5732a99c919bfa742d..ba115e24dcfedff529ab7005804849183ae3c289 100644 --- a/interfaces/innerkits/nativetoken/src/nativetoken.c +++ b/interfaces/innerkits/nativetoken/src/nativetoken.c @@ -48,7 +48,7 @@ int32_t GetFileBuff(const char *cfg, char **retBuff) return ATRET_FAILED; } - size_t fileSize = fileStat.st_size; + size_t fileSize = (unsigned)fileStat.st_size; FILE *cfgFd = fopen(filePath, "r"); if (cfgFd == NULL) { diff --git a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h index 04f07ca352cb0c187a986511badce6e7f19f6f5e..5b5f2fd6ce1552bb0371d27f7e14b8e7d9c8c839 100644 --- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h +++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h @@ -26,13 +26,13 @@ namespace OHOS { namespace Security { namespace AccessToken { -#define ASYN_THREAD_EXEC_SUCC 0 -#define ASYN_THREAD_EXEC_FAIL -1 -#define ACCESSTOKEN_PERMISSION_GRANT_FAIL -1 -#define ACCESSTOKEN_PERMISSION_GRANT_SUCC 0 -#define ACCESSTOKEN_PERMISSION_REVOKE_FAIL -1 -#define ACCESSTOKEN_PERMISSION_REVOKE_SUCC 0 -#define VALUE_BUFFER_SIZE 128 +const int ASYN_THREAD_EXEC_SUCC = 0; +const int ASYN_THREAD_EXEC_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_GRANT_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_GRANT_SUCC = 0; +const int ACCESSTOKEN_PERMISSION_REVOKE_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_REVOKE_SUCC = 0; +const int VALUE_BUFFER_SIZE = 128; static thread_local napi_ref atManagerRef_; const std::string ATMANAGER_CLASS_NAME = "atManager"; diff --git a/services/tokensyncmanager/include/remote/soft_bus_channel.h b/services/tokensyncmanager/include/remote/soft_bus_channel.h index f7e52e79e7cd6bff52d24f1009e8fa6941dd02a5..169a5d74e9b3ff9aa7530a5f822baf3c5d15bc05 100644 --- a/services/tokensyncmanager/include/remote/soft_bus_channel.h +++ b/services/tokensyncmanager/include/remote/soft_bus_channel.h @@ -29,6 +29,7 @@ #include "nlohmann/json.hpp" #include "rpc_channel.h" #include "session.h" +#include "random.h" namespace OHOS { namespace Security { @@ -227,7 +228,7 @@ private: int n; for (n = 0; n < uuidlen; ++n) { - int b = rand() % bbase; + int b = (int)(GetRandomUint32() % bbase); switch (n) { case index6: if (sprintf_s(p, bufSize, "4%x", b % xbase) < 0) { @@ -235,7 +236,7 @@ private: } break; case index8: - if (sprintf_s(p, bufSize, "%c%x", c[rand() % strlen(c)], b % xbase) < 0) { + if (sprintf_s(p, bufSize, "%c%x", c[GetRandomUint32() % strlen(c)], b % xbase) < 0) { return; } break; diff --git a/services/tokensyncmanager/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp index c6aaf74b60d977d3f2c3a845b5e1a2e7d9dab096..3b7cce5a4b4a29f789446437c9cec986d7db6166 100644 --- a/services/tokensyncmanager/src/command/base_remote_command.cpp +++ b/services/tokensyncmanager/src/command/base_remote_command.cpp @@ -99,7 +99,7 @@ void BaseRemoteCommand::ToPermStateJson(nlohmann::json& permStateJson, const Per return; } nlohmann::json permConfigsJson; - int size = state.resDeviceID.size(); + int size = (signed)state.resDeviceID.size(); for (int i = 0; i < size; i++) { nlohmann::json permConfigJson = nlohmann::json { {"resDeviceID", state.resDeviceID[i]}, @@ -142,7 +142,8 @@ void BaseRemoteCommand::FromHapTokenBasicInfoJson(const nlohmann::json& hapToken HapTokenInfo& hapTokenBasicInfo) { if (hapTokenJson.find("version") != hapTokenJson.end() && hapTokenJson.at("version").is_number()) { - hapTokenJson.at("version").get_to(hapTokenBasicInfo.ver); } + hapTokenJson.at("version").get_to(hapTokenBasicInfo.ver); + } if (hapTokenJson.find("tokenID") != hapTokenJson.end() && hapTokenJson.at("tokenID").is_number()) { hapTokenJson.at("tokenID").get_to(hapTokenBasicInfo.tokenID); } @@ -186,7 +187,7 @@ void BaseRemoteCommand::FromPermStateListJson(const nlohmann::json& hapTokenJson || permissionJson.find("isGeneral") == permissionJson.end() || !permissionJson.at("isGeneral").is_boolean() || permissionJson.find("grantConfig") == permissionJson.end() - || !permissionJson.at("grantConfig").is_array() + || !permissionJson.at("grantConfig").is_array() || permissionJson.at("grantConfig").size() == 0) { continue; } @@ -196,7 +197,7 @@ void BaseRemoteCommand::FromPermStateListJson(const nlohmann::json& hapTokenJson for (auto grantConfigJson :grantConfigsJson) { if (grantConfigJson.find("resDeviceID") == grantConfigJson.end() || !grantConfigJson.at("resDeviceID").is_string() - || grantConfigJson.find("grantStatus") == grantConfigJson.end() + || grantConfigJson.find("grantStatus") == grantConfigJson.end() || !grantConfigJson.at("grantStatus").is_number() || grantConfigJson.find("grantFlags") == grantConfigJson.end() || !grantConfigJson.at("grantFlags").is_number()) { @@ -241,13 +242,13 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const nlohmann::json& nativeToke } } if (nativeTokenJson.find("version") != nativeTokenJson.end() && nativeTokenJson.at("version").is_number()) { - nativeTokenInfo.ver = nativeTokenJson.at("version").get(); + nativeTokenInfo.ver = (unsigned)nativeTokenJson.at("version").get(); } if (nativeTokenJson.find("tokenId") != nativeTokenJson.end() && nativeTokenJson.at("tokenId").is_number()) { - nativeTokenInfo.tokenID = nativeTokenJson.at("tokenId").get(); + nativeTokenInfo.tokenID = (unsigned)nativeTokenJson.at("tokenId").get(); } if (nativeTokenJson.find("tokenAttr") != nativeTokenJson.end() && nativeTokenJson.at("tokenAttr").is_number()) { - nativeTokenInfo.tokenAttr = nativeTokenJson.at("tokenAttr").get(); + nativeTokenInfo.tokenAttr = (unsigned)nativeTokenJson.at("tokenAttr").get(); } if (nativeTokenJson.find("dcaps") != nativeTokenJson.end() && nativeTokenJson.at("dcaps").is_array() && nativeTokenJson.at("dcaps").size() > 0 && (nativeTokenJson.at("dcaps"))[0].is_string()) { diff --git a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp index 65a3c04afd4ad6181d0f4ce23a278943cc72cf7c..57808a7c6c258bea4599311aa4ff3ce3fcadc0e4 100644 --- a/services/tokensyncmanager/src/command/delete_remote_token_command.cpp +++ b/services/tokensyncmanager/src/command/delete_remote_token_command.cpp @@ -43,11 +43,12 @@ DeleteRemoteTokenCommand::DeleteRemoteTokenCommand( DeleteRemoteTokenCommand::DeleteRemoteTokenCommand(const std::string& json) { + deleteTokenId_ = 0; nlohmann::json jsonObject = nlohmann::json::parse(json, nullptr, false); BaseRemoteCommand::FromRemoteProtocolJson(jsonObject); if (jsonObject.find("tokenId") != jsonObject.end() && jsonObject.at("tokenId").is_number()) { - deleteTokenId_ = jsonObject.at("tokenId").get(); + deleteTokenId_ = (signed)jsonObject.at("tokenId").get(); } } diff --git a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp index fde09adb0439356654d768eb55a8021fb736045e..b0f4a50ad2463f2f86680f6a84d44b61dc2af2b9 100644 --- a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp +++ b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp @@ -49,6 +49,7 @@ SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand( SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand(const std::string &json) { + requestTokenId_ = 0; nlohmann::json jsonObject = nlohmann::json::parse(json, nullptr, false); BaseRemoteCommand::FromRemoteProtocolJson(jsonObject); if (jsonObject.find("requestTokenId") != jsonObject.end() && jsonObject.at("requestTokenId").is_number()) { diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp index 21650d63f1f79711c1725c106d7d896d39e1f179..61695aeeb099e5cd7def4e25feb4b8c49b1ae690 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp @@ -133,7 +133,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const std::string uuid(uuidbuf); ACCESSTOKEN_LOG_DEBUG(LABEL, "generated message uuid: %{public}s", uuid.c_str()); - int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length(); + int len = (signed)(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); unsigned char *buf = new unsigned char[len + 1]; if (buf == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len); @@ -253,7 +253,7 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr } ACCESSTOKEN_LOG_DEBUG(LABEL, "compress complete. compress %{public}d bytes to %{public}d", compressedLength, (int)len); - compressedLength = len; + compressedLength = (signed)len; return Constant::SUCCESS; } @@ -349,7 +349,7 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std ACCESSTOKEN_LOG_WARN(LABEL, "command %{public}s cannot get from json %{public}s", commandName.c_str(), jsonPayload.c_str()); - int sendlen = RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length(); + int sendlen = (signed)(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); unsigned char *sendbuf = new unsigned char[sendlen + 1]; if (sendbuf == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", sendlen); @@ -375,7 +375,7 @@ void SoftBusChannel::HandleRequest(int session, const std::string &id, const std // send result back std::string resultJsonPayload = command->ToJsonPayload(); - int len = RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length(); + int len = (signed)(RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length()); unsigned char *buf = new unsigned char[len + 1]; if (buf == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "no enough memory: %{public}d", len); diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index c44fc70bdb7d59cee41841776352892203422581..cefdf158f489ea3ec44c124e3a3ddc0b7265700c 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -55,7 +55,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { std::string deviceID = data.ReadString(); - int tokenID = data.ReadUint32(); + AccessTokenID tokenID = data.ReadUint32(); HapTokenInfoForSync tokenInfo; int result = this->GetRemoteHapTokenInfo(deviceID, tokenID); @@ -65,7 +65,7 @@ void TokenSyncManagerStub::GetRemoteHapTokenInfoInner(MessageParcel& data, Messa void TokenSyncManagerStub::DeleteRemoteHapTokenInfoInner(MessageParcel& data, MessageParcel& reply) { std::string deviceID = data.ReadString(); - int tokenID = data.ReadUint32(); + AccessTokenID tokenID = data.ReadUint32(); int result = this->DeleteRemoteHapTokenInfo(tokenID); reply.WriteInt32(result); }