From 5157d1420e6d8ec264ba29cc40d751debba23cc3 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Thu, 23 Jul 2026 23:42:19 +0300 Subject: [PATCH 1/9] common: cm: fix S5018 errors Make sure that moving an objectis "noexcept" Move and swap operations should be "noexcept" Signed-off-by: Mykola Kobets --- src/core/cm/storagestate/storagestate.hpp | 4 ++-- src/core/common/tools/array.hpp | 4 ++-- src/core/common/tools/fs.cpp | 4 ++-- src/core/common/tools/fs.hpp | 4 ++-- src/core/common/tools/map.hpp | 4 ++-- src/core/common/tools/memory.hpp | 8 ++++---- src/core/common/tools/string.hpp | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/core/cm/storagestate/storagestate.hpp b/src/core/cm/storagestate/storagestate.hpp index 8cb0ed09e..12ee13e74 100644 --- a/src/core/cm/storagestate/storagestate.hpp +++ b/src/core/cm/storagestate/storagestate.hpp @@ -155,8 +155,8 @@ class StorageState : public StateHandlerItf, { } - State(State&&) = default; - State& operator=(State&&) = default; + State(State&&) noexcept = default; + State& operator=(State&&) noexcept = default; InstanceIdent mInstanceIdent; StaticString mFilePath; diff --git a/src/core/common/tools/array.hpp b/src/core/common/tools/array.hpp index 995717373..00848678e 100644 --- a/src/core/common/tools/array.hpp +++ b/src/core/common/tools/array.hpp @@ -519,7 +519,7 @@ class StaticArray : public Array { * * @param array array to create from. */ - StaticArray(const StaticArray& array) + StaticArray(const StaticArray& array) noexcept : Array() { Array::SetBuffer(mBuffer); @@ -536,7 +536,7 @@ class StaticArray : public Array { * * @param array array to create from. */ - StaticArray& operator=(const StaticArray& array) + StaticArray& operator=(const StaticArray& array) noexcept { Array::operator=(array); diff --git a/src/core/common/tools/fs.cpp b/src/core/common/tools/fs.cpp index 877675a0f..ec878b7d3 100644 --- a/src/core/common/tools/fs.cpp +++ b/src/core/common/tools/fs.cpp @@ -25,7 +25,7 @@ DirIterator::DirIterator(const String& path) { } -DirIterator::DirIterator(DirIterator&& other) +DirIterator::DirIterator(DirIterator&& other) noexcept : mDir(other.mDir) , mEntry(other.mEntry) , mRoot(other.mRoot) @@ -33,7 +33,7 @@ DirIterator::DirIterator(DirIterator&& other) other.mDir = nullptr; } -DirIterator& DirIterator::operator=(DirIterator&& other) +DirIterator& DirIterator::operator=(DirIterator&& other) noexcept { if (this != &other) { mDir = other.mDir; diff --git a/src/core/common/tools/fs.hpp b/src/core/common/tools/fs.hpp index bcd503c7f..bd6c68429 100644 --- a/src/core/common/tools/fs.hpp +++ b/src/core/common/tools/fs.hpp @@ -202,7 +202,7 @@ class DirIterator : public NonCopyable { * * @param other iterator to move from. */ - DirIterator(DirIterator&& other); + DirIterator(DirIterator&& other) noexcept; /** * Move assignment. @@ -210,7 +210,7 @@ class DirIterator : public NonCopyable { * @param other iterator to move from. * @return DirIterator&. */ - DirIterator& operator=(DirIterator&& other); + DirIterator& operator=(DirIterator&& other) noexcept; /** * Destructor. diff --git a/src/core/common/tools/map.hpp b/src/core/common/tools/map.hpp index 2acc9b945..7a6def86f 100644 --- a/src/core/common/tools/map.hpp +++ b/src/core/common/tools/map.hpp @@ -280,13 +280,13 @@ class StaticMap : public Map { { } - StaticMap(const StaticMap& map) + StaticMap(const StaticMap& map) noexcept : Map(mArray) , mArray(map.mArray) { } - StaticMap& operator=(const StaticMap& map) + StaticMap& operator=(const StaticMap& map) noexcept { mArray = map.mArray; diff --git a/src/core/common/tools/memory.hpp b/src/core/common/tools/memory.hpp index 0c1e0e9bf..1827e12ae 100644 --- a/src/core/common/tools/memory.hpp +++ b/src/core/common/tools/memory.hpp @@ -163,7 +163,7 @@ class UniquePtr : private NonCopyable { * * @param ptr unique pointer to move from. */ - UniquePtr(UniquePtr&& ptr) + UniquePtr(UniquePtr&& ptr) noexcept : UniquePtr() { *this = Move(ptr); @@ -174,7 +174,7 @@ class UniquePtr : private NonCopyable { * * @param ptr unique pointer to assign from. */ - UniquePtr& operator=(UniquePtr&& ptr) + UniquePtr& operator=(UniquePtr&& ptr) noexcept { Reset(); @@ -191,7 +191,7 @@ class UniquePtr : private NonCopyable { */ template ::value>> // cppcheck-suppress noExplicitConstructor - UniquePtr(UniquePtr&& ptr) + UniquePtr(UniquePtr&& ptr) noexcept : UniquePtr() { *this = Move(ptr); @@ -203,7 +203,7 @@ class UniquePtr : private NonCopyable { * @param ptr unique pointer to assign from. */ template ::value>> - UniquePtr& operator=(UniquePtr&& ptr) + UniquePtr& operator=(UniquePtr&& ptr) noexcept { Reset(); diff --git a/src/core/common/tools/string.hpp b/src/core/common/tools/string.hpp index 9d9e62300..feb1b2007 100644 --- a/src/core/common/tools/string.hpp +++ b/src/core/common/tools/string.hpp @@ -823,7 +823,7 @@ class StaticString : public String { * * @param str string to create from. */ - StaticString(const StaticString& str) + StaticString(const StaticString& str) noexcept : String() { String::SetBuffer(mBuffer, cMaxSize); @@ -835,7 +835,7 @@ class StaticString : public String { * * @param str string to assign from. */ - StaticString& operator=(const StaticString& str) + StaticString& operator=(const StaticString& str) noexcept { String::operator=(str); From e651921c6433b9f854c8870e8980db4810edfc2f Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Fri, 24 Jul 2026 00:39:03 +0300 Subject: [PATCH 2/9] common: cm: sm: iam: fix S5912 errors Use pointer or reference to avoid slicing Suppress false-positive slicing for String/Array views over Static* Signed-off-by: Mykola Kobets --- src/core/cm/imagemanager/imagemanager.cpp | 12 ++++----- src/core/cm/launcher/instance.cpp | 9 ++++--- src/core/common/tools/array.hpp | 2 +- src/core/common/tools/fs.hpp | 2 +- .../fileidentifier/fileidentifier.cpp | 4 +-- src/core/iam/permhandler/permhandler.cpp | 4 +-- src/core/sm/imagemanager/imagemanager.cpp | 23 ++++++++--------- src/core/sm/launcher/launcher.cpp | 25 +++++++++++-------- src/core/sm/networkmanager/networkmanager.cpp | 3 ++- 9 files changed, 40 insertions(+), 44 deletions(-) diff --git a/src/core/cm/imagemanager/imagemanager.cpp b/src/core/cm/imagemanager/imagemanager.cpp index 9ec61bdbe..d4ffd999e 100644 --- a/src/core/cm/imagemanager/imagemanager.cpp +++ b/src/core/cm/imagemanager/imagemanager.cpp @@ -375,9 +375,7 @@ Error ImageManager::GetIndexDigest(const String& itemID, const String& version, return ErrorEnum::eNotFound; } - digest = it->mIndexDigest; - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(digest.Assign(it->mIndexDigest)); } Error ImageManager::GetBlobPath(const String& digest, String& path) const @@ -391,7 +389,9 @@ Error ImageManager::GetBlobPath(const String& digest, String& path) const return AOS_ERROR_WRAP(err); } - path = blobPath; + if (auto err = path.Assign(blobPath); !err.IsNone()) { + return AOS_ERROR_WRAP(err); + } auto [exists, err] = fs::FileExist(path); if (!err.IsNone()) { @@ -448,9 +448,7 @@ Error ImageManager::GetItemCurrentVersion(const String& itemID, String& version) return ErrorEnum::eNotFound; } - version = it->mVersion; - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(version.Assign(it->mVersion)); } RetWithError ImageManager::RemoveItem(const String& id, const String& version) diff --git a/src/core/cm/launcher/instance.cpp b/src/core/cm/launcher/instance.cpp index a360a65c0..fc4106304 100644 --- a/src/core/cm/launcher/instance.cpp +++ b/src/core/cm/launcher/instance.cpp @@ -771,10 +771,11 @@ Error ServiceInstance::SetupStateStorage(const NodeConfig& nodeConfig, String& s Error ServiceInstance::ReserveRuntimeResources(NodeItf& node, const String& runtimeID) { - auto requestedCPU = mItemConfig->mSkipResourceLimits ? 0 : GetRequestedCPU(node); - auto requestedRAM = mItemConfig->mSkipResourceLimits ? 0 : GetRequestedRAM(node); - Array requestedResources - = mItemConfig->mSkipResourceLimits ? Array() : mItemConfig->mResources; + auto requestedCPU = mItemConfig->mSkipResourceLimits ? 0 : GetRequestedCPU(node); + auto requestedRAM = mItemConfig->mSkipResourceLimits ? 0 : GetRequestedRAM(node); + Array requestedResources = mItemConfig->mSkipResourceLimits + ? Array() + : mItemConfig->mResources; // NOSONAR cpp:S5912 - Array serves as a view over StaticArray auto reserveErr = node.ReserveResources(mInfo.mInstanceIdent, runtimeID, requestedCPU, requestedRAM, requestedResources); diff --git a/src/core/common/tools/array.hpp b/src/core/common/tools/array.hpp index 00848678e..58033f52c 100644 --- a/src/core/common/tools/array.hpp +++ b/src/core/common/tools/array.hpp @@ -309,7 +309,7 @@ class Array : public AlgorithmItf { return ErrorEnum::eNoMemory; } - new (end()) T(args...); + new (end()) T(args...); // NOSONAR cpp:S5912 - intentional type construction from derived args mSize++; diff --git a/src/core/common/tools/fs.hpp b/src/core/common/tools/fs.hpp index bd6c68429..759779116 100644 --- a/src/core/common/tools/fs.hpp +++ b/src/core/common/tools/fs.hpp @@ -229,7 +229,7 @@ class DirIterator : public NonCopyable { * * @return String. */ - String GetRootPath() const { return mRoot; } + String GetRootPath() const { return mRoot; } // NOSONAR cpp:S5912 - String serves as a view over StaticString /** * Returns current entry reference. diff --git a/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp b/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp index 67672706b..234c5d420 100644 --- a/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp +++ b/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp @@ -71,9 +71,7 @@ Error FileIdentifier::GetSubjects(Array>& subjects) return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - subjects = mSubjects; - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(subjects.Assign(mSubjects)); } /*********************************************************************************************************************** diff --git a/src/core/iam/permhandler/permhandler.cpp b/src/core/iam/permhandler/permhandler.cpp index 37959d5c2..68924d3ca 100644 --- a/src/core/iam/permhandler/permhandler.cpp +++ b/src/core/iam/permhandler/permhandler.cpp @@ -88,9 +88,7 @@ Error PermHandler::GetPermissions(const String& secret, const String& funcServer return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - servicePermissions = it.mPermissions; - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(servicePermissions.Assign(it.mPermissions)); } } diff --git a/src/core/sm/imagemanager/imagemanager.cpp b/src/core/sm/imagemanager/imagemanager.cpp index 5873bcd77..bbba27abd 100644 --- a/src/core/sm/imagemanager/imagemanager.cpp +++ b/src/core/sm/imagemanager/imagemanager.cpp @@ -28,10 +28,11 @@ Error SplitDigest(const String& digest, String& alg, String& hash) return ErrorEnum::eInvalidArgument; } - alg = digestList[0]; - hash = digestList[1]; + if (auto err = alg.Assign(digestList[0]); !err.IsNone()) { + return AOS_ERROR_WRAP(err); + } - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(hash.Assign(digestList[1])); } Error AddPathIfNotExist(Array>& list, const String& path) @@ -290,7 +291,9 @@ Error ImageManager::GetLayerPath(const String& digest, String& path) const return err; } - path = fs::JoinPath(path, cUnpackedLayerFolder); + if (auto err = path.Assign(fs::JoinPath(path, cUnpackedLayerFolder)); !err.IsNone()) { + return AOS_ERROR_WRAP(err); + } LOG_DBG() << "Get layer path" << Log::Field("digest", digest) << Log::Field("path", path); @@ -338,9 +341,7 @@ Error ImageManager::CreateBlobPath(const String& digest, String& path) const return AOS_ERROR_WRAP(err); } - path = fs::JoinPath(mConfig.mImagePath, cBlobsFolder, alg, hash); - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(path.Assign(fs::JoinPath(mConfig.mImagePath, cBlobsFolder, alg, hash))); } Error ImageManager::CreateLayerPath(const String& digest, String& path) const @@ -352,9 +353,7 @@ Error ImageManager::CreateLayerPath(const String& digest, String& path) const return AOS_ERROR_WRAP(err); } - path = fs::JoinPath(mConfig.mImagePath, cLayersFolder, alg, hash); - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(path.Assign(fs::JoinPath(mConfig.mImagePath, cLayersFolder, alg, hash))); } Error ImageManager::ValidateBlob(const String& path, const String& digest) const @@ -718,9 +717,7 @@ Error ImageManager::GetBlobURL(const String& digest, String& url) const return Error(ErrorEnum::eNotFound, "blob URL not found"); } - url = urls[0]; - - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(url.Assign(urls[0])); } // cppcheck-suppress passedByValue diff --git a/src/core/sm/launcher/launcher.cpp b/src/core/sm/launcher/launcher.cpp index 554ecf41c..ea9843ef9 100644 --- a/src/core/sm/launcher/launcher.cpp +++ b/src/core/sm/launcher/launcher.cpp @@ -616,11 +616,12 @@ Error Launcher::HandleComponentStatus(const aos::InstanceStatus& status) return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - static_cast(*instanceInfo) = status; - instanceInfo->mRuntimeID = status.mRuntimeID; - instanceInfo->mType = status.mType; - instanceInfo->mVersion = status.mVersion; - instanceInfo->mManifestDigest = status.mManifestDigest; + static_cast(*instanceInfo) + = status; // NOSONAR cpp:S5912 - intentional copy of InstanceIdent base only + instanceInfo->mRuntimeID = status.mRuntimeID; + instanceInfo->mType = status.mType; + instanceInfo->mVersion = status.mVersion; + instanceInfo->mManifestDigest = status.mManifestDigest; if (auto err = mStorage->UpdateInstanceInfo(*instanceInfo); !err.IsNone()) { return AOS_ERROR_WRAP(err); @@ -1213,7 +1214,8 @@ Error Launcher::AppendInstancesWithModifiedParams( LOG_DBG() << "Instance parameters modified, adding to stop list" << Log::Field("instance", startInstance); - if (auto err = stopInstances.EmplaceBack(startInstance); !err.IsNone()) { + if (auto err = stopInstances.EmplaceBack(startInstance); + !err.IsNone()) { // NOSONAR cpp:S5912 - intentional InstanceIdent from InstanceInfo return AOS_ERROR_WRAP(err); } } @@ -1419,11 +1421,12 @@ RetWithError Launcher::AddInstanceData(const InstanceIn auto itInstance = &mInstances.Back(); - itInstance->mInfo = instanceInfo; - static_cast(itInstance->mStatus) = instanceInfo; - itInstance->mStatus.mVersion = instanceInfo.mVersion; - itInstance->mStatus.mRuntimeID = instanceInfo.mRuntimeID; - itInstance->mStatus.mState = InstanceStateEnum::eInactive; + itInstance->mInfo = instanceInfo; + static_cast(itInstance->mStatus) + = instanceInfo; // NOSONAR cpp:S5912 - intentional copy of InstanceIdent base only + itInstance->mStatus.mVersion = instanceInfo.mVersion; + itInstance->mStatus.mRuntimeID = instanceInfo.mRuntimeID; + itInstance->mStatus.mState = InstanceStateEnum::eInactive; if (auto err = mInstanceIDProvider->GetInstanceID(instanceInfo, itInstance->mInstanceID); !err.IsNone()) { mInstances.Erase(itInstance); diff --git a/src/core/sm/networkmanager/networkmanager.cpp b/src/core/sm/networkmanager/networkmanager.cpp index dd35e67d8..38e9a160d 100644 --- a/src/core/sm/networkmanager/networkmanager.cpp +++ b/src/core/sm/networkmanager/networkmanager.cpp @@ -1781,7 +1781,8 @@ Error NetworkManager::PrepareInstanceFirewallParams(const InstanceNetworkConfig& return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); } - if (auto err = params.mInput.PushBack({portConfig[0], portConfig.Size() > 1 ? portConfig[1] : String("tcp")}); + if (auto err = params.mInput.PushBack( + {portConfig[0], portConfig.Size() > 1 ? portConfig[1] : String("tcp")}); // NOSONAR cpp:S5912 !err.IsNone()) { return AOS_ERROR_WRAP(err); } From 2d4611fe40b8c5ddafdfbea3ae9a87b0d613fd11 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Fri, 24 Jul 2026 00:43:07 +0300 Subject: [PATCH 3/9] common: iam: fix S1669 errors Replace "module" with another name Signed-off-by: Mykola Kobets --- src/core/common/tests/utils/log.hpp | 4 +- src/core/common/tools/log.hpp | 24 ++++----- src/core/common/tools/tests/log.cpp | 4 +- src/core/iam/certhandler/certhandler.cpp | 69 ++++++++++++------------ src/core/iam/certhandler/certhandler.hpp | 6 +-- 5 files changed, 54 insertions(+), 53 deletions(-) diff --git a/src/core/common/tests/utils/log.hpp b/src/core/common/tests/utils/log.hpp index 418bc6eb0..961d529f7 100644 --- a/src/core/common/tests/utils/log.hpp +++ b/src/core/common/tests/utils/log.hpp @@ -17,12 +17,12 @@ namespace aos::tests::utils { inline void InitLog() { - Log::SetCallback([](const String& module, LogLevel level, const String& message) { + Log::SetCallback([](const String& moduleName, LogLevel level, const String& message) { static std::mutex sLogMutex; std::lock_guard lock(sLogMutex); static const char* const sLevelStrings[] = {"DBG", "INF", "WRN", "ERR"}; - std::cout << sLevelStrings[static_cast(level.GetValue())] << " | " << module.CStr() << " | " + std::cout << sLevelStrings[static_cast(level.GetValue())] << " | " << moduleName.CStr() << " | " << message.CStr() << std::endl; }); } diff --git a/src/core/common/tools/log.hpp b/src/core/common/tools/log.hpp index 6bcac94ea..36bfd05f9 100644 --- a/src/core/common/tools/log.hpp +++ b/src/core/common/tools/log.hpp @@ -17,36 +17,36 @@ * Helper macro to display debug log. */ #if AOS_CONFIG_LOG_LEVEL >= AOS_CONFIG_LOG_LEVEL_DEBUG -#define LOG_MODULE_DBG(module) aos::Log(module, aos::LogLevelEnum::eDebug) +#define LOG_MODULE_DBG(moduleName) aos::Log(moduleName, aos::LogLevelEnum::eDebug) #else -#define LOG_MODULE_DBG(module) true ? (void)0 : aos::LogVoid() & aos::Log(module, aos::LogLevelEnum::eDebug) +#define LOG_MODULE_DBG(moduleName) true ? (void)0 : aos::LogVoid() & aos::Log(moduleName, aos::LogLevelEnum::eDebug) #endif /** * Helper macro to display info log. */ #if AOS_CONFIG_LOG_LEVEL >= AOS_CONFIG_LOG_LEVEL_INFO -#define LOG_MODULE_INF(module) aos::Log(module, aos::LogLevelEnum::eInfo) +#define LOG_MODULE_INF(moduleName) aos::Log(moduleName, aos::LogLevelEnum::eInfo) #else -#define LOG_MODULE_INF(module) true ? (void)0 : aos::LogVoid() & Log(module, aos::LogLevelEnum::eInfo) +#define LOG_MODULE_INF(moduleName) true ? (void)0 : aos::LogVoid() & Log(moduleName, aos::LogLevelEnum::eInfo) #endif /** * Helper macro to display warning log. */ #if AOS_CONFIG_LOG_LEVEL >= AOS_CONFIG_LOG_LEVEL_WARNING -#define LOG_MODULE_WRN(module) aos::Log(module, aos::LogLevelEnum::eWarning) +#define LOG_MODULE_WRN(moduleName) aos::Log(moduleName, aos::LogLevelEnum::eWarning) #else -#define LOG_MODULE_WRN(module) true ? (void)0 : aos::LogVoid() & Log(module, aos::LogLevelEnum::eWarning) +#define LOG_MODULE_WRN(moduleName) true ? (void)0 : aos::LogVoid() & Log(moduleName, aos::LogLevelEnum::eWarning) #endif /** * Helper macro to display error log. */ #if AOS_CONFIG_LOG_LEVEL >= AOS_CONFIG_LOG_LEVEL_ERROR -#define LOG_MODULE_ERR(module) aos::Log(module, aos::LogLevelEnum::eError) +#define LOG_MODULE_ERR(moduleName) aos::Log(moduleName, aos::LogLevelEnum::eError) #else -#define LOG_MODULE_ERR(module) true ? (void)0 : aos::LogVoid() & Log(module, aos::LogLevelEnum::eError) +#define LOG_MODULE_ERR(moduleName) true ? (void)0 : aos::LogVoid() & Log(moduleName, aos::LogLevelEnum::eError) #endif namespace aos { @@ -72,7 +72,7 @@ using LogLevel = EnumStringer; /** * Log line callback. Should be set in application to display log using application logging mechanism. */ -using LogCallback = void (*)(const String& module, LogLevel level, const String& message); +using LogCallback = void (*)(const String& moduleName, LogLevel level, const String& message); /** * Implements log functionality. @@ -109,11 +109,11 @@ class Log : private NonCopyable { /** * Constructs a new Log object. * - * @param module log module type. + * @param moduleName log module name. * @param level log level type. */ - Log(const String& module, LogLevel level) - : mModule(module) + Log(const String& moduleName, LogLevel level) + : mModule(moduleName) , mLevel(level) {}; /** diff --git a/src/core/common/tools/tests/log.cpp b/src/core/common/tools/tests/log.cpp index a280cd581..b7048c9ac 100644 --- a/src/core/common/tools/tests/log.cpp +++ b/src/core/common/tools/tests/log.cpp @@ -15,11 +15,11 @@ using namespace aos; class TestLog : private NonCopyable { public: - static void LogCallback(const String& module, LogLevel level, const String& message) + static void LogCallback(const String& moduleName, LogLevel level, const String& message) { auto& instance = GetInstance(); - instance.mLogModule = module; + instance.mLogModule = moduleName; instance.mLogLevel = level; instance.mLogMessage = message; } diff --git a/src/core/iam/certhandler/certhandler.cpp b/src/core/iam/certhandler/certhandler.cpp index 3c41dda41..be803cced 100644 --- a/src/core/iam/certhandler/certhandler.cpp +++ b/src/core/iam/certhandler/certhandler.cpp @@ -21,13 +21,13 @@ CertHandler::CertHandler(AllocatorItf& allocator) srand(time(nullptr)); } -Error CertHandler::RegisterModule(CertModule& module) +Error CertHandler::RegisterModule(CertModule& certModule) { LockGuard lock {mMutex}; - LOG_INF() << "Register module: type=" << module.GetCertType(); + LOG_INF() << "Register module: type=" << certModule.GetCertType(); - return AOS_ERROR_WRAP(mModules.PushBack(&module)); + return AOS_ERROR_WRAP(mModules.PushBack(&certModule)); } Error CertHandler::GetCertTypes(Array>& certTypes) const @@ -36,8 +36,8 @@ Error CertHandler::GetCertTypes(Array>& certTypes) co LOG_DBG() << "Get all registered IAM certificate types"; - for (const auto module : mModules) { - auto err = certTypes.PushBack(module->GetCertType()); + for (const auto certModule : mModules) { + auto err = certTypes.PushBack(certModule->GetCertType()); if (!err.IsNone()) { return AOS_ERROR_WRAP(err.Value()); } @@ -52,12 +52,12 @@ Error CertHandler::SetOwner(const String& certType, const String& password) LOG_INF() << "Set owner" << Log::Field("type", certType); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - auto err = module->SetOwner(password); + auto err = certModule->SetOwner(password); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } @@ -71,12 +71,12 @@ Error CertHandler::Clear(const String& certType) LOG_INF() << "Clear" << Log::Field("type", certType); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - auto err = module->Clear(); + auto err = certModule->Clear(); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } @@ -91,17 +91,17 @@ Error CertHandler::CreateKey( LOG_INF() << "Create key" << Log::Field("type", certType) << Log::Field("subject", subjectCommonName); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - auto key = module->CreateKey(password); + auto key = certModule->CreateKey(password); if (!key.mError.IsNone()) { return key.mError; } - auto err = module->CreateCSR(subjectCommonName, *key.mValue, pemCSR); + auto err = certModule->CreateCSR(subjectCommonName, *key.mValue, pemCSR); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } @@ -115,17 +115,17 @@ Error CertHandler::ApplyCertificate(const String& certType, const String& pemCer LOG_INF() << "Apply cert" << Log::Field("type", certType); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - auto err = module->ApplyCert(pemCert, info); + auto err = certModule->ApplyCert(pemCert, info); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } - return UpdateCerts(*module); + return UpdateCerts(*certModule); } Error CertHandler::GetCert( @@ -142,12 +142,12 @@ Error CertHandler::GetCert( LOG_DBG() << "Get certificate" << Log::Field("type", certType) << Log::Field("serial", serialInHex); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - err = module->GetCertificate(issuer, serial, resCert); + err = certModule->GetCertificate(issuer, serial, resCert); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } @@ -161,8 +161,8 @@ Error CertHandler::SubscribeListener(const String& certType, iamclient::CertList LOG_DBG() << "Subscribe certificate listener" << Log::Field("type", certType); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } @@ -171,7 +171,7 @@ Error CertHandler::SubscribeListener(const String& certType, iamclient::CertList return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - auto err = module->GetCertificate(Array(), Array(), *certInfo); + auto err = certModule->GetCertificate(Array(), Array(), *certInfo); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } @@ -204,29 +204,29 @@ Error CertHandler::CreateSelfSignedCert(const String& certType, const String& pa LOG_INF() << "Create self signed cert" << Log::Field("type", certType); - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } - auto err = module->CreateSelfSignedCert(password); + auto err = certModule->CreateSelfSignedCert(password); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } - return UpdateCerts(*module); + return UpdateCerts(*certModule); } RetWithError CertHandler::GetModuleConfig(const String& certType) const { LockGuard lock {mMutex}; - auto* module = FindModule(certType); - if (module == nullptr) { + auto* certModule = FindModule(certType); + if (certModule == nullptr) { return {ModuleConfig(), AOS_ERROR_WRAP(ErrorEnum::eNotFound)}; } - return {module->GetModuleConfig(), ErrorEnum::eNone}; + return {certModule->GetModuleConfig(), ErrorEnum::eNone}; } CertHandler::~CertHandler() @@ -240,9 +240,10 @@ CertHandler::~CertHandler() CertModule* CertHandler::FindModule(const String& certType) const { - auto module = mModules.FindIf([certType](const CertModule* module) { return module->GetCertType() == certType; }); + auto certModule + = mModules.FindIf([certType](const CertModule* certModule) { return certModule->GetCertType() == certType; }); - return module != mModules.end() ? *module : nullptr; + return certModule != mModules.end() ? *certModule : nullptr; } Error CertHandler::UpdateCerts(CertModule& certModule) diff --git a/src/core/iam/certhandler/certhandler.hpp b/src/core/iam/certhandler/certhandler.hpp index a7a55d997..07b6e8712 100644 --- a/src/core/iam/certhandler/certhandler.hpp +++ b/src/core/iam/certhandler/certhandler.hpp @@ -36,10 +36,10 @@ class CertHandler : public CertHandlerItf, private NonCopyable { /** * Registers module. * - * @param module a reference to a module. + * @param certModule a reference to a module. * @returns Error. */ - Error RegisterModule(CertModule& module); + Error RegisterModule(CertModule& certModule); /** * Returns IAM cert types. @@ -143,7 +143,7 @@ class CertHandler : public CertHandlerItf, private NonCopyable { static constexpr auto cIAMCertSubsMaxCount = AOS_CONFIG_CERTHANDLER_CERT_SUBS_MAX_COUNT; CertModule* FindModule(const String& certType) const; - Error UpdateCerts(CertModule& module); + Error UpdateCerts(CertModule& certModule); mutable Mutex mMutex; StaticArray mModules; From 92b39db4d379f50a0646559216fe9f201693a3fe Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Fri, 24 Jul 2026 00:49:46 +0300 Subject: [PATCH 4/9] common: iam: fix S5020 errors Replace "srand"/"rand" with the facilities in Suppress: C++ not available in this codebase Signed-off-by: Mykola Kobets --- src/core/common/pkcs11/pkcs11.cpp | 27 ++++--------------- src/core/common/pkcs11/pkcs11.hpp | 3 ++- src/core/common/pkcs11/tests/pkcs11.cpp | 2 +- src/core/iam/certhandler/certhandler.cpp | 1 - .../certhandler/certmodules/pkcs11/pkcs11.cpp | 2 +- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/src/core/common/pkcs11/pkcs11.cpp b/src/core/common/pkcs11/pkcs11.cpp index 8e5b96a24..03d1ceb2b 100644 --- a/src/core/common/pkcs11/pkcs11.cpp +++ b/src/core/common/pkcs11/pkcs11.cpp @@ -5,9 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include - #if !AOS_CONFIG_PKCS11_USE_STATIC_LIB #include #endif @@ -235,31 +232,17 @@ Array ConvertToAttributeValue(T& val) * GenPIN **********************************************************************************************************************/ -Error GenPIN(String& pin) +Error GenPIN(crypto::RandomItf& random, String& pin) { const auto cPinLength = Min(cGenPINLen, pin.MaxSize()); - pin.Clear(); - - srand(::time(nullptr)); // use current time as seed for random generator - - StaticString chunk; - - while (pin.Size() < cPinLength) { - unsigned value = rand(); - auto byteArray = Array(reinterpret_cast(&value), sizeof(value)); - - auto err = chunk.ByteArrayToHex(byteArray); - if (!err.IsNone()) { - return err; - } + StaticArray buffer; - auto chunkSize = Min(cPinLength - pin.Size(), chunk.Size()); - - pin.Insert(pin.end(), chunk.begin(), chunk.begin() + chunkSize); + if (auto err = random.RandBuffer(buffer, cPinLength / 2); !err.IsNone()) { + return AOS_ERROR_WRAP(err); } - return ErrorEnum::eNone; + return AOS_ERROR_WRAP(pin.ByteArrayToHex(buffer)); } #if AOS_CONFIG_PKCS11_USE_STATIC_LIB diff --git a/src/core/common/pkcs11/pkcs11.hpp b/src/core/common/pkcs11/pkcs11.hpp index c30bad842..3040b1406 100644 --- a/src/core/common/pkcs11/pkcs11.hpp +++ b/src/core/common/pkcs11/pkcs11.hpp @@ -134,10 +134,11 @@ using SlotID = CK_SLOT_ID; /** * Generates random unique PIN. * + * @param random random generator. * @param[out] pin result pin. * @return Error. */ -Error GenPIN(String& pin); +Error GenPIN(crypto::RandomItf& random, String& pin); /** * Any version information related to PKCS11 library. diff --git a/src/core/common/pkcs11/tests/pkcs11.cpp b/src/core/common/pkcs11/tests/pkcs11.cpp index 031e1054e..9063425cc 100644 --- a/src/core/common/pkcs11/tests/pkcs11.cpp +++ b/src/core/common/pkcs11/tests/pkcs11.cpp @@ -314,7 +314,7 @@ TEST_F(PKCS11Test, GenPIN) for (int i = 0; i < cTestPINsNum; i++) { StaticString pin; - ASSERT_TRUE(GenPIN(pin).IsNone()); + ASSERT_TRUE(GenPIN(*mCryptoProvider, pin).IsNone()); pins.push_back(pin); } diff --git a/src/core/iam/certhandler/certhandler.cpp b/src/core/iam/certhandler/certhandler.cpp index be803cced..fe0ff3bd6 100644 --- a/src/core/iam/certhandler/certhandler.cpp +++ b/src/core/iam/certhandler/certhandler.cpp @@ -18,7 +18,6 @@ namespace aos::iam::certhandler { CertHandler::CertHandler(AllocatorItf& allocator) : mAllocator(&allocator) { - srand(time(nullptr)); } Error CertHandler::RegisterModule(CertModule& certModule) diff --git a/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp b/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp index ff4161606..3183fc985 100644 --- a/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp +++ b/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp @@ -102,7 +102,7 @@ Error PKCS11Module::SetOwner(const String& password) } else { err = GetUserPin(userPIN); if (!err.IsNone()) { - err = pkcs11::GenPIN(userPIN); + err = pkcs11::GenPIN(*mCryptoProvider, userPIN); if (!err.IsNone()) { return err; } From 555fe27c8b44719700d9eda3ee4420502aebce37 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Fri, 24 Jul 2026 01:04:47 +0300 Subject: [PATCH 5/9] cm: fix S5486 S5489 errors Suppress false-positive lock already acquired / lock order reversal Signed-off-by: Mykola Kobets --- src/core/cm/alerts/alerts.cpp | 2 +- src/core/cm/imagemanager/imagemanager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/cm/alerts/alerts.cpp b/src/core/cm/alerts/alerts.cpp index 2242134a4..67c9c3255 100644 --- a/src/core/cm/alerts/alerts.cpp +++ b/src/core/cm/alerts/alerts.cpp @@ -143,7 +143,7 @@ void Alerts::OnDisconnect() Error Alerts::SendAlert(const AlertVariant& alert) { - LockGuard lock {mMutex}; + LockGuard lock {mMutex}; // NOSONAR cpp:S5489 - false positive; single LockGuard, LIFO unlock on return LOG_DBG() << "Send alert" << Log::Field("alert", alert); diff --git a/src/core/cm/imagemanager/imagemanager.cpp b/src/core/cm/imagemanager/imagemanager.cpp index d4ffd999e..931255073 100644 --- a/src/core/cm/imagemanager/imagemanager.cpp +++ b/src/core/cm/imagemanager/imagemanager.cpp @@ -558,7 +558,7 @@ Error ImageManager::RemoveOutdatedItems() Error ImageManager::WaitForStop() { - UniqueLock lock(mMutex); + UniqueLock lock(mMutex); // NOSONAR cpp:S5486 - false positive; lock released before next WaitForStop() mCondVar.Wait(lock, cRetryTimeout, [this]() { return mCancel; }); From f3d2cc72b60cf39ddd034710eb3644dc01406162 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Wed, 5 Aug 2026 14:08:40 +0300 Subject: [PATCH 6/9] cpp:M23_007: fix cpp:M23_007 sonar issue Use the value returned from the function Signed-off-by: Mykola Kobets --- src/core/cm/alerts/alerts.cpp | 6 +- src/core/cm/imagemanager/imagemanager.cpp | 40 ++-- src/core/cm/launcher/balancer.cpp | 17 +- src/core/cm/launcher/idpool.hpp | 2 +- src/core/cm/launcher/instance.cpp | 2 +- src/core/cm/launcher/instancemanager.cpp | 17 +- src/core/cm/launcher/launcher.cpp | 30 +-- src/core/cm/launcher/node.cpp | 8 +- src/core/cm/launcher/nodemanager.cpp | 12 +- .../cm/launcher/overrideenvvarsprocessor.cpp | 4 +- src/core/cm/launcher/storagestate.cpp | 4 +- src/core/cm/monitoring/monitoring.cpp | 26 +-- .../cm/nodeinfoprovider/nodeinfoprovider.cpp | 12 +- src/core/cm/storagestate/storagestate.cpp | 8 +- .../cm/updatemanager/desiredstatushandler.cpp | 12 +- .../cm/updatemanager/unitstatushandler.cpp | 18 +- src/core/common/crypto/asn1.cpp | 6 +- src/core/common/crypto/certloader.cpp | 2 +- src/core/common/crypto/cryptohelper.cpp | 10 +- .../common/crypto/mbedtls/cryptoprovider.cpp | 104 +++++------ .../common/crypto/mbedtls/driverwrapper.cpp | 8 +- .../common/crypto/openssl/cryptoprovider.cpp | 50 ++--- .../common/crypto/openssl/opensslprovider.cpp | 14 +- src/core/common/monitoring/monitoring.cpp | 8 +- src/core/common/ocispec/itf/runtimespec.hpp | 84 ++++----- src/core/common/pkcs11/pkcs11.cpp | 176 +++++++++--------- src/core/common/pkcs11/privatekey.cpp | 4 +- src/core/common/tools/array.hpp | 8 +- src/core/common/tools/buffer.hpp | 2 +- src/core/common/tools/error.hpp | 2 +- src/core/common/tools/fs.cpp | 30 +-- src/core/common/tools/fs.hpp | 8 +- src/core/common/tools/function.hpp | 8 +- src/core/common/tools/identifierpool.hpp | 2 +- src/core/common/tools/list.hpp | 4 +- src/core/common/tools/log.hpp | 4 +- src/core/common/tools/memory.hpp | 14 +- src/core/common/tools/queue.hpp | 2 +- src/core/common/tools/string.hpp | 28 +-- src/core/common/tools/thread.hpp | 26 +-- src/core/common/tools/time.cpp | 38 ++-- src/core/common/tools/timer.cpp | 6 +- src/core/common/tools/timer.hpp | 4 +- src/core/common/tools/uuid.cpp | 14 +- src/core/common/types/common.hpp | 2 +- src/core/iam/certhandler/certmodule.cpp | 12 +- .../certhandler/certmodules/pkcs11/pkcs11.cpp | 40 ++-- .../fileidentifier/fileidentifier.cpp | 6 +- src/core/iam/permhandler/permhandler.cpp | 2 +- src/core/sm/imagemanager/imagemanager.cpp | 20 +- src/core/sm/launcher/launcher.cpp | 49 ++--- src/core/sm/networkmanager/networkmanager.cpp | 62 +++--- 52 files changed, 540 insertions(+), 537 deletions(-) diff --git a/src/core/cm/alerts/alerts.cpp b/src/core/cm/alerts/alerts.cpp index 67c9c3255..b5b48e677 100644 --- a/src/core/cm/alerts/alerts.cpp +++ b/src/core/cm/alerts/alerts.cpp @@ -286,14 +286,14 @@ UniquePtr Alerts::CreatePackage() const auto count = Min(cAlertItemsCount, mAlerts.Size()); - package->mItems.Assign(Array(mAlerts.begin(), count)); + (void)package->mItems.Assign(Array(mAlerts.begin(), count)); return package; } void Alerts::ShrinkCache(size_t count) { - mAlerts.Erase(mAlerts.begin(), mAlerts.begin() + Min(count, mAlerts.Size())); + (void)mAlerts.Erase(mAlerts.begin(), mAlerts.begin() + Min(count, mAlerts.Size())); } void Alerts::NotifyListeners(const AlertVariant& alert) @@ -306,7 +306,7 @@ void Alerts::NotifyListeners(const AlertVariant& alert) continue; } - receiver->OnAlertReceived(alert); + (void)receiver->OnAlertReceived(alert); } } } diff --git a/src/core/cm/imagemanager/imagemanager.cpp b/src/core/cm/imagemanager/imagemanager.cpp index 931255073..6b568f6c2 100644 --- a/src/core/cm/imagemanager/imagemanager.cpp +++ b/src/core/cm/imagemanager/imagemanager.cpp @@ -281,7 +281,7 @@ Error ImageManager::Cancel() LOG_DBG() << "Cancel image manager downloading"; mCancel = true; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); if (!mCurrentDownloadDigest.IsEmpty()) { if (auto err = mDownloader->Cancel(mCurrentDownloadDigest); !err.IsNone()) { @@ -560,7 +560,7 @@ Error ImageManager::WaitForStop() { UniqueLock lock(mMutex); // NOSONAR cpp:S5486 - false positive; lock released before next WaitForStop() - mCondVar.Wait(lock, cRetryTimeout, [this]() { return mCancel; }); + (void)mCondVar.Wait(lock, cRetryTimeout, [this]() { return mCancel; }); if (mCancel) { return ErrorEnum::eCanceled; @@ -607,7 +607,7 @@ Error ImageManager::AllocateSpaceForPartialDownloads() return AOS_ERROR_WRAP(err); } - space->Accept(); + (void)space->Accept(); LOG_DBG() << "Allocated space for partial download" << Log::Field("path", filePath) << Log::Field("size", fileSize); @@ -790,7 +790,7 @@ Error ImageManager::ProcessDownloadRequest(const Array& itemsInf !removeErr.IsNone()) { LOG_ERR() << "Failed to remove old version" << Log::Field(removeErr); } else { - storedItems.Erase(oldVersionIt); + (void)storedItems.Erase(oldVersionIt); } } @@ -946,13 +946,13 @@ Error ImageManager::LoadIndex(const String& digest, const String& downloadPath, << Log::Field(removeErr); } - space->Release(); + (void)space->Release(); return; } if (space) { - space->Accept(); + (void)space->Accept(); } }); @@ -994,13 +994,13 @@ Error ImageManager::LoadManifest(const String& digest, const ArrayRelease(); + (void)space->Release(); return; } if (space) { - space->Accept(); + (void)space->Accept(); } }); @@ -1042,12 +1042,12 @@ Error ImageManager::LoadBlob(const oci::ContentDescriptor& descriptor, << Log::Field(removeErr); } - space->Release(); + (void)space->Release(); return; } if (space) { - space->Accept(); + (void)space->Accept(); } }); @@ -1099,7 +1099,7 @@ Error ImageManager::EnsureBlob(const String& digest, const String& downloadPath, if (auto err = mFileInfoProvider->GetFileInfo(downloadPath, downloadFileInfo, crypto::HashEnum::eSHA3_256); !err.IsNone()) { - downloadingSpace->Release(); + (void)downloadingSpace->Release(); return AOS_ERROR_WRAP(err); } @@ -1110,7 +1110,7 @@ Error ImageManager::EnsureBlob(const String& digest, const String& downloadPath, LOG_WRN() << "Download checksum mismatch, retrying download" << Log::Field("digest", digest); - downloadingSpace->Release(); + (void)downloadingSpace->Release(); if (auto removeErr = fs::RemoveAll(downloadPath); !removeErr.IsNone()) { LOG_ERR() << "Failed to remove download path" << Log::Field("path", downloadPath) << Log::Field(removeErr); @@ -1119,7 +1119,7 @@ Error ImageManager::EnsureBlob(const String& digest, const String& downloadPath, auto err = DecryptAndValidateBlob(downloadPath, installPath, *blobInfo, certificates, certificateChains, space); - downloadingSpace->Release(); + (void)downloadingSpace->Release(); if (auto removeErr = fs::RemoveAll(downloadPath); !removeErr.IsNone()) { LOG_ERR() << "Failed to remove download path" << Log::Field("path", downloadPath) << Log::Field(removeErr); @@ -1283,12 +1283,12 @@ Error ImageManager::PerformDownload(const BlobInfo& blobInfo, const String& down LOG_WRN() << "Failed to get partial download size" << Log::Field("path", downloadPath) << Log::Field(retrySizeErr); - downloadingSpace->Release(); + (void)downloadingSpace->Release(); return err; } - downloadingSpace->Release(); + (void)downloadingSpace->Release(); Error allocationErr; @@ -1298,7 +1298,7 @@ Error ImageManager::PerformDownload(const BlobInfo& blobInfo, const String& down return AOS_ERROR_WRAP(allocationErr); } - downloadingSpace->Accept(); + (void)downloadingSpace->Accept(); return err; } @@ -1418,7 +1418,7 @@ bool ImageManager::StartAction() { UniqueLock lock {mMutex}; - mCondVar.Wait(lock, [this]() { return !mInProgress || mCancel; }); + (void)mCondVar.Wait(lock, [this]() { return !mInProgress || mCancel; }); const bool cancelledWhileRunning = mCancel && mInProgress; @@ -1438,7 +1438,7 @@ void ImageManager::StopAction() LockGuard lock {mMutex}; mInProgress = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } void ImageManager::NotifyItemsStatusesChanged(const Array& statuses) @@ -1461,7 +1461,7 @@ void ImageManager::NotifyItemStatusChanged( { StaticArray status; - status.Resize(1); + (void)status.Resize(1); status[0].mItemID = itemID; status[0].mType = type; @@ -1683,7 +1683,7 @@ RetWithError ImageManager::CleanupOrphanedBlobs() auto hash = blobIterator->mPath; StaticString blobDigest; - blobDigest.Append(algorithm).Append(":").Append(hash); + (void)blobDigest.Append(algorithm).Append(":").Append(hash); if (!IsBlobUsedByItems(blobDigest, *storedItems)) { auto filePath = fs::JoinPath(algorithmDir, hash); diff --git a/src/core/cm/launcher/balancer.cpp b/src/core/cm/launcher/balancer.cpp index 1e5ea27db..d0b4fde16 100644 --- a/src/core/cm/launcher/balancer.cpp +++ b/src/core/cm/launcher/balancer.cpp @@ -96,7 +96,7 @@ Error Balancer::PerformNodeBalancing(Array>& instances) if (!imageIndex) { LOG_ERR() << "Can't allocate image index" << Log::Field("instance", id) << Log::Field(ErrorEnum::eNoMemory); - mInstanceManager->ScheduleInstance(instance, AOS_ERROR_WRAP(ErrorEnum::eNoMemory)); + (void)mInstanceManager->ScheduleInstance(instance, AOS_ERROR_WRAP(ErrorEnum::eNoMemory)); continue; } @@ -104,7 +104,7 @@ Error Balancer::PerformNodeBalancing(Array>& instances) if (auto err = mImageInfoProvider->GetImageIndex(id.mItemID, info.mVersion, *imageIndex); !err.IsNone()) { LOG_ERR() << "Can't get images" << Log::Field("instance", id) << Log::Field(err); - mInstanceManager->ScheduleInstance(instance, AOS_ERROR_WRAP(err)); + (void)mInstanceManager->ScheduleInstance(instance, AOS_ERROR_WRAP(err)); continue; } @@ -125,7 +125,7 @@ Error Balancer::PerformNodeBalancing(Array>& instances) if (!scheduleErr.IsNone()) { LOG_ERR() << "Can't schedule instance" << Log::Field(scheduleErr); - mInstanceManager->ScheduleInstance(instance, scheduleErr); + (void)mInstanceManager->ScheduleInstance(instance, scheduleErr); } } @@ -192,17 +192,18 @@ Error Balancer::SelectNodes(Instance& instance, Array& nodes) void Balancer::FilterNodesByID(Instance& instance, Array& nodes) { - nodes.RemoveIf([&instance](const Node* node) { return !instance.IsNodeIDOk(node->GetInfo().mNodeID); }); + (void)nodes.RemoveIf([&instance](const Node* node) { return !instance.IsNodeIDOk(node->GetInfo().mNodeID); }); } void Balancer::FilterNodesByLabels(Instance& instance, Array& nodes) { - nodes.RemoveIf([&instance](const Node* node) { return !instance.AreNodeLabelsOk(node->GetConfig().mLabels); }); + (void)nodes.RemoveIf( + [&instance](const Node* node) { return !instance.AreNodeLabelsOk(node->GetConfig().mLabels); }); } void Balancer::FilterNodesByResources(Instance& instance, Array& nodes) { - nodes.RemoveIf([&instance](const Node* node) { return !instance.AreNodeResourcesOk(*node); }); + (void)nodes.RemoveIf([&instance](const Node* node) { return !instance.AreNodeResourcesOk(*node); }); } RetWithError> Balancer::SelectRuntime(Instance& instance, const Array& nodes) @@ -296,7 +297,7 @@ Error Balancer::CreateRuntimes(const Array& nodes, NodeRuntimes& runtimes // Remove node with no runtimes if (nodeRuntimes.IsEmpty()) { - runtimes.Remove(node); + (void)runtimes.Remove(node); } } @@ -392,7 +393,7 @@ void Balancer::FilterTopPriorityNodes(NodeRuntimes& nodes) auto topPriority = topPriorityNode->mFirst->GetConfig().mPriority; - nodes.RemoveIf( + (void)nodes.RemoveIf( [topPriority](const NodeRuntimes& item) { return item.mFirst->GetConfig().mPriority != topPriority; }); } diff --git a/src/core/cm/launcher/idpool.hpp b/src/core/cm/launcher/idpool.hpp index d2cb5868a..bbf4abf57 100644 --- a/src/core/cm/launcher/idpool.hpp +++ b/src/core/cm/launcher/idpool.hpp @@ -106,7 +106,7 @@ class IDPool { ItemEntry entry {assigned, 1}; if (auto err = mItems.Emplace(key, entry); !err.IsNone()) { - mPool.Release(assigned); + (void)mPool.Release(assigned); return {0, AOS_ERROR_WRAP(err)}; } diff --git a/src/core/cm/launcher/instance.cpp b/src/core/cm/launcher/instance.cpp index fc4106304..ae71e84f5 100644 --- a/src/core/cm/launcher/instance.cpp +++ b/src/core/cm/launcher/instance.cpp @@ -60,7 +60,7 @@ Error Instance::LoadConfigs(const oci::IndexContentDescriptor& imageDescriptor) return AOS_ERROR_WRAP(Error(err, "get image config failed")); } - releaseConfigs.Release(); + (void)releaseConfigs.Release(); mInfo.mManifestDigest = imageDescriptor.mDigest; diff --git a/src/core/cm/launcher/instancemanager.cpp b/src/core/cm/launcher/instancemanager.cpp index b042b89f8..494e7c50b 100644 --- a/src/core/cm/launcher/instancemanager.cpp +++ b/src/core/cm/launcher/instancemanager.cpp @@ -95,7 +95,7 @@ Error InstanceManager::Start() return AOS_ERROR_WRAP(err); } - auto onInitTimerExpired = [this](void*) { SetExpiredStatus(); }; + auto onInitTimerExpired = [this](void*) { (void)SetExpiredStatus(); }; if (auto err = mInitTimer.Start(mConfig.mNodesConnectionTimeout, onInitTimerExpired); !err.IsNone()) { return AOS_ERROR_WRAP(err); @@ -296,12 +296,12 @@ Error InstanceManager::SubmitScheduledInstances() LOG_ERR() << "Cache instance failed" << Log::Field("instanceID", id) << AOS_ERROR_WRAP(err); } - mCachedInstances.PushBack(instance); + (void)mCachedInstances.PushBack(instance); } } mActiveInstances = mScheduledInstances; - mCachedInstances.RemoveIf([this](const SharedPtr& instance) { + (void)mCachedInstances.RemoveIf([this](const SharedPtr& instance) { return mActiveInstances.ContainsIf( [instance](const SharedPtr& item) { return instance.Get() == item.Get(); }); }); @@ -321,10 +321,10 @@ void InstanceManager::DisableInstance(SharedPtr& instance) LOG_ERR() << "Disable instance failed" << Log::Field("instanceID", id) << AOS_ERROR_WRAP(err); } - mCachedInstances.PushBack(instance); + (void)mCachedInstances.PushBack(instance); - mScheduledInstances.Remove(instance); - mActiveInstances.Remove(instance); + (void)mScheduledInstances.Remove(instance); + (void)mActiveInstances.Remove(instance); ClearCacheIfLimitReached(); } @@ -621,8 +621,9 @@ bool InstanceManager::IsScheduled(const InstanceIdent& id, const String& version Error InstanceManager::UpdateRunningInstances(const String& nodeID, const Array& statuses) { - mRunningInstances.RemoveIf([&nodeID](const InstanceStatus& status) { return status.mNodeID == nodeID; }); - mPreinstalledComponents.RemoveIf([&nodeID](const InstanceStatus& status) { return status.mNodeID == nodeID; }); + (void)mRunningInstances.RemoveIf([&nodeID](const InstanceStatus& status) { return status.mNodeID == nodeID; }); + (void)mPreinstalledComponents.RemoveIf( + [&nodeID](const InstanceStatus& status) { return status.mNodeID == nodeID; }); Error firstErr = ErrorEnum::eNone; diff --git a/src/core/cm/launcher/launcher.cpp b/src/core/cm/launcher/launcher.cpp index 98f4c9f0b..a5a59335c 100644 --- a/src/core/cm/launcher/launcher.cpp +++ b/src/core/cm/launcher/launcher.cpp @@ -104,7 +104,7 @@ Error Launcher::Start() StaticArray alertTags; - alertTags.PushBack(AlertTagEnum::eSystemQuotaAlert); + (void)alertTags.PushBack(AlertTagEnum::eSystemQuotaAlert); if (auto err = mAlertsProvider->SubscribeListener(alertTags, *this); !err.IsNone()) { return err; @@ -170,8 +170,8 @@ Error Launcher::Stop() mNewSubjects.Reset(); mInstanceStatuses.Clear(); - mProcessUpdatesCondVar.NotifyAll(); - mAllNodesConnectedCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); + (void)mAllNodesConnectedCondVar.NotifyAll(); // Unsubscribe from providers. if (auto err = mIdentProvider->UnsubscribeListener(*this); !err.IsNone()) { @@ -199,7 +199,7 @@ Error Launcher::Stop() return AOS_ERROR_WRAP(err); } - updateLock.Unlock(); + (void)updateLock.Unlock(); if (auto err = mWorkerThread.Join(); !err.IsNone()) { return AOS_ERROR_WRAP(err); @@ -217,7 +217,7 @@ Error Launcher::RunInstances(const Array& requests, ArraymDisableProcessUpdates = false; - self->mProcessUpdatesCondVar.NotifyAll(); + (void)self->mProcessUpdatesCondVar.NotifyAll(); }); LOG_INF() << "Run instances" << Log::Field("numRequests", requests.Size()); @@ -429,7 +429,7 @@ void Launcher::ProcessUpdate() { UniqueLock updateLock {mUpdateMutex}; - mProcessUpdatesCondVar.Wait(updateLock, [this]() { + (void)mProcessUpdatesCondVar.Wait(updateLock, [this]() { return (!mUpdatedNodes.IsEmpty() || mNewSubjects.HasValue() || mAlertReceived || !mIsRunning || mIsNodeInfoChanged || mIsOverrideEnvVarsChanged || mForceRebalance) && !mDisableProcessUpdates; @@ -520,7 +520,7 @@ void Launcher::WaitAllNodesConnected(UniqueLock& lock) return !mNodeManager.GetNodes().ContainsIf(notConnected) || !mIsRunning; }; - mAllNodesConnectedCondVar.Wait(lock, allNodesConnected); + (void)mAllNodesConnectedCondVar.Wait(lock, allNodesConnected); } void Launcher::ProcessNotScheduledInstances() @@ -529,7 +529,7 @@ void Launcher::ProcessNotScheduledInstances() [](const SharedPtr& instance) { return instance->GetInfo().mNodeID.IsEmpty(); }); mForceRebalance = hasNotScheduledInstance; - mProcessUpdatesCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); } Error Launcher::OnInstanceStatusReceived(const InstanceStatus& status) @@ -595,10 +595,10 @@ Error Launcher::OnNodeInstancesStatusesReceived(const String& nodeID, const Arra return AOS_ERROR_WRAP(err); } - mProcessUpdatesCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); // Node is not connected untill it receives instance statuses. // So, we need to trigger notification for waiting nodes after we handled statuses. - mAllNodesConnectedCondVar.NotifyAll(); + (void)mAllNodesConnectedCondVar.NotifyAll(); return ErrorEnum::eNone; } @@ -612,8 +612,8 @@ void Launcher::OnNodeInfoChanged(const UnitNodeInfo& info) if (mNodeManager.UpdateNodeInfo(info)) { mIsNodeInfoChanged = true; - mProcessUpdatesCondVar.NotifyAll(); - mAllNodesConnectedCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); + (void)mAllNodesConnectedCondVar.NotifyAll(); } } @@ -628,7 +628,7 @@ Error Launcher::OnAlertReceived(const AlertVariant& alert) } mAlertReceived = true; - mProcessUpdatesCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); return ErrorEnum::eNone; } @@ -641,7 +641,7 @@ void Launcher::SubjectsChanged(const Array>& subjects) mNewSubjects.EmplaceValue(subjects); - mProcessUpdatesCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); } void Launcher::OnOverrideEnvVarsChanged() @@ -650,7 +650,7 @@ void Launcher::OnOverrideEnvVarsChanged() mIsOverrideEnvVarsChanged = true; - mProcessUpdatesCondVar.NotifyAll(); + (void)mProcessUpdatesCondVar.NotifyAll(); } } // namespace aos::cm::launcher diff --git a/src/core/cm/launcher/node.cpp b/src/core/cm/launcher/node.cpp index c4be15573..232803ade 100644 --- a/src/core/cm/launcher/node.cpp +++ b/src/core/cm/launcher/node.cpp @@ -257,10 +257,10 @@ Error Node::ReserveResources(const InstanceIdent& instanceIdent, const String& r availableResource->mSharedCount--; } - restoreResources.Release(); - restoreMaxNumInstances.Release(); - restoreCPU.Release(); - restoreRAM.Release(); + (void)restoreResources.Release(); + (void)restoreMaxNumInstances.Release(); + (void)restoreCPU.Release(); + (void)restoreRAM.Release(); return ErrorEnum::eNone; } diff --git a/src/core/cm/launcher/nodemanager.cpp b/src/core/cm/launcher/nodemanager.cpp index a6dfefe07..6e5d03bc7 100644 --- a/src/core/cm/launcher/nodemanager.cpp +++ b/src/core/cm/launcher/nodemanager.cpp @@ -64,10 +64,10 @@ Error NodeManager::Start() } // Add online provisioned node - mNodes.EmplaceBack(); + (void)mNodes.EmplaceBack(); mNodes.Back().Init(*mAllocator, nodeInfo->mNodeID, *mNodeConfigProvider, *mRunner); - mNodes.Back().UpdateInfo(*nodeInfo); + (void)mNodes.Back().UpdateInfo(*nodeInfo); } return ErrorEnum::eNone; @@ -79,7 +79,7 @@ Error NodeManager::Stop() // Unlock waiting run requests. mNodesExpectedToSendStatus.Clear(); - mStatusUpdateCondVar.NotifyAll(); + (void)mStatusUpdateCondVar.NotifyAll(); return ErrorEnum::eNone; } @@ -174,7 +174,7 @@ Error NodeManager::NotifyNodeStatusReceived(const String& nodeID) if (node->IsConnected() && node->GetInfo().mState == NodeStateEnum::eProvisioned) { if (mNodesExpectedToSendStatus.Remove(nodeID) != 0) { - mStatusUpdateCondVar.NotifyAll(); + (void)mStatusUpdateCondVar.NotifyAll(); } } @@ -334,7 +334,7 @@ bool NodeManager::UpdateNodeInfo(const UnitNodeInfo& info) // Don't wait for instanse status for unprovisioned nodes(offline/online doesnt matter) if (info.mState != NodeStateEnum::eProvisioned) { if (mNodesExpectedToSendStatus.Remove(info.mNodeID) != 0) { - mStatusUpdateCondVar.NotifyAll(); + (void)mStatusUpdateCondVar.NotifyAll(); } } @@ -353,7 +353,7 @@ bool NodeManager::UpdateNodeInfo(const UnitNodeInfo& info) } mNodes.Back().Init(*mAllocator, info.mNodeID, *mNodeConfigProvider, *mRunner); - mNodes.Back().UpdateInfo(info); + (void)mNodes.Back().UpdateInfo(info); return true; } diff --git a/src/core/cm/launcher/overrideenvvarsprocessor.cpp b/src/core/cm/launcher/overrideenvvarsprocessor.cpp index 49405428e..6ce21b658 100644 --- a/src/core/cm/launcher/overrideenvvarsprocessor.cpp +++ b/src/core/cm/launcher/overrideenvvarsprocessor.cpp @@ -174,12 +174,12 @@ bool OverrideEnvVarsProcessor::HasExpiredVariables(const OverrideEnvVarsRequest& void OverrideEnvVarsProcessor::RemoveExpiredVariables(OverrideEnvVarsRequest& envVars, const Time& now) { for (auto& item : envVars.mItems) { - item.mVariables.RemoveIf([&now](const EnvVarInfo& envVarInfo) { + (void)item.mVariables.RemoveIf([&now](const EnvVarInfo& envVarInfo) { return envVarInfo.mTTL.HasValue() && envVarInfo.mTTL.GetValue() < now; }); } - envVars.mItems.RemoveIf([](const EnvVarsInstanceInfo& item) { return item.mVariables.IsEmpty(); }); + (void)envVars.mItems.RemoveIf([](const EnvVarsInstanceInfo& item) { return item.mVariables.IsEmpty(); }); } } // namespace aos::cm::launcher diff --git a/src/core/cm/launcher/storagestate.cpp b/src/core/cm/launcher/storagestate.cpp index f19ef0037..4c2daf2f0 100644 --- a/src/core/cm/launcher/storagestate.cpp +++ b/src/core/cm/launcher/storagestate.cpp @@ -103,8 +103,8 @@ Error StorageState::SetupStateStorage(const InstanceIdent& instanceIdent, const return AOS_ERROR_WRAP(err); } - restoreStorageSize.Release(); - restoreStateSize.Release(); + (void)restoreStorageSize.Release(); + (void)restoreStateSize.Release(); LOG_DBG() << "Available storage and state" << Log::Field("state", *mAvailableState) << Log::Field("storage", *mAvailableStorage); diff --git a/src/core/cm/monitoring/monitoring.cpp b/src/core/cm/monitoring/monitoring.cpp index f6be59c77..41300ae01 100644 --- a/src/core/cm/monitoring/monitoring.cpp +++ b/src/core/cm/monitoring/monitoring.cpp @@ -43,9 +43,9 @@ Error Monitoring::Start() auto unsubscribeOnError = DeferRelease(&err, [this](const Error* err) { if (!err->IsNone()) { - mInstanceStatusProvider->UnsubscribeListener(*this); - mNodeInfoProvider->UnsubscribeListener(*this); - mCloudConnection->UnsubscribeListener(*this); + (void)mInstanceStatusProvider->UnsubscribeListener(*this); + (void)mNodeInfoProvider->UnsubscribeListener(*this); + (void)mCloudConnection->UnsubscribeListener(*this); } }); @@ -91,9 +91,9 @@ Error Monitoring::Stop() return ErrorEnum::eWrongState; } - mInstanceStatusProvider->UnsubscribeListener(*this); - mNodeInfoProvider->UnsubscribeListener(*this); - mCloudConnection->UnsubscribeListener(*this); + (void)mInstanceStatusProvider->UnsubscribeListener(*this); + (void)mNodeInfoProvider->UnsubscribeListener(*this); + (void)mCloudConnection->UnsubscribeListener(*this); mIsRunning = false; @@ -135,7 +135,7 @@ void Monitoring::OnNodeInfoChanged(const UnitNodeInfo& info) } if (it->mStates.IsEmpty()) { - it->mStates.PushBack(stateInfo); + (void)it->mStates.PushBack(stateInfo); return; } @@ -145,10 +145,10 @@ void Monitoring::OnNodeInfoChanged(const UnitNodeInfo& info) } if (it->mStates.IsFull()) { - it->mStates.Erase(it->mStates.begin()); + (void)it->mStates.Erase(it->mStates.begin()); } - it->mStates.PushBack(stateInfo); + (void)it->mStates.PushBack(stateInfo); } void Monitoring::OnInstancesStatusesChanged(const Array& statuses) @@ -182,10 +182,10 @@ void Monitoring::OnInstancesStatusesChanged(const Array& statuse } if (it->mStates.IsFull()) { - it->mStates.Erase(it->mStates.begin()); + (void)it->mStates.Erase(it->mStates.begin()); } - it->mStates.PushBack({now, status.mState}); + (void)it->mStates.PushBack({now, status.mState}); } } @@ -225,7 +225,7 @@ Error Monitoring::FillNodeMonitoring(const String& nodeID, const aos::monitoring } if (it->mItems.IsFull()) { - it->mItems.Erase(it->mItems.begin()); + (void)it->mItems.Erase(it->mItems.begin()); } return it->mItems.EmplaceBack(nodeMonitoring.mMonitoringData); @@ -250,7 +250,7 @@ Error Monitoring::FillInstanceMonitoring( } if (it->mItems.IsFull()) { - it->mItems.Erase(it->mItems.begin()); + (void)it->mItems.Erase(it->mItems.begin()); } return it->mItems.EmplaceBack(instanceMonitoring.mMonitoringData); diff --git a/src/core/cm/nodeinfoprovider/nodeinfoprovider.cpp b/src/core/cm/nodeinfoprovider/nodeinfoprovider.cpp index 4acbda10f..bb9a5b839 100644 --- a/src/core/cm/nodeinfoprovider/nodeinfoprovider.cpp +++ b/src/core/cm/nodeinfoprovider/nodeinfoprovider.cpp @@ -97,10 +97,10 @@ Error NodeInfoProvider::Stop() } mRunning = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } - mThread.Join(); + (void)mThread.Join(); return ErrorEnum::eNone; } @@ -274,7 +274,7 @@ void NodeInfoProvider::NotifyListeners(const NodeInfoCache& info) listener->OnNodeInfoChanged(*unitNodeInfo); } - mNotificationQueue.RemoveIf([&info](const auto& nodeID) { return nodeID == info.GetNodeID(); }); + (void)mNotificationQueue.RemoveIf([&info](const auto& nodeID) { return nodeID == info.GetNodeID(); }); } Error NodeInfoProvider::SendNotification(const NodeInfoCache& info, bool sendImmediately) @@ -302,7 +302,7 @@ Error NodeInfoProvider::ScheduleNotification(const String& nodeID) LOG_DBG() << "Scheduled notification for node" << Log::Field("nodeID", nodeID); - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); return ErrorEnum::eNone; } @@ -315,7 +315,7 @@ void NodeInfoProvider::Run() { UniqueLock lock {mMutex}; - mCondVar.Wait(lock, [this]() { return !mRunning || !mNotificationQueue.IsEmpty(); }); + (void)mCondVar.Wait(lock, [this]() { return !mRunning || !mNotificationQueue.IsEmpty(); }); if (!mRunning) { return; @@ -335,7 +335,7 @@ void NodeInfoProvider::Run() NotifyListeners(nodeInfo); } - mCondVar.Wait(lock, mConfig.mSMConnectionTimeout, [this]() { return !mRunning; }); + (void)mCondVar.Wait(lock, mConfig.mSMConnectionTimeout, [this]() { return !mRunning; }); } } } diff --git a/src/core/cm/storagestate/storagestate.cpp b/src/core/cm/storagestate/storagestate.cpp index f09670780..ace4502c0 100644 --- a/src/core/cm/storagestate/storagestate.cpp +++ b/src/core/cm/storagestate/storagestate.cpp @@ -33,7 +33,7 @@ Error ToRelativePath(const String& base, const String& full, String& result) return AOS_ERROR_WRAP(err); } - result.LeftTrim("/"); + (void)result.LeftTrim("/"); return ErrorEnum::eNone; } @@ -559,7 +559,7 @@ Error StorageState::StopStateWatching(const InstanceIdent& instanceIdent) auto err = mFSWatcher->Unsubscribe(it->mFilePath.CStr(), *this); - mStates.Erase(it); + (void)mStates.Erase(it); return err; } @@ -670,7 +670,7 @@ StaticString StorageState::GetStateDir(const InstanceIdent& instan { StaticString instanceStr; - instanceStr.Convert(instanceIdent.mInstance); + (void)instanceStr.Convert(instanceIdent.mInstance); auto path = fs::JoinPath(mConfig.mStateDir, instanceIdent.mItemID, instanceIdent.mSubjectID, instanceStr); @@ -688,7 +688,7 @@ StaticString StorageState::GetStoragePath(const InstanceIdent& ins { StaticString instanceStr; - instanceStr.Convert(instanceIdent.mInstance); + (void)instanceStr.Convert(instanceIdent.mInstance); return fs::JoinPath(mConfig.mStorageDir, instanceIdent.mItemID, instanceIdent.mSubjectID, instanceStr); } diff --git a/src/core/cm/updatemanager/desiredstatushandler.cpp b/src/core/cm/updatemanager/desiredstatushandler.cpp index de5feab69..2cf9a52a7 100644 --- a/src/core/cm/updatemanager/desiredstatushandler.cpp +++ b/src/core/cm/updatemanager/desiredstatushandler.cpp @@ -92,7 +92,7 @@ Error DesiredStatusHandler::Stop() } mIsRunning = false; - mCondVar.NotifyOne(); + (void)mCondVar.NotifyOne(); } if (auto threadErr = mThread.Join(); !threadErr.IsNone() && err.IsNone()) { @@ -152,13 +152,13 @@ void DesiredStatusHandler::OnInstancesStatusesChanged(const Array*stateAction)(); - lock.Lock(); + (void)lock.Lock(); if (mCancelCurrentUpdate) { break; @@ -275,7 +275,7 @@ void DesiredStatusHandler::Run() continue; } - mUnitStatusHandler->SendFullUnitStatus(); + (void)mUnitStatusHandler->SendFullUnitStatus(); if (mHasPendingDesiredStatus) { LOG_DBG() << "Process pending desired status"; diff --git a/src/core/cm/updatemanager/unitstatushandler.cpp b/src/core/cm/updatemanager/unitstatushandler.cpp index 3bd0f6e65..2d1a2e663 100644 --- a/src/core/cm/updatemanager/unitstatushandler.cpp +++ b/src/core/cm/updatemanager/unitstatushandler.cpp @@ -143,7 +143,7 @@ Error UnitStatusHandler::SendFullUnitStatus() ClearUnitStatus(); ClearUpdateStatuses(); - mTimer.Stop(); + (void)mTimer.Stop(); LockGuard lock {mMutex}; @@ -390,13 +390,13 @@ void UnitStatusHandler::OnDisconnect() LockGuard lock {mMutex}; mCloudConnected = false; - mTimer.Stop(); + (void)mTimer.Stop(); } Error UnitStatusHandler::SetUnitConfigStatus() { mUnitStatus.mUnitConfig.EmplaceValue(); - mUnitStatus.mUnitConfig->EmplaceBack(); + (void)mUnitStatus.mUnitConfig->EmplaceBack(); auto& unitConfigStatus = mUnitStatus.mUnitConfig->Back(); @@ -422,7 +422,7 @@ Error UnitStatusHandler::SetNodesInfo() } mUnitStatus.mNodes.EmplaceValue(); - mUnitStatus.mNodes->Resize(nodeIDs.Size()); + (void)mUnitStatus.mNodes->Resize(nodeIDs.Size()); for (size_t i = 0; i < nodeIDs.Size(); i++) { auto& nodeInfo = mUnitStatus.mNodes.GetValue()[i]; @@ -449,7 +449,7 @@ Error UnitStatusHandler::SetUpdateItemsStatus() return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - mItemStatusProvider->GetUpdateItemsStatuses(*itemsStatuses); + (void)mItemStatusProvider->GetUpdateItemsStatuses(*itemsStatuses); mUnitStatus.mUpdateItems.EmplaceValue(); @@ -504,7 +504,7 @@ Error UnitStatusHandler::SetInstancesStatus() static_cast(instanceStatus) = static_cast(status); instanceStatus.mInstance = status.mInstance; - it->mInstances.PushBack(&instanceStatus); + (void)it->mInstances.PushBack(&instanceStatus); } return ErrorEnum::eNone; @@ -514,7 +514,7 @@ Error UnitStatusHandler::SetUnitSubjects() { mUnitStatus.mUnitSubjects.EmplaceValue(); - mIdentProvider->GetSubjects(*mUnitStatus.mUnitSubjects); + (void)mIdentProvider->GetSubjects(*mUnitStatus.mUnitSubjects); return ErrorEnum::eNone; } @@ -587,14 +587,14 @@ void UnitStatusHandler::ClearUpdateStatuses() void UnitStatusHandler::StartTimer() { if (mTimerStarted) { - mTimer.Restart(); + (void)mTimer.Restart(); return; } mTimerStarted = true; - mTimer.Start(mUnitStatusSendTimeout, [this](void*) { + (void)mTimer.Start(mUnitStatusSendTimeout, [this](void*) { LockGuard lock {mMutex}; mUnitStatus.mIsDeltaInfo = true; diff --git a/src/core/common/crypto/asn1.cpp b/src/core/common/crypto/asn1.cpp index 3e3aab2b9..dbe040a09 100644 --- a/src/core/common/crypto/asn1.cpp +++ b/src/core/common/crypto/asn1.cpp @@ -24,9 +24,9 @@ RetWithError> ConvertTimeToASN1Str(const Time& time) StaticString result; - result.Resize(result.MaxSize()); - snprintf(result.Get(), result.Size(), "%04d%02d%02d%02d%02d%02dZ", year, month, day, hour, min, sec); - result.Resize(strlen(result.CStr())); + (void)result.Resize(result.MaxSize()); + (void)snprintf(result.Get(), result.Size(), "%04d%02d%02d%02d%02d%02dZ", year, month, day, hour, min, sec); + (void)result.Resize(strlen(result.CStr())); return {result, ErrorEnum::eNone}; } diff --git a/src/core/common/crypto/certloader.cpp b/src/core/common/crypto/certloader.cpp index bcfe966fe..cef933e9e 100644 --- a/src/core/common/crypto/certloader.cpp +++ b/src/core/common/crypto/certloader.cpp @@ -350,7 +350,7 @@ Error EncodePKCS11ID(const Array& id, String& idStr) StaticString<2> byteStr; - byteStr.ByteToHex(byte, true); + (void)byteStr.ByteToHex(byte, true); err = idStr.Insert(idStr.end(), byteStr.begin(), byteStr.end()); if (!err.IsNone()) { diff --git a/src/core/common/crypto/cryptohelper.cpp b/src/core/common/crypto/cryptohelper.cpp index 0be0cc313..7f22f61fa 100644 --- a/src/core/common/crypto/cryptohelper.cpp +++ b/src/core/common/crypto/cryptohelper.cpp @@ -437,7 +437,7 @@ Error CryptoHelper::AddCertificates(const Array& certs, SignCon for (const auto& certInfo : certs) { StaticString fingerprint = certInfo.mFingerprint; - fingerprint.ToUpper(); + (void)fingerprint.ToUpper(); auto iter = ctx.mCerts.FindIf( [&fingerprint](const X509CertificateInfo& certInfo) { return certInfo.mFingerprint == fingerprint; }); @@ -486,7 +486,7 @@ Error CryptoHelper::AddCertChains(const Array& chains, Sig ctx.mChains.Back().mFingerprints = chainInfo.mFingerprints; for (auto& fingerprint : ctx.mChains.Back().mFingerprints) { - fingerprint.ToUpper(); + (void)fingerprint.ToUpper(); } } @@ -650,7 +650,7 @@ RetWithError CryptoHelper::DecodeHash(const String& hashName) { StaticString upperHash = hashName; - upperHash.ToUpper(); + (void)upperHash.ToUpper(); if (upperHash == "SHA256") { return {HashEnum::eSHA256, ErrorEnum::eNone}; @@ -992,7 +992,7 @@ Error CryptoHelper::DecodeMessage(AESCipherItf& decoder, const Array& i return AOS_ERROR_WRAP(err); } - message.Insert(message.end(), outBlock->begin(), outBlock->end()); + (void)message.Insert(message.end(), outBlock->begin(), outBlock->end()); } auto err = decoder.Finalize(*outBlock); @@ -1000,7 +1000,7 @@ Error CryptoHelper::DecodeMessage(AESCipherItf& decoder, const Array& i return AOS_ERROR_WRAP(err); } - message.Insert(message.end(), outBlock->begin(), outBlock->end()); + (void)message.Insert(message.end(), outBlock->begin(), outBlock->end()); return ErrorEnum::eNone; } diff --git a/src/core/common/crypto/mbedtls/cryptoprovider.cpp b/src/core/common/crypto/mbedtls/cryptoprovider.cpp index 3bd3e92f3..b23847f3c 100644 --- a/src/core/common/crypto/mbedtls/cryptoprovider.cpp +++ b/src/core/common/crypto/mbedtls/cryptoprovider.cpp @@ -131,21 +131,21 @@ static Error ASN1RemoveTag(const Array& src, Array& dst, int t return err; } - memmove(dst.Get(), p, len); + (void)memmove(dst.Get(), p, len); return ErrorEnum::eNone; } static Error ParseDN(const mbedtls_x509_name& dn, String& result) { - result.Resize(result.MaxSize()); + (void)result.Resize(result.MaxSize()); int ret = mbedtls_x509_dn_gets(result.Get(), result.Size(), &dn); if (ret <= 0) { return AOS_ERROR_WRAP(ret); } - result.Resize(ret); + (void)result.Resize(ret); return ErrorEnum::eNone; } @@ -240,8 +240,8 @@ static Error CreateClientCert(const mbedtls_x509_csr& csr, const mbedtls_pk_cont } // MbedTLS does not support UTC time format - notBefore.RightTrim("Z"); - notAfter.RightTrim("Z"); + (void)notBefore.RightTrim("Z"); + (void)notAfter.RightTrim("Z"); ret = mbedtls_x509write_crt_set_validity(&clientCert, notBefore.CStr(), notAfter.CStr()); if (ret != 0) { @@ -249,7 +249,7 @@ static Error CreateClientCert(const mbedtls_x509_csr& csr, const mbedtls_pk_cont } // write client certificate to the buffer - pemClientCert.Resize(pemClientCert.MaxSize()); + (void)pemClientCert.Resize(pemClientCert.MaxSize()); ret = mbedtls_x509write_crt_pem(&clientCert, reinterpret_cast(pemClientCert.Get()), pemClientCert.Size() + 1, mbedtls_ctr_drbg_random, nullptr); @@ -257,7 +257,7 @@ static Error CreateClientCert(const mbedtls_x509_csr& csr, const mbedtls_pk_cont return AOS_ERROR_WRAP(ret); } - pemClientCert.Resize(strlen(pemClientCert.Get())); + (void)pemClientCert.Resize(strlen(pemClientCert.Get())); return aos::ErrorEnum::eNone; } @@ -746,7 +746,7 @@ Error MbedTLSCryptoProvider::X509CertToPEM(const x509::Certificate& certificate, return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - dst.Resize(olen - 1); + (void)dst.Resize(olen - 1); return ErrorEnum::eNone; } @@ -779,7 +779,7 @@ Error MbedTLSCryptoProvider::ASN1EncodeDN(const String& commonName, Array& dn, String& resu return ret; } - result.Resize(result.MaxSize()); + (void)result.Resize(result.MaxSize()); int len = mbedtls_x509_dn_gets(result.Get(), result.Size(), &tmpDN); mbedtls_asn1_free_named_data_list_shallow(tmpDN.next); @@ -844,7 +844,7 @@ RetWithError> MbedTLSCryptoProvider::PEMToX509PrivKey(c Error MbedTLSCryptoProvider::ASN1EncodeObjectIds(const Array& src, Array& asn1Value) { - asn1Value.Resize(asn1Value.MaxSize()); + (void)asn1Value.Resize(asn1Value.MaxSize()); uint8_t* start = asn1Value.Get(); uint8_t* p = asn1Value.Get() + asn1Value.Size(); @@ -854,14 +854,14 @@ Error MbedTLSCryptoProvider::ASN1EncodeObjectIds(const Array& number, Array& asn1Value) { - asn1Value.Resize(asn1Value.MaxSize()); + (void)asn1Value.Resize(asn1Value.MaxSize()); uint8_t* p = asn1Value.Get() + asn1Value.Size(); int len = crypto::ASN1EncodeBigInt(number, &p, asn1Value.Get()); @@ -869,14 +869,14 @@ Error MbedTLSCryptoProvider::ASN1EncodeBigInt(const Array& number, Arra return len; } - memmove(asn1Value.Get(), p, len); + (void)memmove(asn1Value.Get(), p, len); return asn1Value.Resize(len); } Error MbedTLSCryptoProvider::ASN1EncodeDERSequence(const Array>& items, Array& asn1Value) { - asn1Value.Resize(asn1Value.MaxSize()); + (void)asn1Value.Resize(asn1Value.MaxSize()); uint8_t* start = asn1Value.Get(); uint8_t* p = asn1Value.Get() + asn1Value.Size(); @@ -886,7 +886,7 @@ Error MbedTLSCryptoProvider::ASN1EncodeDERSequence(const Array>& return len; } - memmove(asn1Value.Get(), p, len); + (void)memmove(asn1Value.Get(), p, len); return asn1Value.Resize(len); } @@ -1002,7 +1002,7 @@ Error MbedTLSCryptoProvider::RandBuffer(Array& buffer, size_t size) return AOS_ERROR_WRAP(ret); } - buffer.Resize(size); + (void)buffer.Resize(size); if (auto ret = mbedtls_ctr_drbg_random(&ctrDrbg, buffer.Get(), size); ret != 0) { return AOS_ERROR_WRAP(ret); } @@ -1040,7 +1040,7 @@ RetWithError MbedTLSCryptoProvider::CreateUUIDv5(const uuid::UUID& s StaticArray sha1; - sha1.Resize(sha1.MaxSize()); + (void)sha1.Resize(sha1.MaxSize()); int ret = mbedtls_sha1(buffer.Get(), buffer.Size(), sha1.Get()); if (ret != 0) { @@ -1179,7 +1179,7 @@ Error MbedTLSCryptoProvider::Verify(const Array& rootCerts, &interm, &root, nullptr, nullptr, &flags, &MbedTLSCryptoProvider::VerifyTime, &curTime); if (ret != 0) { char vrfyBuff[256]; - mbedtls_x509_crt_verify_info(vrfyBuff, sizeof(vrfyBuff), "", flags); + (void)mbedtls_x509_crt_verify_info(vrfyBuff, sizeof(vrfyBuff), "", flags); return AOS_ERROR_WRAP(Error(ErrorEnum::eFailed, vrfyBuff)); } @@ -1325,7 +1325,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadBigInt( return {AOS_ERROR_WRAP(err), {}}; } - mbedtls_mpi_write_binary(&mpi, result.Get(), mpiLen); + (void)mbedtls_mpi_write_binary(&mpi, result.Get(), mpiLen); // Remaining data auto remaining = Array(p, end - p); @@ -1368,7 +1368,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadOID( return {AOS_ERROR_WRAP(Error(ErrorEnum::eFailed, "failed to convert OID to string")), {}}; } - oid.Resize(ret); + (void)oid.Resize(ret); // Remaining data p += buf.len; @@ -1481,7 +1481,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadOctetString( return {AOS_ERROR_WRAP(err), {}}; } - memcpy(result.Get(), p, len); + (void)memcpy(result.Get(), p, len); // Remaining data after the OCTET STRING p += len; @@ -1566,20 +1566,20 @@ Error MbedTLSCryptoProvider::MBedTLSHash::Finalize(Array& hash) { size_t hashSize = 0; - hash.Resize(hash.MaxSize()); + (void)hash.Resize(hash.MaxSize()); if (auto ret = psa_hash_finish(&mOperation, hash.Get(), hash.Size(), &hashSize); ret != PSA_SUCCESS) { return AOS_ERROR_WRAP(ret); } - hash.Resize(hashSize); + (void)hash.Resize(hashSize); return ErrorEnum::eNone; } MbedTLSCryptoProvider::MBedTLSHash::~MBedTLSHash() { - psa_hash_abort(&mOperation); + (void)psa_hash_abort(&mOperation); } /*********************************************************************************************************************** @@ -1650,7 +1650,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::Init(const Array& key, c mEncrypt = encrypt; mInitialized = true; - releaseCtx.Release(); + (void)releaseCtx.Release(); return ErrorEnum::eNone; } @@ -1669,7 +1669,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::EncryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); } - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); size_t outLen = 0; int ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); @@ -1677,7 +1677,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::EncryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -1696,7 +1696,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::DecryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); } - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); size_t outLen = 0; int ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); @@ -1704,7 +1704,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::DecryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -1729,7 +1729,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::Finalize(Array& output) return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - output.Resize(outLen); + (void)output.Resize(outLen); mbedtls_cipher_free(&mCtx); mInitialized = false; @@ -1807,7 +1807,7 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( } auto rsa = mbedtls_pk_rsa(*mPrivKey); - mResult.Resize(mResult.MaxSize()); + (void)mResult.Resize(mResult.MaxSize()); size_t olen = 0; int ret = mbedtls_rsa_pkcs1_decrypt( @@ -1816,7 +1816,7 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - mResult.Resize(olen); + (void)mResult.Resize(olen); return ErrorEnum::eNone; } @@ -1830,9 +1830,9 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( // configure padding mode + hash mbedtls_md_type_t mdType = ConvertToMD(opts.mHash); - mbedtls_rsa_set_padding(rsa, MBEDTLS_RSA_PKCS_V21, mdType); + (void)mbedtls_rsa_set_padding(rsa, MBEDTLS_RSA_PKCS_V21, mdType); - mResult.Resize(mResult.MaxSize()); + (void)mResult.Resize(mResult.MaxSize()); size_t olen = 0; int ret = mbedtls_rsa_rsaes_oaep_decrypt(rsa, mbedtls_ctr_drbg_random, mDRBG, nullptr, 0, // label @@ -1841,7 +1841,7 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - mResult.Resize(olen); + (void)mResult.Resize(olen); return ErrorEnum::eNone; } @@ -1955,7 +1955,7 @@ Error MbedTLSCryptoProvider::ParseECKey(const mbedtls_ecp_keypair* eckey, x509:: return AOS_ERROR_WRAP(err); } - memcpy(paramsOID.Get(), oid, len); + (void)memcpy(paramsOID.Get(), oid, len); err = ecPoint.Resize(ecPoint.MaxSize()); if (!err.IsNone()) { @@ -2027,21 +2027,21 @@ Error MbedTLSCryptoProvider::GetX509CertData(x509::Certificate& cert, mbedtls_x5 return AOS_ERROR_WRAP(err); } - memcpy(cert.mSubject.Get(), crt->subject_raw.p, crt->subject_raw.len); + (void)memcpy(cert.mSubject.Get(), crt->subject_raw.p, crt->subject_raw.len); err = cert.mIssuer.Resize(crt->issuer_raw.len); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } - memcpy(cert.mIssuer.Get(), crt->issuer_raw.p, crt->issuer_raw.len); + (void)memcpy(cert.mIssuer.Get(), crt->issuer_raw.p, crt->issuer_raw.len); err = cert.mSerial.Resize(crt->serial.len); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } - memcpy(cert.mSerial.Get(), crt->serial.p, crt->serial.len); + (void)memcpy(cert.mSerial.Get(), crt->serial.p, crt->serial.len); aos::Tie(cert.mNotBefore, err) = ConvertTime(crt->valid_from); if (!err.IsNone()) { @@ -2058,7 +2058,7 @@ Error MbedTLSCryptoProvider::GetX509CertData(x509::Certificate& cert, mbedtls_x5 return AOS_ERROR_WRAP(err); } - memcpy(cert.mRaw.Get(), crt->raw.p, crt->raw.len); + (void)memcpy(cert.mRaw.Get(), crt->raw.p, crt->raw.len); return ErrorEnum::eNone; } @@ -2145,8 +2145,8 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed return AOS_ERROR_WRAP(err); } - cert.mSubjectKeyId.Resize(tagLen); - memcpy(cert.mSubjectKeyId.Get(), p, tagLen); + (void)cert.mSubjectKeyId.Resize(tagLen); + (void)memcpy(cert.mSubjectKeyId.Get(), p, tagLen); if (!cert.mAuthorityKeyId.IsEmpty()) { break; @@ -2183,8 +2183,8 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed return AOS_ERROR_WRAP(err); } - cert.mAuthorityKeyId.Resize(len); - memcpy(cert.mAuthorityKeyId.Get(), p, len); + (void)cert.mAuthorityKeyId.Resize(len); + (void)memcpy(cert.mAuthorityKeyId.Get(), p, len); if (!cert.mSubjectKeyId.IsEmpty()) { break; @@ -2321,7 +2321,7 @@ Error MbedTLSCryptoProvider::SetCSRExtraExtensions(mbedtls_x509write_csr& csr, c Error MbedTLSCryptoProvider::WriteCSRPem(mbedtls_x509write_csr& csr, String& pemCSR) { - pemCSR.Resize(pemCSR.MaxSize()); + (void)pemCSR.Resize(pemCSR.MaxSize()); auto ret = mbedtls_x509write_csr_pem( &csr, reinterpret_cast(pemCSR.Get()), pemCSR.Size() + 1, nullptr, nullptr); @@ -2329,7 +2329,7 @@ Error MbedTLSCryptoProvider::WriteCSRPem(mbedtls_x509write_csr& csr, String& pem return AOS_ERROR_WRAP(ret); } - pemCSR.Resize(strlen(reinterpret_cast(pemCSR.CStr()))); + (void)pemCSR.Resize(strlen(reinterpret_cast(pemCSR.CStr()))); return ErrorEnum::eNone; } @@ -2416,7 +2416,7 @@ Error MbedTLSCryptoProvider::SetCertificateProperties(mbedtls_x509write_cert& ce Error MbedTLSCryptoProvider::WriteCertificatePem(mbedtls_x509write_cert& cert, String& pemCert) { - pemCert.Resize(pemCert.MaxSize()); + (void)pemCert.Resize(pemCert.MaxSize()); auto ret = mbedtls_x509write_crt_pem( &cert, reinterpret_cast(pemCert.Get()), pemCert.Size() + 1, mbedtls_ctr_drbg_random, nullptr); @@ -2424,7 +2424,7 @@ Error MbedTLSCryptoProvider::WriteCertificatePem(mbedtls_x509write_cert& cert, S return AOS_ERROR_WRAP(ret); } - pemCert.Resize(strlen(pemCert.CStr())); + (void)pemCert.Resize(strlen(pemCert.CStr())); return ErrorEnum::eNone; } @@ -2508,8 +2508,8 @@ Error MbedTLSCryptoProvider::SetCertificateValidityPeriod(mbedtls_x509write_cert } // MbedTLS does not support UTC time format - notBefore.RightTrim("Z"); - notAfter.RightTrim("Z"); + (void)notBefore.RightTrim("Z"); + (void)notAfter.RightTrim("Z"); return AOS_ERROR_WRAP(mbedtls_x509write_crt_set_validity(&cert, notBefore.Get(), notAfter.Get())); } diff --git a/src/core/common/crypto/mbedtls/driverwrapper.cpp b/src/core/common/crypto/mbedtls/driverwrapper.cpp index b99bf23a1..62c0661dd 100644 --- a/src/core/common/crypto/mbedtls/driverwrapper.cpp +++ b/src/core/common/crypto/mbedtls/driverwrapper.cpp @@ -72,8 +72,8 @@ static int ExportRSAPublicKeyToDER( mbedtls_mpi_init(&n); mbedtls_mpi_init(&e); - mbedtls_mpi_read_binary(&n, rsaKey.GetN().Get(), rsaKey.GetN().Size()); - mbedtls_mpi_read_binary(&e, rsaKey.GetE().Get(), rsaKey.GetE().Size()); + (void)mbedtls_mpi_read_binary(&n, rsaKey.GetN().Get(), rsaKey.GetN().Size()); + (void)mbedtls_mpi_read_binary(&e, rsaKey.GetE().Get(), rsaKey.GetE().Size()); auto cleanup = [&]() { mbedtls_mpi_free(&n); @@ -103,7 +103,7 @@ static int ExportRSAPublicKeyToDER( MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_len(&c, data, len)); MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_tag(&c, data, MBEDTLS_ASN1_CONSTRUCTED | MBEDTLS_ASN1_SEQUENCE)); - memmove(data, c, len); + (void)memmove(data, c, len); *dataLength = len; cleanup(); @@ -395,7 +395,7 @@ void AosPsaRemoveKey(psa_key_id_t keyID) key->mAllocated = false; - psa_destroy_key(MBEDTLS_SVC_KEY_ID_GET_KEY_ID(keyID)); + (void)psa_destroy_key(MBEDTLS_SVC_KEY_ID_GET_KEY_ID(keyID)); } /*********************************************************************************************************************** diff --git a/src/core/common/crypto/openssl/cryptoprovider.cpp b/src/core/common/crypto/openssl/cryptoprovider.cpp index b10dfb348..dd1fb96de 100644 --- a/src/core/common/crypto/openssl/cryptoprovider.cpp +++ b/src/core/common/crypto/openssl/cryptoprovider.cpp @@ -304,14 +304,14 @@ Error SetECDSAPubKey(const EVP_PKEY* src, Variant& size_t ecPointSize = 0; StaticArray ecPoint; - ecPoint.Resize(ecPoint.MaxSize()); + (void)ecPoint.Resize(ecPoint.MaxSize()); if (EVP_PKEY_get_octet_string_param(src, OSSL_PKEY_PARAM_PUB_KEY, ecPoint.Get(), ecPoint.Size(), &ecPointSize) != 1) { return OPENSSL_ERROR(); } - ecPoint.Resize(ecPointSize); + (void)ecPoint.Resize(ecPointSize); // get curve name char curveName[cOSSLMaxNameSize] = {}; @@ -924,7 +924,7 @@ Error SetIssuerAltNameURIs(const Array>& uris, X509* cert) return OPENSSL_ERROR(); } - genName.Release(); + (void)genName.Release(); } // Create the issuerAltName extension (OID 2.5.29.18) @@ -1250,7 +1250,7 @@ asn1::ASN1ParseResult ReadASN1Container(const Array& data, const asn1:: OpenSSLCryptoProvider::~OpenSSLCryptoProvider() { - mOpenSSLProvider.Unload(); + (void)mOpenSSLProvider.Unload(); OSSL_LIB_CTX_free(mLibCtx); } @@ -1505,7 +1505,7 @@ RetWithError> OpenSSLCryptoProvider::PEMToX509PrivKey(c return {{}, err}; } - pkey.Release(); + (void)pkey.Release(); return {res, ErrorEnum::eNone}; } @@ -1562,8 +1562,8 @@ Error OpenSSLCryptoProvider::ASN1EncodeDN(const String& commonName, Array& buffer, size_t size) size = buffer.MaxSize(); } - buffer.Resize(size); + (void)buffer.Resize(size); if (RAND_priv_bytes_ex(mLibCtx, buffer.Get(), static_cast(size), cRNGStrength) != 1) { return OPENSSL_ERROR(); @@ -1842,9 +1842,9 @@ RetWithError OpenSSLCryptoProvider::CreateUUIDv5(const uuid::UUID& s StaticArray sha1; - sha1.Resize(sha1.MaxSize()); + (void)sha1.Resize(sha1.MaxSize()); - SHA1(buffer.Get(), buffer.Size(), sha1.Get()); + (void)SHA1(buffer.Get(), buffer.Size(), sha1.Get()); // copy lowest 16 bytes uuid::UUID result = Array(sha1.Get(), uuid::cUUIDSize); @@ -2004,7 +2004,7 @@ Error OpenSSLCryptoProvider::Verify(const Array& rootCerts, return OPENSSL_ERROR(); } - cert.Release(); + (void)cert.Release(); } // Create context @@ -2172,7 +2172,7 @@ asn1::ASN1ParseResult OpenSSLCryptoProvider::ReadBigInt( return {err, {}}; } - BN_bn2bin(bn.Get(), result.Get()); + (void)BN_bn2bin(bn.Get(), result.Get()); // Return remaining data. auto remaining = Array(p, data.Get() + len - p); @@ -2328,7 +2328,7 @@ asn1::ASN1ParseResult OpenSSLCryptoProvider::ReadOctetString( return {AOS_ERROR_WRAP(err), {}}; } - memcpy(result.Get(), dataPtr, static_cast(dataLen)); + (void)memcpy(result.Get(), dataPtr, static_cast(dataLen)); // Return remaining data. size_t offset = static_cast(p - data.Get()); @@ -2521,14 +2521,14 @@ Error OpenSSLCryptoProvider::OpenSSLAESCipher::EncryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); } - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); int outLen = 0; if (EVP_EncryptUpdate(mCipherCtx, output.Get(), &outLen, input.Get(), static_cast(input.Size())) != 1) { return OPENSSL_ERROR(); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -2543,14 +2543,14 @@ Error OpenSSLCryptoProvider::OpenSSLAESCipher::DecryptBlock(const Array return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); } - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); int outLen = 0; if (EVP_DecryptUpdate(mCipherCtx, output.Get(), &outLen, input.Get(), static_cast(input.Size())) != 1) { return OPENSSL_ERROR(); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -2562,23 +2562,23 @@ Error OpenSSLCryptoProvider::OpenSSLAESCipher::Finalize(Array& output) } if (mEncrypt) { - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); int outLen = 0; if (EVP_EncryptFinal_ex(mCipherCtx, output.Get(), &outLen) != 1) { return OPENSSL_ERROR(); } - output.Resize(outLen); + (void)output.Resize(outLen); } else { - output.Resize(output.MaxSize()); + (void)output.Resize(output.MaxSize()); int outLen = 0; if (EVP_DecryptFinal_ex(mCipherCtx, output.Get(), &outLen) != 1) { return OPENSSL_ERROR(); } - output.Resize(outLen); + (void)output.Resize(outLen); } EVP_CIPHER_CTX_free(mCipherCtx); @@ -2662,14 +2662,14 @@ Error OpenSSLCryptoProvider::OpenSSLRSAPrivKey::Decrypt( return OPENSSL_ERROR(); } - mResult.Resize(mResult.MaxSize()); + (void)mResult.Resize(mResult.MaxSize()); size_t outLen = mResult.MaxSize(); if (EVP_PKEY_decrypt(ctx.Get(), mResult.Get(), &outLen, mCipher.Get(), mCipher.Size()) <= 0) { return OPENSSL_ERROR(); } - mResult.Resize(outLen); + (void)mResult.Resize(outLen); return ErrorEnum::eNone; } @@ -2703,14 +2703,14 @@ Error OpenSSLCryptoProvider::OpenSSLRSAPrivKey::Decrypt( return OPENSSL_ERROR(); } - mResult.Resize(mResult.MaxSize()); + (void)mResult.Resize(mResult.MaxSize()); size_t outLen = mResult.Size(); if (EVP_PKEY_decrypt(ctx.Get(), mResult.Get(), &outLen, mCipher.Get(), mCipher.Size()) <= 0) { return OPENSSL_ERROR(); } - mResult.Resize(outLen); + (void)mResult.Resize(outLen); return ErrorEnum::eNone; } diff --git a/src/core/common/crypto/openssl/opensslprovider.cpp b/src/core/common/crypto/openssl/opensslprovider.cpp index 792763175..ab37ccff2 100644 --- a/src/core/common/crypto/openssl/opensslprovider.cpp +++ b/src/core/common/crypto/openssl/opensslprovider.cpp @@ -364,8 +364,8 @@ Error FormatSignature(const PrivateKeyItf& privKey, Array& signature) } // Ownership transferred to ECDSA_SIG object - r.Release(); - s.Release(); + (void)r.Release(); + (void)s.Release(); // Convert ECDSA_SIG to DER uint8_t* derSig = nullptr; @@ -416,7 +416,7 @@ X509_ALGOR* GetSignAlg(const PublicKeyItf& pubKey) // According to ossl_DER_w_algorithmIdentifier_MDWithRSAEncryption // implementation: PARAMETERS, always NULL in current standards - X509_ALGOR_set0(alg.Get(), algOID, V_ASN1_NULL, NULL); + (void)X509_ALGOR_set0(alg.Get(), algOID, V_ASN1_NULL, NULL); return alg.Release(); } @@ -438,7 +438,7 @@ X509_ALGOR* GetSignAlg(const PublicKeyItf& pubKey) // According to ossl_DER_w_algorithmIdentifier_ECDSA_with_MD implementation: // there is no PARAMETERS for ECDSA - X509_ALGOR_set0(alg.Get(), algOID, V_ASN1_UNDEF, NULL); + (void)X509_ALGOR_set0(alg.Get(), algOID, V_ASN1_UNDEF, NULL); return alg.Release(); } @@ -539,7 +539,7 @@ int DgstSign(void* ctx, unsigned char* sig, size_t* siglen, size_t sigsize, cons StaticArray digest; unsigned int digestLen = 0; - digest.Resize(digest.MaxSize()); + (void)digest.Resize(digest.MaxSize()); if (EVP_Digest(tbs, tbslen, digest.Get(), &digestLen, evpMd, NULL) != 1) { LOG_ERR() << "Digest calculation failed: err=" << OPENSSL_ERROR(); @@ -547,7 +547,7 @@ int DgstSign(void* ctx, unsigned char* sig, size_t* siglen, size_t sigsize, cons return 0; } - digest.Resize(digestLen); + (void)digest.Resize(digestLen); // Sign Array signature {sig, static_cast(sigsize)}; @@ -765,7 +765,7 @@ RetWithError> GetFullOID(const Array(instanceStatus); }); - mAverage.StopInstanceMonitoring(instanceStatus); + (void)mAverage.StopInstanceMonitoring(instanceStatus); } void Monitoring::GetInstanceMonitoringData(Array& instanceMonitoringData) @@ -367,7 +367,7 @@ void Monitoring::GetInstanceMonitoringData(Array& instan LOG_ERR() << "Failed to get instance monitoring data" << Log::Field("ident", instance.mIdent) << Log::Field(err); - instanceMonitoringData.PopBack(); + (void)instanceMonitoringData.PopBack(); continue; } } diff --git a/src/core/common/ocispec/itf/runtimespec.hpp b/src/core/common/ocispec/itf/runtimespec.hpp index 8b8dbfd64..38db77a5d 100644 --- a/src/core/common/ocispec/itf/runtimespec.hpp +++ b/src/core/common/ocispec/itf/runtimespec.hpp @@ -691,78 +691,78 @@ inline Error CreateExampleRuntimeConfig(RuntimeConfig& config, bool isCgroup2Uni config.mProcess->mTerminal = true; config.mProcess->mUser = {}; config.mProcess->mArgs.Clear(); - config.mProcess->mArgs.PushBack("sh"); + (void)config.mProcess->mArgs.PushBack("sh"); config.mProcess->mEnv.Clear(); - config.mProcess->mEnv.PushBack("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"); - config.mProcess->mEnv.PushBack("TERM=xterm"); + (void)config.mProcess->mEnv.PushBack("PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"); + (void)config.mProcess->mEnv.PushBack("TERM=xterm"); config.mProcess->mCwd = "/"; config.mProcess->mNoNewPrivileges = true; config.mProcess->mCapabilities.EmplaceValue(); config.mProcess->mCapabilities->mBounding.Clear(); - config.mProcess->mCapabilities->mBounding.PushBack("CAP_AUDIT_WRITE"); - config.mProcess->mCapabilities->mBounding.PushBack("CAP_KILL"); - config.mProcess->mCapabilities->mBounding.PushBack("CAP_NET_BIND_SERVICE"); + (void)config.mProcess->mCapabilities->mBounding.PushBack("CAP_AUDIT_WRITE"); + (void)config.mProcess->mCapabilities->mBounding.PushBack("CAP_KILL"); + (void)config.mProcess->mCapabilities->mBounding.PushBack("CAP_NET_BIND_SERVICE"); config.mProcess->mCapabilities->mPermitted.Clear(); - config.mProcess->mCapabilities->mPermitted.PushBack("CAP_AUDIT_WRITE"); - config.mProcess->mCapabilities->mPermitted.PushBack("CAP_KILL"); - config.mProcess->mCapabilities->mPermitted.PushBack("CAP_NET_BIND_SERVICE"); + (void)config.mProcess->mCapabilities->mPermitted.PushBack("CAP_AUDIT_WRITE"); + (void)config.mProcess->mCapabilities->mPermitted.PushBack("CAP_KILL"); + (void)config.mProcess->mCapabilities->mPermitted.PushBack("CAP_NET_BIND_SERVICE"); config.mProcess->mCapabilities->mEffective.Clear(); - config.mProcess->mCapabilities->mEffective.PushBack("CAP_AUDIT_WRITE"); - config.mProcess->mCapabilities->mEffective.PushBack("CAP_KILL"); - config.mProcess->mCapabilities->mEffective.PushBack("CAP_NET_BIND_SERVICE"); + (void)config.mProcess->mCapabilities->mEffective.PushBack("CAP_AUDIT_WRITE"); + (void)config.mProcess->mCapabilities->mEffective.PushBack("CAP_KILL"); + (void)config.mProcess->mCapabilities->mEffective.PushBack("CAP_NET_BIND_SERVICE"); config.mProcess->mRlimits.Clear(); - config.mProcess->mRlimits.PushBack({"RLIMIT_NOFILE", 1024, 1024}); + (void)config.mProcess->mRlimits.PushBack({"RLIMIT_NOFILE", 1024, 1024}); config.mHostname = "runc"; config.mMounts.Clear(); - config.mMounts.EmplaceBack("proc", "/proc", "proc"); - config.mMounts.EmplaceBack("tmpfs", "/dev", "tmpfs", "nosuid,strictatime,mode=755,size=65536k"); - config.mMounts.EmplaceBack( + (void)config.mMounts.EmplaceBack("proc", "/proc", "proc"); + (void)config.mMounts.EmplaceBack("tmpfs", "/dev", "tmpfs", "nosuid,strictatime,mode=755,size=65536k"); + (void)config.mMounts.EmplaceBack( "devpts", "/dev/pts", "devpts", "nosuid,noexec,newinstance,ptmxmode=0666,mode=0620,gid=5"); - config.mMounts.EmplaceBack("shm", "/dev/shm", "tmpfs", "nosuid,noexec,nodev,mode=1777,size=65536k"); - config.mMounts.EmplaceBack("mqueue", "/dev/mqueue", "mqueue", "nosuid,noexec,nodev"); - config.mMounts.EmplaceBack("sysfs", "/sys", "sysfs", "nosuid,noexec,nodev,ro"); - config.mMounts.EmplaceBack("cgroup", "/sys/fs/cgroup", "cgroup", "nosuid,noexec,nodev,relatime,ro"); + (void)config.mMounts.EmplaceBack("shm", "/dev/shm", "tmpfs", "nosuid,noexec,nodev,mode=1777,size=65536k"); + (void)config.mMounts.EmplaceBack("mqueue", "/dev/mqueue", "mqueue", "nosuid,noexec,nodev"); + (void)config.mMounts.EmplaceBack("sysfs", "/sys", "sysfs", "nosuid,noexec,nodev,ro"); + (void)config.mMounts.EmplaceBack("cgroup", "/sys/fs/cgroup", "cgroup", "nosuid,noexec,nodev,relatime,ro"); config.mLinux.EmplaceValue(); config.mLinux->mMaskedPaths.Clear(); - config.mLinux->mMaskedPaths.PushBack("/proc/acpi"); - config.mLinux->mMaskedPaths.PushBack("/proc/asound"); - config.mLinux->mMaskedPaths.PushBack("/proc/kcore"); - config.mLinux->mMaskedPaths.PushBack("/proc/keys"); - config.mLinux->mMaskedPaths.PushBack("/proc/latency_stats"); - config.mLinux->mMaskedPaths.PushBack("/proc/timer_list"); - config.mLinux->mMaskedPaths.PushBack("/proc/timer_stats"); - config.mLinux->mMaskedPaths.PushBack("/proc/sched_debug"); - config.mLinux->mMaskedPaths.PushBack("/proc/scsi"); - config.mLinux->mMaskedPaths.PushBack("/sys/firmware"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/acpi"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/asound"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/kcore"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/keys"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/latency_stats"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/timer_list"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/timer_stats"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/sched_debug"); + (void)config.mLinux->mMaskedPaths.PushBack("/proc/scsi"); + (void)config.mLinux->mMaskedPaths.PushBack("/sys/firmware"); config.mLinux->mReadonlyPaths.Clear(); - config.mLinux->mReadonlyPaths.PushBack("/proc/bus"); - config.mLinux->mReadonlyPaths.PushBack("/proc/fs"); - config.mLinux->mReadonlyPaths.PushBack("/proc/irq"); - config.mLinux->mReadonlyPaths.PushBack("/proc/sys"); - config.mLinux->mReadonlyPaths.PushBack("/proc/sysrq-trigger"); + (void)config.mLinux->mReadonlyPaths.PushBack("/proc/bus"); + (void)config.mLinux->mReadonlyPaths.PushBack("/proc/fs"); + (void)config.mLinux->mReadonlyPaths.PushBack("/proc/irq"); + (void)config.mLinux->mReadonlyPaths.PushBack("/proc/sys"); + (void)config.mLinux->mReadonlyPaths.PushBack("/proc/sysrq-trigger"); config.mLinux->mResources.EmplaceValue(); config.mLinux->mResources->mDevices.Clear(); - config.mLinux->mResources->mDevices.EmplaceBack("", "rwm", false); + (void)config.mLinux->mResources->mDevices.EmplaceBack("", "rwm", false); config.mLinux->mNamespaces.Clear(); - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::ePID); - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eNetwork); - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eIPC); - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eUTS); - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eMount); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::ePID); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eNetwork); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eIPC); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eUTS); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eMount); if (isCgroup2UnifiedMode) { - config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eCgroup); + (void)config.mLinux->mNamespaces.EmplaceBack(LinuxNamespaceEnum::eCgroup); } return ErrorEnum::eNone; diff --git a/src/core/common/pkcs11/pkcs11.cpp b/src/core/common/pkcs11/pkcs11.cpp index 03d1ceb2b..2e1959bcd 100644 --- a/src/core/common/pkcs11/pkcs11.cpp +++ b/src/core/common/pkcs11/pkcs11.cpp @@ -34,7 +34,7 @@ Error ConvertFromPKCS11String(const Array& src, String& dst) return ErrorEnum::eNoMemory; } - memcpy(dst.Get(), src.Get(), size); + (void)memcpy(dst.Get(), src.Get(), size); // Trim string for (int i = size - 1; i >= 0; --i) { @@ -44,7 +44,7 @@ Error ConvertFromPKCS11String(const Array& src, String& dst) break; } - dst.Resize(size); + (void)dst.Resize(size); return ErrorEnum::eNone; } @@ -62,8 +62,8 @@ Error ConvertToPKCS11String(const String& src, CK_UTF8CHAR (&dst)[cSize]) return ErrorEnum::eNoMemory; } - memset(dst, ' ', cSize); - memcpy(dst, src.CStr(), src.Size()); + (void)memset(dst, ' ', cSize); + (void)memcpy(dst, src.CStr(), src.Size()); return ErrorEnum::eNone; } @@ -165,7 +165,7 @@ Error ConvertToPKCS11Attributes(const Array& src, Array(attr.mValue.Get()); tmp.ulValueLen = attr.mValue.Size(); - dst.PushBack(tmp); + (void)dst.PushBack(tmp); } return ErrorEnum::eNone; @@ -191,7 +191,7 @@ Error BuildAttributes(const Array& types, Array>& tmp.pValue = static_cast(values[i].Get()); tmp.ulValueLen = values[i].MaxSize(); - dst.PushBack(tmp); + (void)dst.PushBack(tmp); } return ErrorEnum::eNone; @@ -211,7 +211,7 @@ Error GetAttributesValues(const Array& src, Array>& } auto tmp = Array(static_cast(attr.pValue), attr.ulValueLen); - values.PushBack(tmp); + (void)values.PushBack(tmp); } return ErrorEnum::eNone; @@ -472,7 +472,7 @@ RetWithError> LibraryContext::OpenSession(SlotID slotI } if (mSessions.Size() != mSessions.MaxSize()) { - mSessions.PushBack({params, session}); + (void)mSessions.PushBack({params, session}); return {session, ErrorEnum::eNone}; } @@ -731,7 +731,7 @@ Error SessionContext::Sign( CK_ULONG signSize = signature.MaxSize(); - signature.Resize(signature.MaxSize()); + (void)signature.Resize(signature.MaxSize()); err = Sign(data, signature.Get(), &signSize); if (!err.IsNone()) { @@ -754,7 +754,7 @@ Error SessionContext::Decrypt( // SoftHSM doesn't provide a precise size with Decrypt(data, nullptr, &resultSize) call. CK_ULONG resultSize = result.MaxSize(); - result.Resize(result.MaxSize()); + (void)result.Resize(result.MaxSize()); err = Decrypt(data, result.Get(), &resultSize); if (!err.IsNone()) { @@ -877,7 +877,7 @@ Error SessionContext::FindObjects(Array& objects) const unsigned long foundObjectsCount = 0, chunk = 0; - objects.Resize(objects.MaxSize()); + (void)objects.Resize(objects.MaxSize()); while (true) { if (foundObjectsCount == objects.MaxSize()) { @@ -894,7 +894,7 @@ Error SessionContext::FindObjects(Array& objects) const // success only when we ensured that all objects found if (chunk == 0) { - objects.Resize(foundObjectsCount); + (void)objects.Resize(foundObjectsCount); return objects.IsEmpty() ? ErrorEnum::eNotFound : ErrorEnum::eNone; } @@ -951,7 +951,7 @@ SharedPtr PKCS11Manager::OpenLibrary(const String& library) #if !AOS_CONFIG_PKCS11_USE_STATIC_LIB - dlerror(); // clean previous error status + (void)dlerror(); // clean previous error status LOG_DBG() << "Load library: path=" << library; @@ -971,7 +971,7 @@ SharedPtr PKCS11Manager::OpenLibrary(const String& library) return nullptr; } - mLibraries.EmplaceBack(library, ctx); + (void)mLibraries.EmplaceBack(library, ctx); return ctx; } @@ -1007,23 +1007,23 @@ RetWithError Utils::GenerateRSAKeyPairWithLabel( StaticArray pubKeyTempl; StaticArray privKeyTempl; - pubKeyTempl.PushBack({CKA_CLASS, &pubKeyClass, sizeof(pubKeyClass)}); - pubKeyTempl.PushBack({CKA_KEY_TYPE, &keyTypeRSA, sizeof(keyTypeRSA)}); - pubKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); - pubKeyTempl.PushBack({CKA_VERIFY, &trueVal, sizeof(trueVal)}); - pubKeyTempl.PushBack({CKA_ENCRYPT, &trueVal, sizeof(trueVal)}); - pubKeyTempl.PushBack({CKA_PUBLIC_EXPONENT, publicExp, sizeof(publicExp)}); - pubKeyTempl.PushBack({CKA_MODULUS_BITS, &modulusBits, sizeof(modulusBits)}); - pubKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); - pubKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); - - privKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_SIGN, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_DECRYPT, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_SENSITIVE, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_EXTRACTABLE, &falseVal, sizeof(falseVal)}); - privKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); - privKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); + (void)pubKeyTempl.PushBack({CKA_CLASS, &pubKeyClass, sizeof(pubKeyClass)}); + (void)pubKeyTempl.PushBack({CKA_KEY_TYPE, &keyTypeRSA, sizeof(keyTypeRSA)}); + (void)pubKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); + (void)pubKeyTempl.PushBack({CKA_VERIFY, &trueVal, sizeof(trueVal)}); + (void)pubKeyTempl.PushBack({CKA_ENCRYPT, &trueVal, sizeof(trueVal)}); + (void)pubKeyTempl.PushBack({CKA_PUBLIC_EXPONENT, publicExp, sizeof(publicExp)}); + (void)pubKeyTempl.PushBack({CKA_MODULUS_BITS, &modulusBits, sizeof(modulusBits)}); + (void)pubKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); + (void)pubKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); + + (void)privKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_SIGN, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_DECRYPT, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_SENSITIVE, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_EXTRACTABLE, &falseVal, sizeof(falseVal)}); + (void)privKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); + (void)privKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); CK_MECHANISM mechanism = {CKM_RSA_PKCS_KEY_PAIR_GEN, nullptr, 0}; @@ -1067,20 +1067,20 @@ RetWithError Utils::GenerateECDSAKeyPairWithLabel( StaticArray pubKeyTempl; StaticArray privKeyTempl; - pubKeyTempl.PushBack({CKA_CLASS, &pubKeyClass, sizeof(pubKeyClass)}); - pubKeyTempl.PushBack({CKA_KEY_TYPE, &keyTypeECDSA, sizeof(keyTypeECDSA)}); - pubKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); - pubKeyTempl.PushBack({CKA_VERIFY, &trueVal, sizeof(trueVal)}); - pubKeyTempl.PushBack({CKA_ECDSA_PARAMS, cP384OID, sizeof(cP384OID)}); - pubKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); - pubKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); - - privKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_SIGN, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_SENSITIVE, &trueVal, sizeof(trueVal)}); - privKeyTempl.PushBack({CKA_EXTRACTABLE, &falseVal, sizeof(falseVal)}); - privKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); - privKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); + (void)pubKeyTempl.PushBack({CKA_CLASS, &pubKeyClass, sizeof(pubKeyClass)}); + (void)pubKeyTempl.PushBack({CKA_KEY_TYPE, &keyTypeECDSA, sizeof(keyTypeECDSA)}); + (void)pubKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); + (void)pubKeyTempl.PushBack({CKA_VERIFY, &trueVal, sizeof(trueVal)}); + (void)pubKeyTempl.PushBack({CKA_ECDSA_PARAMS, cP384OID, sizeof(cP384OID)}); + (void)pubKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); + (void)pubKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); + + (void)privKeyTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_SIGN, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_SENSITIVE, &trueVal, sizeof(trueVal)}); + (void)privKeyTempl.PushBack({CKA_EXTRACTABLE, &falseVal, sizeof(falseVal)}); + (void)privKeyTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); + (void)privKeyTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); CK_MECHANISM mechanism = {CKM_ECDSA_KEY_PAIR_GEN, nullptr, 0}; @@ -1114,9 +1114,9 @@ RetWithError Utils::FindPrivateKey(const Array& id, const S StaticArray privKeyTempl; - privKeyTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(privKeyClass)}); - privKeyTempl.PushBack({CKA_ID, id}); - privKeyTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); + (void)privKeyTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(privKeyClass)}); + (void)privKeyTempl.PushBack({CKA_ID, id}); + (void)privKeyTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); StaticArray privKeys; @@ -1128,18 +1128,18 @@ RetWithError Utils::FindPrivateKey(const Array& id, const S // Find public part with matching attributes: id, label & key type. StaticArray keyTypeAttribute; - keyTypeAttribute.PushBack(CKA_KEY_TYPE); + (void)keyTypeAttribute.PushBack(CKA_KEY_TYPE); CK_KEY_TYPE keyType; StaticArray, cSingleAttribute> keyTypeValue; StaticArray pubKeyTempl; - keyTypeValue.PushBack(ConvertToAttributeValue(keyType)); + (void)keyTypeValue.PushBack(ConvertToAttributeValue(keyType)); - pubKeyTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(pubKeyClass)}); - pubKeyTempl.PushBack({CKA_ID, id}); - pubKeyTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); - pubKeyTempl.PushBack({CKA_KEY_TYPE, ConvertToAttributeValue(keyType)}); + (void)pubKeyTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(pubKeyClass)}); + (void)pubKeyTempl.PushBack({CKA_ID, id}); + (void)pubKeyTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); + (void)pubKeyTempl.PushBack({CKA_KEY_TYPE, ConvertToAttributeValue(keyType)}); StaticArray pubKeys; @@ -1196,17 +1196,17 @@ Error Utils::ImportCertificate(const Array& id, const String& label, co StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, &certClass, sizeof(certClass)}); - certTempl.PushBack({CKA_CERTIFICATE_TYPE, &certTypeX509, sizeof(certTypeX509)}); - certTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); - certTempl.PushBack({CKA_PRIVATE, &falseVal, sizeof(falseVal)}); - certTempl.PushBack({CKA_SUBJECT, const_cast(cert.mSubject.Get()), cert.mSubject.Size()}); - certTempl.PushBack({CKA_ISSUER, const_cast(cert.mIssuer.Get()), cert.mIssuer.Size()}); - certTempl.PushBack({CKA_SERIAL_NUMBER, serialNum.Get(), serialNum.Size()}); - certTempl.PushBack({CKA_VALUE, const_cast(cert.mRaw.Get()), cert.mRaw.Size()}); - certTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); + (void)certTempl.PushBack({CKA_CLASS, &certClass, sizeof(certClass)}); + (void)certTempl.PushBack({CKA_CERTIFICATE_TYPE, &certTypeX509, sizeof(certTypeX509)}); + (void)certTempl.PushBack({CKA_TOKEN, &trueVal, sizeof(trueVal)}); + (void)certTempl.PushBack({CKA_PRIVATE, &falseVal, sizeof(falseVal)}); + (void)certTempl.PushBack({CKA_SUBJECT, const_cast(cert.mSubject.Get()), cert.mSubject.Size()}); + (void)certTempl.PushBack({CKA_ISSUER, const_cast(cert.mIssuer.Get()), cert.mIssuer.Size()}); + (void)certTempl.PushBack({CKA_SERIAL_NUMBER, serialNum.Get(), serialNum.Size()}); + (void)certTempl.PushBack({CKA_VALUE, const_cast(cert.mRaw.Get()), cert.mRaw.Size()}); + (void)certTempl.PushBack({CKA_ID, const_cast(id.Get()), id.Size()}); if (!label.IsEmpty()) { - certTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); + (void)certTempl.PushBack({CKA_LABEL, const_cast(label.Get()), label.Size()}); } ObjectHandle certHandle = CK_INVALID_HANDLE; @@ -1232,9 +1232,9 @@ RetWithError Utils::HasCertificate(const Array& issuer, const Arr } StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); - certTempl.PushBack({CKA_ISSUER, issuer}); - certTempl.PushBack({CKA_SERIAL_NUMBER, asn1SerialNum}); + (void)certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); + (void)certTempl.PushBack({CKA_ISSUER, issuer}); + (void)certTempl.PushBack({CKA_SERIAL_NUMBER, asn1SerialNum}); StaticArray certHandles; @@ -1297,9 +1297,9 @@ Error Utils::DeleteCertificate(const Array& id, const String& label) StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); - certTempl.PushBack({CKA_ID, id}); - certTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); + (void)certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); + (void)certTempl.PushBack({CKA_ID, id}); + (void)certTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); StaticArray certHandles; @@ -1331,8 +1331,8 @@ RetWithError Utils::ExportPrivateKey( StaticArray, cObjectAttributesCount> attrValues; StaticArray attrTypes; - attrTypes.PushBack(CKA_MODULUS); - attrTypes.PushBack(CKA_PUBLIC_EXPONENT); + (void)attrTypes.PushBack(CKA_MODULUS); + (void)attrTypes.PushBack(CKA_PUBLIC_EXPONENT); auto n = MakeUnique>(&mAllocator); if (!n) { @@ -1344,8 +1344,8 @@ RetWithError Utils::ExportPrivateKey( return {{}, ErrorEnum::eNoMemory}; } - attrValues.PushBack(*n); - attrValues.PushBack(*e); + (void)attrValues.PushBack(*n); + (void)attrValues.PushBack(*e); auto err = mSession->GetAttributeValues(pubKeyHandle, attrTypes, attrValues); if (!err.IsNone()) { @@ -1371,8 +1371,8 @@ RetWithError Utils::ExportPrivateKey( StaticArray, cObjectAttributesCount> attrValues; StaticArray attrTypes; - attrTypes.PushBack(CKA_ECDSA_PARAMS); - attrTypes.PushBack(CKA_EC_POINT); + (void)attrTypes.PushBack(CKA_ECDSA_PARAMS); + (void)attrTypes.PushBack(CKA_EC_POINT); auto derEncodedParams = MakeUnique>(&mAllocator); if (!derEncodedParams) { @@ -1384,8 +1384,8 @@ RetWithError Utils::ExportPrivateKey( return {{}, ErrorEnum::eNoMemory}; } - attrValues.PushBack(*derEncodedParams); - attrValues.PushBack(*derEncodedPoint); + (void)attrValues.PushBack(*derEncodedParams); + (void)attrValues.PushBack(*derEncodedPoint); auto err = mSession->GetAttributeValues(pubKeyHandle, attrTypes, attrValues); if (!err.IsNone()) { @@ -1440,9 +1440,9 @@ Error Utils::FindCertificates(const Array& id, const String& label, Arr StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); - certTempl.PushBack({CKA_ID, id}); - certTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); + (void)certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); + (void)certTempl.PushBack({CKA_ID, id}); + (void)certTempl.PushBack({CKA_LABEL, ConvertToAttributeValue(label)}); return mSession->FindObjects(certTempl, handles); } @@ -1456,8 +1456,8 @@ Error Utils::FindCertificateChain(const crypto::x509::Certificate& certificate, CK_OBJECT_CLASS certClass = CKO_CERTIFICATE; StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); - certTempl.PushBack({CKA_SUBJECT, certificate.mIssuer}); + (void)certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); + (void)certTempl.PushBack({CKA_SUBJECT, certificate.mIssuer}); StaticArray handles; SharedPtr foundCert; @@ -1494,7 +1494,7 @@ RetWithError> Utils::FindCertificateByKeyID CK_OBJECT_CLASS certClass = CKO_CERTIFICATE; StaticArray certTempl; - certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); + (void)certTempl.PushBack({CKA_CLASS, ConvertToAttributeValue(certClass)}); StaticArray handles; @@ -1529,17 +1529,17 @@ RetWithError> Utils::GetCertificate(ObjectH StaticArray, cObjectAttributesCount> attrValues; StaticArray attrTypes; - certificate->mRaw.Resize(certificate->mRaw.MaxSize()); + (void)certificate->mRaw.Resize(certificate->mRaw.MaxSize()); - attrTypes.PushBack(CKA_VALUE); - attrValues.PushBack(certificate->mRaw); + (void)attrTypes.PushBack(CKA_VALUE); + (void)attrValues.PushBack(certificate->mRaw); auto err = mSession->GetAttributeValues(handle, attrTypes, attrValues); if (!err.IsNone()) { return {nullptr, err}; } - certificate->mRaw.Resize(attrValues[0].Size()); + (void)certificate->mRaw.Resize(attrValues[0].Size()); err = mCryptoProvider.DERToX509Cert(certificate->mRaw, *certificate); if (!err.IsNone()) { diff --git a/src/core/common/pkcs11/privatekey.cpp b/src/core/common/pkcs11/privatekey.cpp index f76eb139f..59470481e 100644 --- a/src/core/common/pkcs11/privatekey.cpp +++ b/src/core/common/pkcs11/privatekey.cpp @@ -44,8 +44,8 @@ Error PKCS11RSAPrivateKey::Sign( return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - t->Append(GetPrefix(options.mHash)); - t->Append(digest); + (void)t->Append(GetPrefix(options.mHash)); + (void)t->Append(digest); CK_MECHANISM mechanism = {CKM_RSA_PKCS, nullptr, 0}; diff --git a/src/core/common/tools/array.hpp b/src/core/common/tools/array.hpp index 58033f52c..83042827b 100644 --- a/src/core/common/tools/array.hpp +++ b/src/core/common/tools/array.hpp @@ -523,7 +523,7 @@ class StaticArray : public Array { : Array() { Array::SetBuffer(mBuffer); - Array::operator=(array); + (void)Array::operator=(array); } /** @@ -538,7 +538,7 @@ class StaticArray : public Array { */ StaticArray& operator=(const StaticArray& array) noexcept { - Array::operator=(array); + (void)Array::operator=(array); return *this; } @@ -552,7 +552,7 @@ class StaticArray : public Array { StaticArray(const Array& array) { Array::SetBuffer(mBuffer); - Array::operator=(array); + (void)Array::operator=(array); } // cppcheck-suppress duplInheritedMember @@ -563,7 +563,7 @@ class StaticArray : public Array { */ StaticArray& operator=(const Array& array) { - Array::operator=(array); + (void)Array::operator=(array); return *this; } diff --git a/src/core/common/tools/buffer.hpp b/src/core/common/tools/buffer.hpp index 2a45ce1c8..809b442fd 100644 --- a/src/core/common/tools/buffer.hpp +++ b/src/core/common/tools/buffer.hpp @@ -51,7 +51,7 @@ class Buffer { { assert(mSize >= buffer.mSize); - memcpy(mBuffer, buffer.mBuffer, buffer.mSize); + (void)memcpy(mBuffer, buffer.mBuffer, buffer.mSize); return *this; } diff --git a/src/core/common/tools/error.hpp b/src/core/common/tools/error.hpp index 6a0290241..45e833fd7 100644 --- a/src/core/common/tools/error.hpp +++ b/src/core/common/tools/error.hpp @@ -275,7 +275,7 @@ class Error { void CopyMessage(const char* msg) { if (msg != nullptr) { - snprintf(mMessage, sizeof(mMessage), "%s", msg); + (void)snprintf(mMessage, sizeof(mMessage), "%s", msg); return; } diff --git a/src/core/common/tools/fs.cpp b/src/core/common/tools/fs.cpp index ec878b7d3..f8ae288fd 100644 --- a/src/core/common/tools/fs.cpp +++ b/src/core/common/tools/fs.cpp @@ -49,7 +49,7 @@ DirIterator& DirIterator::operator=(DirIterator&& other) noexcept DirIterator::~DirIterator() { if (mDir) { - closedir(mDir); + (void)closedir(mDir); } } @@ -124,7 +124,7 @@ StaticString Dir(const String& path) } } - dir.Insert(dir.end(), path.begin(), it); + (void)dir.Insert(dir.end(), path.begin(), it); return dir; } @@ -140,7 +140,7 @@ RetWithError DirExist(const String& path) return {false, errno}; } - closedir(dir); + (void)closedir(dir); return true; } @@ -274,7 +274,7 @@ Error ClearDir(const String& path) #endif } - closedir(dir); + (void)closedir(dir); return ErrorEnum::eNone; } @@ -381,7 +381,7 @@ Error ReadFile(const String& fileName, Array& buff) return Error(errno); } - auto closeFile = DeferRelease(&fd, [](const int* fd) { close(*fd); }); + auto closeFile = DeferRelease(&fd, [](const int* fd) { (void)close(*fd); }); auto size = lseek(fd, 0, SEEK_END); if (size < 0) { @@ -416,7 +416,7 @@ Error ReadFile(const String& fileName, Array& buff) Error ReadFileToString(const String& fileName, String& text) { - text.Resize(text.MaxSize()); + (void)text.Resize(text.MaxSize()); auto buff = Array(reinterpret_cast(text.Get()), text.Size()); @@ -434,7 +434,7 @@ Error ReadLine(int fd, size_t pos, String& line, const String& delimiter) return Error(errno); } - line.Resize(line.MaxSize()); + (void)line.Resize(line.MaxSize()); ssize_t bytes = read(fd, line.Get(), line.MaxSize()); if (bytes < 0) { @@ -472,7 +472,7 @@ Error WriteFile(const String& fileName, const Array& data, uint32_t per if (chunkSize < 0) { err = errno; - close(fd); + (void)close(fd); return Error(err); } @@ -552,7 +552,7 @@ RetWithError CalculateSize(AllocatorItf& allocator, const String& path) continue; } - dirIterators->Erase(&dirIt); + (void)dirIterators->Erase(&dirIt); } return {size}; @@ -564,7 +564,7 @@ RetWithError CalculateSize(AllocatorItf& allocator, const String& path) File::~File() { - Close(); + (void)Close(); } Error File::Open(const String& path, Mode mode) @@ -603,7 +603,7 @@ Error File::ReadBlock(Array& buffer) } auto blockSize = buffer.MaxSize(); - buffer.Resize(blockSize); + (void)buffer.Resize(blockSize); bool eof = false; size_t totalRead = 0; @@ -620,7 +620,7 @@ Error File::ReadBlock(Array& buffer) totalRead += result; } - buffer.Resize(totalRead); + (void)buffer.Resize(totalRead); return eof ? ErrorEnum::eEOF : ErrorEnum::eNone; } @@ -658,7 +658,7 @@ Error BaseName(const String& path, String& base) return ErrorEnum::eNone; } - base.RightTrim("/"); + (void)base.RightTrim("/"); if (base.Size() == 0) { base = "/"; @@ -692,7 +692,7 @@ Error ParentPath(const String& path, String& parent) return ErrorEnum::eNone; } - parent.RightTrim("/"); + (void)parent.RightTrim("/"); if (parent.Size() == 0) { parent = "/"; @@ -724,7 +724,7 @@ Error ParentPath(const String& path, String& parent) return err; } - parent.RightTrim("/"); + (void)parent.RightTrim("/"); if (parent.Size() == 0) { parent = "/"; diff --git a/src/core/common/tools/fs.hpp b/src/core/common/tools/fs.hpp index 759779116..ebc967bc5 100644 --- a/src/core/common/tools/fs.hpp +++ b/src/core/common/tools/fs.hpp @@ -322,15 +322,15 @@ String& AppendPath(String& path, const Args&... args) { auto AppendPathEntry = [](String& path, const String& item) -> String& { if (path.Size() == 0 || *(path.end() - 1) == '/') { - path.Append(item); + (void)path.Append(item); } else { - path.Append("/").Append(item); + (void)path.Append("/").Append(item); } return path; }; - (AppendPathEntry(path, args), ...); + (void)(AppendPathEntry(path, args), ...); return path; } @@ -343,7 +343,7 @@ StaticString JoinPath(const Args&... args) { StaticString path; - AppendPath(path, args...); + (void)AppendPath(path, args...); return path; } diff --git a/src/core/common/tools/function.hpp b/src/core/common/tools/function.hpp index 6cd27b1e2..5c72013bc 100644 --- a/src/core/common/tools/function.hpp +++ b/src/core/common/tools/function.hpp @@ -53,7 +53,7 @@ class Function { assert(mBuffer); - memcpy(mBuffer, static_cast(function.mCallable), function.mCallable->Size()); + (void)memcpy(mBuffer, static_cast(function.mCallable), function.mCallable->Size()); mCallable = static_cast(mBuffer); @@ -198,7 +198,7 @@ class StaticFunction : public Function { StaticFunction(const StaticFunction& function) { Function::SetBuffer(mBuffer); - Function::operator=(function); + (void)Function::operator=(function); } /** @@ -209,7 +209,7 @@ class StaticFunction : public Function { */ StaticFunction& operator=(const StaticFunction& function) { - Function::operator=(function); + (void)Function::operator=(function); return *this; } @@ -223,7 +223,7 @@ class StaticFunction : public Function { StaticFunction(const Function& function) { Function::SetBuffer(mBuffer); - Function::operator=(function); + (void)Function::operator=(function); } // cppcheck-suppress duplInheritedMember diff --git a/src/core/common/tools/identifierpool.hpp b/src/core/common/tools/identifierpool.hpp index 49a66a09c..5c548a39d 100644 --- a/src/core/common/tools/identifierpool.hpp +++ b/src/core/common/tools/identifierpool.hpp @@ -107,7 +107,7 @@ class IdentifierRangePool : public NonCopyable { return ErrorEnum::eNotFound; } - mLockedIds.Erase(it); + (void)mLockedIds.Erase(it); return ErrorEnum::eNone; } diff --git a/src/core/common/tools/list.hpp b/src/core/common/tools/list.hpp index 76ab61de6..93fd0acfa 100644 --- a/src/core/common/tools/list.hpp +++ b/src/core/common/tools/list.hpp @@ -117,7 +117,7 @@ class ListImpl { { Iterator it(*this); - operator++(); + (void)operator++(); return it; } @@ -307,7 +307,7 @@ class List : public AlgorithmItf::Iterator, typen void Clear() { while (this->mSize > 0) { - Remove(Iterator(this->mTerminalNode.mNext)); + (void)Remove(Iterator(this->mTerminalNode.mNext)); } } diff --git a/src/core/common/tools/log.hpp b/src/core/common/tools/log.hpp index 36bfd05f9..2921612f8 100644 --- a/src/core/common/tools/log.hpp +++ b/src/core/common/tools/log.hpp @@ -215,7 +215,7 @@ class Log : private NonCopyable { { StaticString<12> tmpStr; - tmpStr.Convert(i); + (void)tmpStr.Convert(i); return *this << tmpStr; }; @@ -242,7 +242,7 @@ class Log : private NonCopyable { void AddPeriods() { if (mLogLine.Size() > 3) { - mLogLine.Resize(mLogLine.Size() - 3); + (void)mLogLine.Resize(mLogLine.Size() - 3); mLogLine += "..."; } } diff --git a/src/core/common/tools/memory.hpp b/src/core/common/tools/memory.hpp index 1827e12ae..05538ddf6 100644 --- a/src/core/common/tools/memory.hpp +++ b/src/core/common/tools/memory.hpp @@ -221,7 +221,7 @@ class UniquePtr : private NonCopyable { void Reset(T* object = nullptr) { if (mObject) { - mDeleter(mObject); + (void)mDeleter(mObject); mObject = nullptr; } @@ -366,7 +366,7 @@ class SharedControlBlock : private NonCopyable { if (count == 0) { // Unlock before disposing as disposal destroys this object (and its mutex). - lock.Unlock(); + (void)lock.Unlock(); Dispose(); } @@ -512,7 +512,7 @@ class SharedPtr { , mControlBlock(ptr.mControlBlock) { if (mControlBlock) { - mControlBlock->Take(); + (void)mControlBlock->Take(); } } @@ -533,7 +533,7 @@ class SharedPtr { mControlBlock = ptr.mControlBlock; if (mControlBlock) { - mControlBlock->Take(); + (void)mControlBlock->Take(); } return *this; @@ -551,7 +551,7 @@ class SharedPtr { , mControlBlock(ptr.mControlBlock) { if (mControlBlock) { - mControlBlock->Take(); + (void)mControlBlock->Take(); } } @@ -569,7 +569,7 @@ class SharedPtr { mControlBlock = ptr.mControlBlock; if (mControlBlock) { - mControlBlock->Take(); + (void)mControlBlock->Take(); } return *this; @@ -585,7 +585,7 @@ class SharedPtr { void Reset(AllocatorItf* allocator = nullptr, T* object = nullptr, Deleter deleter = SmartPtrDeleter) { if (mControlBlock) { - mControlBlock->Give(); + (void)mControlBlock->Give(); } mObject = nullptr; diff --git a/src/core/common/tools/queue.hpp b/src/core/common/tools/queue.hpp index 54f4c441e..091dba614 100644 --- a/src/core/common/tools/queue.hpp +++ b/src/core/common/tools/queue.hpp @@ -229,7 +229,7 @@ class Queue { { while (mSize) { Back().mValue.~T(); - Pop(); + (void)Pop(); } mHead = mTail = mBegin; diff --git a/src/core/common/tools/string.hpp b/src/core/common/tools/string.hpp index feb1b2007..eeb367dc5 100644 --- a/src/core/common/tools/string.hpp +++ b/src/core/common/tools/string.hpp @@ -137,7 +137,7 @@ class String : public Array { /** * Clears string. */ - void Clear() { Resize(0); } + void Clear() { (void)Resize(0); } /** * Appends string. @@ -273,8 +273,8 @@ class String : public Array { */ String& Trim(const String& chars) { - LeftTrim(chars); - RightTrim(chars); + (void)LeftTrim(chars); + (void)RightTrim(chars); return *this; } @@ -548,7 +548,7 @@ class String : public Array { return err; } - dst.PushBack(byte); + (void)dst.PushBack(byte); } return ErrorEnum::eNone; @@ -603,14 +603,14 @@ class String : public Array { auto msg = inErr.Message(); if (msg && *msg) { - Append(msg); + (void)Append(msg); } else { - Append(inErr.StrValue()); + (void)Append(inErr.StrValue()); } auto strErrno = inErr.StrErrno(); if (strErrno && *strErrno) { - Append(" [").Append(strErrno).Append("]"); + (void)Append(" [").Append(strErrno).Append("]"); } if (inErr.FileName()) { @@ -621,7 +621,7 @@ class String : public Array { return err; } - Append(" (").Append(inErr.FileName()).Append(":").Append(tmpBuf).Append(")"); + (void)Append(" (").Append(inErr.FileName()).Append(":").Append(tmpBuf).Append(")"); } return ErrorEnum::eNone; @@ -827,7 +827,7 @@ class StaticString : public String { : String() { String::SetBuffer(mBuffer, cMaxSize); - String::operator=(str); + (void)String::operator=(str); } /** @@ -837,7 +837,7 @@ class StaticString : public String { */ StaticString& operator=(const StaticString& str) noexcept { - String::operator=(str); + (void)String::operator=(str); return *this; } @@ -851,7 +851,7 @@ class StaticString : public String { StaticString(const String& str) { String::SetBuffer(mBuffer, cMaxSize); - String::operator=(str); + (void)String::operator=(str); } // cppcheck-suppress duplInheritedMember @@ -862,7 +862,7 @@ class StaticString : public String { */ StaticString& operator=(const String& str) { - String::operator=(str); + (void)String::operator=(str); return *this; } @@ -876,7 +876,7 @@ class StaticString : public String { StaticString(const char* str) { String::SetBuffer(mBuffer, cMaxSize); - String::operator=(str); + (void)String::operator=(str); } /** @@ -887,7 +887,7 @@ class StaticString : public String { */ StaticString& operator=(const char* str) { - String::operator=(str); + (void)String::operator=(str); return *this; } diff --git a/src/core/common/tools/thread.hpp b/src/core/common/tools/thread.hpp index 1140fc2e4..2c4cf2098 100644 --- a/src/core/common/tools/thread.hpp +++ b/src/core/common/tools/thread.hpp @@ -173,7 +173,7 @@ class Thread : private NonCopyable { static void* ThreadFunction(void* arg) { - static_cast(arg)->mFunction(); + (void)static_cast(arg)->mFunction(); static_cast(arg)->mFunction.Reset(); return nullptr; @@ -188,12 +188,12 @@ class Mutex { /** * Constructs Aos mutex. */ - Mutex() { pthread_mutex_init(&mPMutex, nullptr); } + Mutex() { (void)pthread_mutex_init(&mPMutex, nullptr); } /** * Destroys Aos mutex. */ - ~Mutex() { pthread_mutex_destroy(&mPMutex); } + ~Mutex() { (void)pthread_mutex_destroy(&mPMutex); } /** * Locks Aos mutex. @@ -231,12 +231,12 @@ class Semaphore { * * @param initial initial semaphore value. */ - explicit Semaphore(unsigned int initial = 1) { sem_init(&mSem, 0, initial); } + explicit Semaphore(unsigned int initial = 1) { (void)sem_init(&mSem, 0, initial); } /** * Destroys Aos semaphore. */ - ~Semaphore() { sem_destroy(&mSem); } + ~Semaphore() { (void)sem_destroy(&mSem); } /** * Locks semaphore. @@ -278,7 +278,7 @@ class LockGuard : private NonCopyable { /** * Destroys lock guard instance. */ - ~LockGuard() { mLocker.Unlock(); } + ~LockGuard() { (void)mLocker.Unlock(); } /** * Returns current lock guard error. @@ -317,7 +317,7 @@ class UniqueLock : private NonCopyable { ~UniqueLock() { if (mIsLocked) { - Unlock(); + (void)Unlock(); } } @@ -382,7 +382,7 @@ class ConditionalVariable : private NonCopyable { /** * Destroys conditional variable. */ - ~ConditionalVariable() { pthread_cond_destroy(&mCondVar); } + ~ConditionalVariable() { (void)pthread_cond_destroy(&mCondVar); } /** * Blocks the current thread until the condition variable is awakened. @@ -625,21 +625,21 @@ class ThreadPool : private NonCopyable { err = mQueue.Pop(); assert(err.IsNone()); - lock.Unlock(); + (void)lock.Unlock(); if (task) { - task(); + (void)task(); task.Reset(); } err = mTaskCondVar.NotifyOne(); assert(err.IsNone()); - lock.Lock(); + (void)lock.Lock(); mPendingTaskCount--; - lock.Unlock(); + (void)lock.Unlock(); err = mWaitCondVar.NotifyAll(); assert(err.IsNone()); @@ -680,7 +680,7 @@ class ThreadPool : private NonCopyable { mShutdown = true; - lock.Unlock(); + (void)lock.Unlock(); auto err = mTaskCondVar.NotifyAll(); if (!err.IsNone()) { diff --git a/src/core/common/tools/time.cpp b/src/core/common/tools/time.cpp index ab656f5be..94ed002c6 100644 --- a/src/core/common/tools/time.cpp +++ b/src/core/common/tools/time.cpp @@ -30,7 +30,7 @@ const char* ConsumeChars(const char* s, char* dest, size_t cnt) return nullptr; } - memcpy(dest, s, cnt); + (void)memcpy(dest, s, cnt); dest[cnt] = '\0'; return s + cnt; @@ -185,32 +185,32 @@ StaticString Duration::ToISO8601String() const char buffer[16]; if (auto years = total / Time::cYear.Nanoseconds(); years > 0) { - snprintf(buffer, sizeof(buffer), "%lldY", years); + (void)snprintf(buffer, sizeof(buffer), "%lldY", years); - result.Append(buffer); + (void)result.Append(buffer); total %= Time::cYear.Nanoseconds(); } if (auto months = total / Time::cMonth.Nanoseconds(); months > 0) { - snprintf(buffer, sizeof(buffer), "%lldM", months); + (void)snprintf(buffer, sizeof(buffer), "%lldM", months); - result.Append(buffer); + (void)result.Append(buffer); total %= Time::cMonth.Nanoseconds(); } if (auto weeks = total / Time::cWeek.Nanoseconds(); weeks > 0) { - snprintf(buffer, sizeof(buffer), "%lldW", weeks); + (void)snprintf(buffer, sizeof(buffer), "%lldW", weeks); - result.Append(buffer); + (void)result.Append(buffer); total %= Time::cWeek.Nanoseconds(); } if (auto days = total / Time::cDay.Nanoseconds(); days > 0) { - snprintf(buffer, sizeof(buffer), "%lldD", days); + (void)snprintf(buffer, sizeof(buffer), "%lldD", days); - result.Append(buffer); + (void)result.Append(buffer); total %= Time::cDay.Nanoseconds(); } @@ -225,28 +225,28 @@ StaticString Duration::ToISO8601String() const total %= Time::cSeconds.Nanoseconds(); if (hours || minutes || seconds || total) { - result.Append("T"); + (void)result.Append("T"); if (hours) { - snprintf(buffer, sizeof(buffer), "%lldH", hours); - result.Append(buffer); + (void)snprintf(buffer, sizeof(buffer), "%lldH", hours); + (void)result.Append(buffer); } if (minutes) { - snprintf(buffer, sizeof(buffer), "%lldM", minutes); - result.Append(buffer); + (void)snprintf(buffer, sizeof(buffer), "%lldM", minutes); + (void)result.Append(buffer); } if (total == 0 && seconds > 0) { - snprintf(buffer, sizeof(buffer), "%lldS", seconds); - result.Append(buffer); + (void)snprintf(buffer, sizeof(buffer), "%lldS", seconds); + (void)result.Append(buffer); } if (total > 0) { const auto rest = static_cast(total) / Time::cSeconds.Nanoseconds() + static_cast(seconds); - snprintf(buffer, sizeof(buffer), "%0.9lfS", rest); - result.Append(buffer); + (void)snprintf(buffer, sizeof(buffer), "%0.9lfS", rest); + (void)result.Append(buffer); } } @@ -288,7 +288,7 @@ RetWithError> Time::ToUTCString() const auto time = gmtime_r(&unixTime.tv_sec, &buf); - utcTimeStr.Resize(utcTimeStr.MaxSize()); + (void)utcTimeStr.Resize(utcTimeStr.MaxSize()); size_t size = strftime(utcTimeStr.Get(), utcTimeStr.Size(), "%FT%T", time); if (size == 0) { diff --git a/src/core/common/tools/timer.cpp b/src/core/common/tools/timer.cpp index 9a416196d..2a75d3d59 100644 --- a/src/core/common/tools/timer.cpp +++ b/src/core/common/tools/timer.cpp @@ -67,7 +67,7 @@ void Timer::ReleaseActiveCallback() mActiveCallbacks--; if (mActiveCallbacks == 0) { - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } } @@ -204,9 +204,9 @@ void Timer::ProcessTimers(void* arg) auto min = mRegisteredTimers.Min(cmpWakeupTime); if (min != mRegisteredTimers.end() && !(*min)->mWakeupTime.IsZero()) { - mCommonCondVar.Wait(lock, (*min)->mWakeupTime); + (void)mCommonCondVar.Wait(lock, (*min)->mWakeupTime); } else { - mCommonCondVar.Wait(lock); + (void)mCommonCondVar.Wait(lock); } } } diff --git a/src/core/common/tools/timer.hpp b/src/core/common/tools/timer.hpp index c468c532c..5609f90e9 100644 --- a/src/core/common/tools/timer.hpp +++ b/src/core/common/tools/timer.hpp @@ -37,7 +37,7 @@ class Timer { /** * Destructs timer instance. */ - ~Timer() { Stop(StopMode::WaitForCallbacks); } + ~Timer() { (void)Stop(StopMode::WaitForCallbacks); } /** * Starts timer. @@ -77,7 +77,7 @@ class Timer { } if (oneshot) { - Stop(); + (void)Stop(); } callback(arg); diff --git a/src/core/common/tools/uuid.cpp b/src/core/common/tools/uuid.cpp index ae92f67e1..bd51967e2 100644 --- a/src/core/common/tools/uuid.cpp +++ b/src/core/common/tools/uuid.cpp @@ -32,15 +32,15 @@ StaticString UUIDToString(const UUID& src) for (size_t i = 0; i < src.Size(); i++) { if (cTemplate[result.Size()] == '-') { - result.PushBack('-'); + (void)result.PushBack('-'); } StaticString<2> chunk; const auto curByte = Array(src.Get() + i, 1); - chunk.ByteArrayToHex(curByte); + (void)chunk.ByteArrayToHex(curByte); - result.Insert(result.end(), chunk.begin(), chunk.end()); + (void)result.Insert(result.end(), chunk.begin(), chunk.end()); } return result; @@ -51,7 +51,7 @@ RetWithError StringToUUID(const String& src) UUID result; if (src.IsEmpty()) { - result.Resize(result.MaxSize(), 0); + (void)result.Resize(result.MaxSize(), 0); return {result, ErrorEnum::eNone}; } @@ -81,11 +81,11 @@ RetWithError StringToUUID(const String& src) StaticString<2> srcChunk; StaticArray resultChunk; - srcChunk.Insert(srcChunk.begin(), src.Get() + i, src.Get() + i + 2); + (void)srcChunk.Insert(srcChunk.begin(), src.Get() + i, src.Get() + i + 2); - srcChunk.HexToByteArray(resultChunk); + (void)srcChunk.HexToByteArray(resultChunk); - result.Append(resultChunk); + (void)result.Append(resultChunk); i += 2; } diff --git a/src/core/common/types/common.hpp b/src/core/common/types/common.hpp index 6c10d7cd5..ad7f2d7b6 100644 --- a/src/core/common/types/common.hpp +++ b/src/core/common/types/common.hpp @@ -616,7 +616,7 @@ struct InstanceFilter { StaticString<32> instanceStr = "*"; if (instanceFilter.mInstance.HasValue()) { - instanceStr.Convert(*instanceFilter.mInstance); + (void)instanceStr.Convert(*instanceFilter.mInstance); } return log << "{" << (instanceFilter.mItemID.HasValue() ? *instanceFilter.mItemID : "*") << ":" diff --git a/src/core/iam/certhandler/certmodule.cpp b/src/core/iam/certhandler/certmodule.cpp index c1ae449d7..7ae5285c7 100644 --- a/src/core/iam/certhandler/certmodule.cpp +++ b/src/core/iam/certhandler/certmodule.cpp @@ -157,11 +157,11 @@ Error CertModule::CreateCSR(const String& subjectCommonName, const crypto::Priva for (const auto& extKeyUsage : mModuleConfig.mExtendedKeyUsage) { switch (extKeyUsage.GetValue()) { case ExtendedKeyUsageEnum::eClientAuth: - oids.PushBack(cOidExtKeyUsageClientAuth); + (void)oids.PushBack(cOidExtKeyUsageClientAuth); break; case ExtendedKeyUsageEnum::eServerAuth: - oids.PushBack(cOidExtKeyUsageServerAuth); + (void)oids.PushBack(cOidExtKeyUsageServerAuth); break; default: @@ -382,7 +382,7 @@ Error CertModule::TrimCerts(const String& password) return AOS_ERROR_WRAP(err); } - certsInStorage->Erase(info); + (void)certsInStorage->Erase(info); } return ErrorEnum::eNone; @@ -397,8 +397,8 @@ Error CertModule::CheckCertChain(const Array& chain) for (const auto& cert : chain) { StaticString issuer, subject; - mX509Provider->ASN1DecodeDN(cert.mIssuer, issuer); - mX509Provider->ASN1DecodeDN(cert.mSubject, subject); + (void)mX509Provider->ASN1DecodeDN(cert.mIssuer, issuer); + (void)mX509Provider->ASN1DecodeDN(cert.mSubject, subject); LOG_DBG() << "Check certificate chain: issuer=" << issuer << ", subject=" << subject; } @@ -459,7 +459,7 @@ Error CertModule::SyncValidCerts(const Array& validCerts) } if (storedCert != nullptr) { - certsInStorage->Erase(storedCert); + (void)certsInStorage->Erase(storedCert); } else { LOG_WRN() << "Add missing cert to DB: type=" << GetCertType() << ", certInfo=" << moduleCert; diff --git a/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp b/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp index 3183fc985..9879098ed 100644 --- a/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp +++ b/src/core/iam/certhandler/certmodules/pkcs11/pkcs11.cpp @@ -243,7 +243,7 @@ RetWithError> PKCS11Module::CreateKey(const Str err = TokenMemInfo(); if (!err.IsNone()) { - pkcs11::Utils(*mAllocator, session, *mCryptoProvider).DeletePrivateKey(pendingKey.mKey); + (void)pkcs11::Utils(*mAllocator, session, *mCryptoProvider).DeletePrivateKey(pendingKey.mKey); return {nullptr, err}; } @@ -257,10 +257,10 @@ RetWithError> PKCS11Module::CreateKey(const Str LOG_ERR() << "Can't delete pending key: err=" << err; } - mPendingKeys.Erase(mPendingKeys.begin()); + (void)mPendingKeys.Erase(mPendingKeys.begin()); } - mPendingKeys.PushBack(pendingKey); + (void)mPendingKeys.PushBack(pendingKey); return {pendingKey.mKey.GetPrivKey(), ErrorEnum::eNone}; } @@ -282,7 +282,7 @@ Error PKCS11Module::ApplyCert(const Array& certChain, for (auto it = mPendingKeys.begin(); it != mPendingKeys.end(); ++it) { if (CheckCertificate(certChain[0], *it->mKey.GetPrivKey())) { curKey.SetValue(*it); - mPendingKeys.Erase(it); + (void)mPendingKeys.Erase(it); break; } @@ -697,22 +697,22 @@ Error PKCS11Module::FindObject(pkcs11::SessionContext& session, const SearchObje StaticArray templ; - templ.EmplaceBack(CKA_TOKEN, Array(&token, sizeof(token))); + (void)templ.EmplaceBack(CKA_TOKEN, Array(&token, sizeof(token))); if (!filter.mID.IsEmpty()) { - templ.EmplaceBack(CKA_ID, filter.mID); + (void)templ.EmplaceBack(CKA_ID, filter.mID); } if (!filter.mLabel.IsEmpty()) { const auto labelPtr = reinterpret_cast(filter.mLabel.Get()); - templ.EmplaceBack(CKA_LABEL, Array(labelPtr, filter.mLabel.Size())); + (void)templ.EmplaceBack(CKA_LABEL, Array(labelPtr, filter.mLabel.Size())); } if (filter.mType.HasValue()) { const auto classPtr = reinterpret_cast(&filter.mType.GetValue()); - templ.EmplaceBack(CKA_CLASS, Array(classPtr, sizeof(pkcs11::ObjectClass))); + (void)templ.EmplaceBack(CKA_CLASS, Array(classPtr, sizeof(pkcs11::ObjectClass))); } // search object handles @@ -726,8 +726,8 @@ Error PKCS11Module::FindObject(pkcs11::SessionContext& session, const SearchObje // retrieve attributes(id & label) and add search objects StaticArray searchAttrTypes; - searchAttrTypes.PushBack(CKA_ID); - searchAttrTypes.PushBack(CKA_LABEL); + (void)searchAttrTypes.PushBack(CKA_ID); + (void)searchAttrTypes.PushBack(CKA_LABEL); for (const auto& object : objects) { err = dst.EmplaceBack(); @@ -739,20 +739,20 @@ Error PKCS11Module::FindObject(pkcs11::SessionContext& session, const SearchObje searchObject.mType = filter.mType; searchObject.mHandle = object; - searchObject.mID.Resize(searchObject.mID.MaxSize()); + (void)searchObject.mID.Resize(searchObject.mID.MaxSize()); StaticArray, cSearchObjAttrCount> searchAttrValues; StaticArray label; - searchAttrValues.PushBack(searchObject.mID); - searchAttrValues.PushBack(label); + (void)searchAttrValues.PushBack(searchObject.mID); + (void)searchAttrValues.PushBack(label); err = session.GetAttributeValues(object, searchAttrTypes, searchAttrValues); if (!err.IsNone()) { return AOS_ERROR_WRAP(err); } - searchObject.mID.Resize(searchAttrValues[0].Size()); + (void)searchObject.mID.Resize(searchAttrValues[0].Size()); err = pkcs11::Utils::ConvertPKCS11String(searchAttrValues[1], searchObject.mLabel); if (!err.IsNone()) { @@ -829,10 +829,10 @@ Error PKCS11Module::CreateURL(const String& label, const Array& id, Str { const auto AddParam = [](const aos::String& name, const aos::String& param, bool opaque, String& paramList) { if (!paramList.IsEmpty()) { - paramList.Append(opaque ? ";" : "&"); + (void)paramList.Append(opaque ? ";" : "&"); } - paramList.Append(name).Append("=").Append(param); + (void)paramList.Append(name).Append("=").Append(param); }; auto opaque = MakeUnique>(mAllocator); @@ -945,8 +945,8 @@ Error PKCS11Module::GetValidInfo(const pkcs11::SessionContext& session, Array types; StaticArray, cSingleAttribute> values; - types.PushBack(CKA_VALUE); - values.PushBack(*certBuffer); + (void)types.PushBack(CKA_VALUE); + (void)values.PushBack(*certBuffer); auto err = session.GetAttributeValues(object, types, values); if (!err.IsNone()) { diff --git a/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp b/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp index 234c5d420..e4db5a773 100644 --- a/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp +++ b/src/core/iam/identhandler/identmodules/fileidentifier/fileidentifier.cpp @@ -82,7 +82,7 @@ Error FileIdentifier::ReadSystemId() { const auto err = fs::ReadFileToString(mConfig.mSystemIDPath, mSystemInfo.mSystemID); - mSystemInfo.mSystemID.Trim(cWhiteSpaces); + (void)mSystemInfo.mSystemID.Trim(cWhiteSpaces); return AOS_ERROR_WRAP(err); } @@ -112,8 +112,8 @@ Error FileIdentifier::ReadUnitModel() return AOS_ERROR_WRAP(err); } - mSystemInfo.mUnitModel.Trim(cWhiteSpaces); - mSystemInfo.mVersion.Trim(cWhiteSpaces); + (void)mSystemInfo.mUnitModel.Trim(cWhiteSpaces); + (void)mSystemInfo.mVersion.Trim(cWhiteSpaces); return ErrorEnum::eNone; } diff --git a/src/core/iam/permhandler/permhandler.cpp b/src/core/iam/permhandler/permhandler.cpp index 68924d3ca..2304a06ae 100644 --- a/src/core/iam/permhandler/permhandler.cpp +++ b/src/core/iam/permhandler/permhandler.cpp @@ -133,7 +133,7 @@ RetWithError> PermHandler::GenerateSecret() return {secret, err}; } - secret.Assign(uuid::UUIDToString(uuid)); + (void)secret.Assign(uuid::UUIDToString(uuid)); } while (FindBySecret(secret) != mInstancesPerms.end()); diff --git a/src/core/sm/imagemanager/imagemanager.cpp b/src/core/sm/imagemanager/imagemanager.cpp index bbba27abd..5a07edc36 100644 --- a/src/core/sm/imagemanager/imagemanager.cpp +++ b/src/core/sm/imagemanager/imagemanager.cpp @@ -93,7 +93,7 @@ Error ImageManager::Start() } mProcessOutdatedItems = true; - mCV.NotifyAll(); + (void)mCV.NotifyAll(); if (auto err = mTimer.Start( mConfig.mRemoveOutdatedPeriod, @@ -101,7 +101,7 @@ Error ImageManager::Start() LockGuard lock {mMutex}; mProcessOutdatedItems = true; - mCV.NotifyAll(); + (void)mCV.NotifyAll(); }, false); !err.IsNone()) { @@ -130,7 +130,7 @@ Error ImageManager::Stop() } mClose = true; - mCV.NotifyAll(); + (void)mCV.NotifyAll(); } if (auto err = mThread.Join(); !err.IsNone() && stopErr.IsNone()) { @@ -481,7 +481,7 @@ Error ImageManager::InstallBlob(const oci::ContentDescriptor& descriptor, Instal auto releaseInstalling = DeferRelease(&descriptor.mDigest, [&](const String* digest) { if (waitInstalling) { - ReleaseInstallingBlob(*digest); + (void)ReleaseInstallingBlob(*digest); } }); @@ -650,7 +650,7 @@ Error ImageManager::InstallLayer( } auto releaseInstalling - = DeferRelease(&descriptor.mDigest, [&](const String* digest) { ReleaseInstallingBlob(*digest); }); + = DeferRelease(&descriptor.mDigest, [&](const String* digest) { (void)ReleaseInstallingBlob(*digest); }); { LockGuard lock {mMutex}; @@ -731,9 +731,9 @@ void ImageManager::ReleaseSpace(const String& path, spaceallocator::SpaceItf* sp if (space) { if (!err.IsNone()) { - space->Release(); + (void)space->Release(); } else { - space->Accept(); + (void)space->Accept(); } } } @@ -767,7 +767,7 @@ Error ImageManager::ReleaseInstallingBlob(const String& digest) auto it = mInstallingBlobs.FindIf( [&digest](const StaticString& installingDigest) { return installingDigest == digest; }); if (it != mInstallingBlobs.end()) { - mInstallingBlobs.Erase(it); + (void)mInstallingBlobs.Erase(it); } else { return AOS_ERROR_WRAP(ErrorEnum::eNotFound); } @@ -867,10 +867,10 @@ void ImageManager::ReleaseInstallingItem(List::Iterator it) { LockGuard lock {mMutex}; - mInstallingItems.Erase(it); + (void)mInstallingItems.Erase(it); if (mInstallingItems.IsEmpty()) { - mCV.NotifyAll(); + (void)mCV.NotifyAll(); } } diff --git a/src/core/sm/launcher/launcher.cpp b/src/core/sm/launcher/launcher.cpp index ea9843ef9..fc0a2873a 100644 --- a/src/core/sm/launcher/launcher.cpp +++ b/src/core/sm/launcher/launcher.cpp @@ -89,7 +89,7 @@ Error Launcher::Start() return AOS_ERROR_WRAP(err); } - lock.Unlock(); + (void)lock.Unlock(); LoadInstancesData(*storedInstances); @@ -121,9 +121,9 @@ Error Launcher::Stop() LOG_DBG() << "Stop launcher"; - mCondVar.Wait(lock, [this]() { return !mLaunchInProgress; }); + (void)mCondVar.Wait(lock, [this]() { return !mLaunchInProgress; }); - lock.Unlock(); + (void)lock.Unlock(); auto err = mLaunchPool.Run(); @@ -144,16 +144,16 @@ Error Launcher::Stop() } } - lock.Lock(); + (void)lock.Lock(); mIsRunning = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } - mThread.Join(); - mRebootThread.Join(); - mOfflineTTLHandler.Stop(Timer::StopMode::WaitForCallbacks); + (void)mThread.Join(); + (void)mRebootThread.Join(); + (void)mOfflineTTLHandler.Stop(Timer::StopMode::WaitForCallbacks); return stopErr; } @@ -172,7 +172,7 @@ Error Launcher::UpdateInstances(const Array& stopInstances, const }); // Wait in case previous request is not yet finished - mThread.Join(); + (void)mThread.Join(); auto stop = MakeShared>(mAllocator, stopInstances); if (!stop) { @@ -250,7 +250,7 @@ Error Launcher::RebootRequired(const String& runtimeID) return AOS_ERROR_WRAP(err); } - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); return ErrorEnum::eNone; } @@ -259,7 +259,7 @@ Error Launcher::GetInstancesStatuses(Array& statuses) { UniqueLock lock {mMutex}; - mCondVar.Wait(lock, [this]() { return !mLaunchInProgress; }); + (void)mCondVar.Wait(lock, [this]() { return !mLaunchInProgress; }); LOG_DBG() << "Get instances statuses" << Log::Field("count", mInstances.Size()); @@ -427,7 +427,8 @@ void Launcher::RunRebootThread() { UniqueLock lock {mMutex}; - mCondVar.Wait(lock, [this]() { return !mIsRunning || (!mLaunchInProgress && !mRebootQueue.IsEmpty()); }); + (void)mCondVar.Wait( + lock, [this]() { return !mIsRunning || (!mLaunchInProgress && !mRebootQueue.IsEmpty()); }); if (!mIsRunning) { return; @@ -463,7 +464,7 @@ void Launcher::HandleOfflineTTLs() LOG_DBG() << "Start offline TTL handler"; - mCondVar.Wait(lock, [this]() { return !mIsRunning || !mLaunchInProgress; }); + (void)mCondVar.Wait(lock, [this]() { return !mIsRunning || !mLaunchInProgress; }); if (!mIsRunning || !mOfflineTime.HasValue()) { return; @@ -474,7 +475,7 @@ void Launcher::HandleOfflineTTLs() StopExpiredInstances(lock); mLaunchInProgress = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); StartTTLTimer(); } @@ -555,13 +556,13 @@ void Launcher::StopExpiredInstances(UniqueLock& lock) } } - lock.Unlock(); + (void)lock.Unlock(); if (auto err = mOfflineTTLPool.Shutdown(); !err.IsNone()) { LOG_ERR() << "Offline TTL thread pool shutdown failed" << Log::Field(AOS_ERROR_WRAP(err)); } - lock.Lock(); + (void)lock.Lock(); } void Launcher::SendNodeInstancesStatuses() @@ -871,7 +872,7 @@ void Launcher::StopAllNetworks() return; } - mNetworkManager->FlushBatch(*failedIDs); + (void)mNetworkManager->FlushBatch(*failedIDs); if (!failedIDs->IsEmpty()) { LOG_WRN() << "Network stop batch partially failed" << Log::Field("count", failedIDs->Size()); @@ -1026,7 +1027,7 @@ void Launcher::StartNetworks(const Array& startInstances) return; } - mNetworkManager->FlushBatch(*failedIDs); + (void)mNetworkManager->FlushBatch(*failedIDs); for (const auto& failedID : *failedIDs) { auto instanceData = FindInstanceDataByID(failedID); @@ -1108,7 +1109,7 @@ void Launcher::StopNetworks(const Array& stopInstances) return; } - mNetworkManager->FlushBatch(*failedIDs); + (void)mNetworkManager->FlushBatch(*failedIDs); if (!failedIDs->IsEmpty()) { LOG_WRN() << "Network stop batch partially failed" << Log::Field("count", failedIDs->Size()); @@ -1241,7 +1242,7 @@ void Launcher::FinishLaunch() LockGuard lock {mMutex}; mLaunchInProgress = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } Launcher::InstanceData* Launcher::FindInstanceData(const InstanceIdent& instanceIdent) @@ -1324,7 +1325,7 @@ void Launcher::GetRemoveUpdateItems(const Array& stopInstances, return item.mItemID == instanceData->mInfo.mItemID && item.mVersion == instanceData->mInfo.mVersion; }); it == removeItems.end()) { - removeItems.EmplaceBack(UpdateItemInfo {instanceData->mInfo.mItemID, instanceData->mInfo.mVersion}); + (void)removeItems.EmplaceBack(UpdateItemInfo {instanceData->mInfo.mItemID, instanceData->mInfo.mVersion}); } } } @@ -1384,7 +1385,7 @@ void Launcher::InstallUpdateItems(const Array& startInstances) return item.mID == startInstance.mItemID && item.mVersion == startInstance.mVersion; }); it == installItems->end()) { - installItems->EmplaceBack(imagemanager::UpdateItemInfo { + (void)installItems->EmplaceBack(imagemanager::UpdateItemInfo { startInstance.mItemID, startInstance.mType, startInstance.mVersion, startInstance.mManifestDigest}); } } @@ -1429,7 +1430,7 @@ RetWithError Launcher::AddInstanceData(const InstanceIn itInstance->mStatus.mState = InstanceStateEnum::eInactive; if (auto err = mInstanceIDProvider->GetInstanceID(instanceInfo, itInstance->mInstanceID); !err.IsNone()) { - mInstances.Erase(itInstance); + (void)mInstances.Erase(itInstance); return {nullptr, AOS_ERROR_WRAP(err)}; } @@ -1488,7 +1489,7 @@ void Launcher::RemoveInstances(const Array& instances) for (const auto& instanceIdent : instances) { LOG_DBG() << "Remove instance data" << Log::Field("instance", instanceIdent); - mInstances.RemoveIf([this, &instanceIdent](const auto& instance) { + (void)mInstances.RemoveIf([this, &instanceIdent](const auto& instance) { return static_cast(instance.mInfo) == instanceIdent; }); } diff --git a/src/core/sm/networkmanager/networkmanager.cpp b/src/core/sm/networkmanager/networkmanager.cpp index 38e9a160d..42d0aad37 100644 --- a/src/core/sm/networkmanager/networkmanager.cpp +++ b/src/core/sm/networkmanager/networkmanager.cpp @@ -46,7 +46,7 @@ Error NetworkManager::Init(AllocatorItf& allocator, StorageItf& storage, BridgeN } for (const auto& instanceNetworkInfo : *instanceNetworkInfos) { - mInstanceNetworkInfos.Set(instanceNetworkInfo.mInstanceID, instanceNetworkInfo); + (void)mInstanceNetworkInfos.Set(instanceNetworkInfo.mInstanceID, instanceNetworkInfo); } auto networkInfos = MakeUnique>(mAllocator); @@ -59,7 +59,7 @@ Error NetworkManager::Init(AllocatorItf& allocator, StorageItf& storage, BridgeN } for (const auto& networkInfo : *networkInfos) { - mNetworkProviders.Set(networkInfo.mNetworkID, networkInfo); + (void)mNetworkProviders.Set(networkInfo.mNetworkID, networkInfo); } return ErrorEnum::eNone; @@ -201,7 +201,7 @@ Error NetworkManager::CreateInstanceNetwork( auto rollbackCache = DeferRelease(&instanceID, [this, &err](const String* id) { if (!err.IsNone()) { LockGuard lock {mMutex}; - mInstanceNetworkInfos.Remove(*id); + (void)mInstanceNetworkInfos.Remove(*id); } }); @@ -258,7 +258,7 @@ Error NetworkManager::CreateInstanceNetwork( { LockGuard lock {mMutex}; - mInstanceNetworkInfos.Set(instanceID, *info); + (void)mInstanceNetworkInfos.Set(instanceID, *info); } return ErrorEnum::eNone; @@ -407,7 +407,7 @@ Error NetworkManager::GetHosts(const String& instanceID, Array& hosts) con StaticString ownHosts {networkID}; if (!hostname.IsEmpty()) { - ownHosts.Append(" ").Append(hostname); + (void)ownHosts.Append(" ").Append(hostname); } if (auto err = hosts.EmplaceBack(instanceIP, ownHosts); !err.IsNone()) { @@ -487,7 +487,7 @@ Error NetworkManager::StopInstanceNetwork(const String& instanceID, const String if (auto errClear = ClearNetwork(it->mSecond); !errClear.IsNone()) { LOG_WRN() << "Failed to clear network" << Log::Field("networkID", networkID) << Log::Field(errClear); } else { - mPhysicalNetworks.Remove(networkID); + (void)mPhysicalNetworks.Remove(networkID); } } } @@ -519,7 +519,7 @@ Error NetworkManager::ReleaseInstanceNetwork(const String& instanceID, const Str instanceIdent = itInfo->mSecond.mNetworkConfig.mInstanceIdent; found = true; - mInstanceNetworkInfos.Remove(instanceID); + (void)mInstanceNetworkInfos.Remove(instanceID); } } @@ -553,7 +553,7 @@ Error NetworkManager::ReleaseInstanceNetwork(const String& instanceID, const Str return ErrorEnum::eNone; } - mNetworkProviders.Remove(networkID); + (void)mNetworkProviders.Remove(networkID); } if (auto err = mStorage->RemoveNetworkInfo(networkID); !err.IsNone()) { @@ -593,7 +593,7 @@ Error NetworkManager::BeginBatch() auto cleanupStorage = DeferRelease(this, [&err](NetworkManager* self) { if (!err.IsNone()) { - self->mStorage->RollbackTransaction(); + (void)self->mStorage->RollbackTransaction(); } }); @@ -603,7 +603,7 @@ Error NetworkManager::BeginBatch() auto cleanupFirewall = DeferRelease(this, [&err](NetworkManager* self) { if (!err.IsNone()) { - self->mFirewall->AbortBatch(); + (void)self->mFirewall->AbortBatch(); } }); @@ -621,8 +621,8 @@ Error NetworkManager::FlushBatch(Array>& failedInstanceIDs) if (auto err = mFirewall->FlushBatch(); !err.IsNone()) { LOG_ERR() << "Failed to flush firewall batch" << Log::Field(err); - mNetMonitor->AbortBatch(); - mStorage->RollbackTransaction(); + (void)mNetMonitor->AbortBatch(); + (void)mStorage->RollbackTransaction(); ReapplyBatchEntries(failedInstanceIDs); ClearBatchState(); @@ -633,8 +633,8 @@ Error NetworkManager::FlushBatch(Array>& failedInstanceIDs) if (auto err = mNetMonitor->FlushBatch(); !err.IsNone()) { LOG_ERR() << "Failed to flush traffic monitor batch" << Log::Field(err); - mFirewall->Revert(); - mStorage->RollbackTransaction(); + (void)mFirewall->Revert(); + (void)mStorage->RollbackTransaction(); ReapplyBatchEntries(failedInstanceIDs); ClearBatchState(); @@ -645,12 +645,12 @@ Error NetworkManager::FlushBatch(Array>& failedInstanceIDs) if (auto err = mStorage->CommitTransaction(); !err.IsNone()) { LOG_ERR() << "Failed to commit batch transaction" << Log::Field(err); - mFirewall->Revert(); - mNetMonitor->Revert(); - mStorage->RollbackTransaction(); + (void)mFirewall->Revert(); + (void)mNetMonitor->Revert(); + (void)mStorage->RollbackTransaction(); for (const auto& entry : mBatchEntries) { - failedInstanceIDs.PushBack(entry.mInstanceID); + (void)failedInstanceIDs.PushBack(entry.mInstanceID); } } @@ -666,7 +666,7 @@ void NetworkManager::ReapplyBatchEntries(Array>& failedInst LOG_ERR() << "Failed to reapply instance policy" << Log::Field("instanceID", entry.mInstanceID) << Log::Field(err); - failedInstanceIDs.PushBack(entry.mInstanceID); + (void)failedInstanceIDs.PushBack(entry.mInstanceID); } } } @@ -773,14 +773,14 @@ Error NetworkManager::PrepareUpdateItemNetworkParams( if (!params.mInstanceIdent.mItemID.IsEmpty() && !params.mInstanceIdent.mSubjectID.IsEmpty()) { StaticString host; - host.Format("%d.%s.%s", params.mInstanceIdent.mInstance, params.mInstanceIdent.mSubjectID.CStr(), + (void)host.Format("%d.%s.%s", params.mInstanceIdent.mInstance, params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr()); if (auto err = serviceData.mHosts.PushBack(host); !err.IsNone()) { return AOS_ERROR_WRAP(err); } - host.Format("%d.%s.%s.%s", params.mInstanceIdent.mInstance, params.mInstanceIdent.mSubjectID.CStr(), + (void)host.Format("%d.%s.%s.%s", params.mInstanceIdent.mInstance, params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr(), networkID.CStr()); if (auto err = serviceData.mHosts.PushBack(host); !err.IsNone()) { @@ -788,13 +788,13 @@ Error NetworkManager::PrepareUpdateItemNetworkParams( } if (params.mInstanceIdent.mInstance == 0) { - host.Format("%s.%s", params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr()); + (void)host.Format("%s.%s", params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr()); if (auto err = serviceData.mHosts.PushBack(host); !err.IsNone()) { return AOS_ERROR_WRAP(err); } - host.Format("%s.%s.%s", params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr(), + (void)host.Format("%s.%s.%s", params.mInstanceIdent.mSubjectID.CStr(), params.mInstanceIdent.mItemID.CStr(), networkID.CStr()); if (auto err = serviceData.mHosts.PushBack(host); !err.IsNone()) { @@ -1111,7 +1111,7 @@ Error NetworkManager::EnsureNodeNetworkPhysical(const String& networkID) } if (auto err = mPhysicalNetworks.PushBack(networkID); !err.IsNone()) { - ClearNetwork(it->mSecond); + (void)ClearNetwork(it->mSecond); return AOS_ERROR_WRAP(err); } @@ -1609,7 +1609,7 @@ Error NetworkManager::ClearNetwork(const NetworkInfo& networkInfo) err = AOS_ERROR_WRAP(errRemove); } - mDNSServers.Remove(networkInfo.mNetworkID); + (void)mDNSServers.Remove(networkInfo.mNetworkID); } if (auto errMasq = mFirewall->RemoveMasquerade(networkInfo.mSubnet, networkInfo.mBridgeIfName); @@ -1666,7 +1666,7 @@ Error NetworkManager::PrepareHosts(const String& instanceID, const String& netwo if (!network.mInstanceIdent.mItemID.IsEmpty() && !network.mInstanceIdent.mSubjectID.IsEmpty()) { StaticString host; - host.Format("%d.%s.%s", network.mInstanceIdent.mInstance, network.mInstanceIdent.mSubjectID.CStr(), + (void)host.Format("%d.%s.%s", network.mInstanceIdent.mInstance, network.mInstanceIdent.mSubjectID.CStr(), network.mInstanceIdent.mItemID.CStr()); if (auto err = PushHostWithDomain(host, networkID, hosts); !err.IsNone()) { @@ -1674,7 +1674,7 @@ Error NetworkManager::PrepareHosts(const String& instanceID, const String& netwo } if (network.mInstanceIdent.mInstance == 0) { - host.Format("%s.%s", network.mInstanceIdent.mSubjectID.CStr(), network.mInstanceIdent.mItemID.CStr()); + (void)host.Format("%s.%s", network.mInstanceIdent.mSubjectID.CStr(), network.mInstanceIdent.mItemID.CStr()); if (auto err = PushHostWithDomain(host, networkID, hosts); !err.IsNone()) { return err; @@ -1879,7 +1879,7 @@ Error NetworkManager::CreateNetwork(const NetworkInfo& network) auto cleanupBridge = DeferRelease(&network, [this, &err, bridgeCreated](const NetworkInfo* network) { if (!err.IsNone() && bridgeCreated) { - mNetIf->DeleteLink(network->mBridgeIfName); + (void)mNetIf->DeleteLink(network->mBridgeIfName); } }); @@ -1904,7 +1904,7 @@ Error NetworkManager::CreateNetwork(const NetworkInfo& network) auto cleanupVlan = DeferRelease(&network, [this, &err, vlanCreated](const NetworkInfo* network) { if (!err.IsNone() && vlanCreated) { - mNetIf->DeleteLink(network->mVlanIfName); + (void)mNetIf->DeleteLink(network->mVlanIfName); } }); @@ -1959,7 +1959,7 @@ Error NetworkManager::GenerateIfName(String& ifName, const String& ifPrefix) { ifName.Clear(); - ifName.Append(ifPrefix); + (void)ifName.Append(ifPrefix); String randomString = String(ifName.Get() + ifPrefix.Size(), ifName.MaxSize() - ifPrefix.Size()); @@ -1967,7 +1967,7 @@ Error NetworkManager::GenerateIfName(String& ifName, const String& ifPrefix) return AOS_ERROR_WRAP(err); } - ifName.Resize(ifName.Size() + randomString.Size()); + (void)ifName.Resize(ifName.Size() + randomString.Size()); return ErrorEnum::eNone; } From d587d9eb41195f7262d410834758789541d63f96 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Wed, 5 Aug 2026 14:39:22 +0300 Subject: [PATCH 7/9] sonar: skip external headers for scan Signed-off-by: Mykola Kobets --- sonar-project.properties | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index 2622a4c63..bf6145296 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,11 @@ sonar.projectKey=aosedge_aos_core_lib_cpp sonar.organization=aosedge sonar.sources=src/ -sonar.exclusions=**/tests/** +sonar.exclusions=**/tests/**,\ + **/pkcs11/cryptoki/**,\ + **/crypto/mbedtls/drivers/**,\ + **/crypto/mbedtls/mbedtls_config.h,\ + **/crypto/mbedtls/pkcs11.h sonar.tests=src/ sonar.test.inclusions=**/tests/** From be7e6a514f045ea8f8b52778e2ed2eb7852b2b30 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Wed, 5 Aug 2026 14:40:12 +0300 Subject: [PATCH 8/9] all: fix cpp:M23_058 issue Replace this builtin type with an alias that makes the type size explicit Signed-off-by: Mykola Kobets --- src/core/cm/launcher/balancer.cpp | 4 +- src/core/cm/launcher/instance.cpp | 2 +- src/core/cm/launcher/node.cpp | 8 +- src/core/cm/launcher/nodemanager.cpp | 2 +- src/core/cm/launcher/storagestate.cpp | 9 +- src/core/common/crypto/asn1.cpp | 2 +- src/core/common/crypto/cryptohelper.hpp | 4 +- src/core/common/crypto/itf/asn1.hpp | 10 +- src/core/common/crypto/itf/privkey.hpp | 2 +- .../common/crypto/mbedtls/cryptoprovider.cpp | 182 +++++++++--------- .../common/crypto/mbedtls/cryptoprovider.hpp | 6 +- .../common/crypto/mbedtls/driverwrapper.cpp | 13 +- .../common/crypto/openssl/cryptoprovider.cpp | 150 +++++++-------- .../common/crypto/openssl/cryptoprovider.hpp | 2 +- .../common/crypto/openssl/opensslprovider.cpp | 38 ++-- .../common/crypto/openssl/opensslprovider.hpp | 2 +- src/core/common/ocispec/itf/imagespec.hpp | 4 +- src/core/common/pkcs11/pkcs11.cpp | 62 +++--- src/core/common/pkcs11/pkcs11.hpp | 2 +- src/core/common/tools/enum.hpp | 2 +- src/core/common/tools/error.hpp | 14 +- src/core/common/tools/fs.cpp | 6 +- src/core/common/tools/fs.hpp | 4 +- src/core/common/tools/log.hpp | 4 +- src/core/common/tools/semver.cpp | 10 +- src/core/common/tools/semver.hpp | 2 +- src/core/common/tools/string.hpp | 6 +- src/core/common/tools/thread.hpp | 4 +- src/core/common/tools/time.hpp | 4 +- src/core/common/tools/utils.hpp | 3 +- src/core/common/tools/variant.hpp | 14 +- src/core/common/types/common.hpp | 2 +- .../certhandler/certmodules/pkcs11/pkcs11.cpp | 4 +- .../certhandler/certmodules/pkcs11/pkcs11.hpp | 2 +- 34 files changed, 294 insertions(+), 291 deletions(-) diff --git a/src/core/cm/launcher/balancer.cpp b/src/core/cm/launcher/balancer.cpp index d0b4fde16..853b36819 100644 --- a/src/core/cm/launcher/balancer.cpp +++ b/src/core/cm/launcher/balancer.cpp @@ -139,7 +139,7 @@ Error Balancer::ScheduleInstance(SharedPtr& instance, const oci::Index return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int*) { instance->ResetConfigs(); }); + auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int32_t*) { instance->ResetConfigs(); }); if (auto err = instance->LoadConfigs(imageDescriptor); !err.IsNone()) { return AOS_ERROR_WRAP(Error(err, "can't load instance configs")); @@ -438,7 +438,7 @@ Error Balancer::PerformPolicyBalancing(Array>& instances) } // Load configs - auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int*) { instance->ResetConfigs(); }); + auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int32_t*) { instance->ResetConfigs(); }); if (auto err = instance->LoadConfigs(*imageDescriptor); !err.IsNone()) { LOG_ERR() << "Can't load configs" << Log::Field("instance", id) << Log::Field(err); diff --git a/src/core/cm/launcher/instance.cpp b/src/core/cm/launcher/instance.cpp index ae71e84f5..effa34541 100644 --- a/src/core/cm/launcher/instance.cpp +++ b/src/core/cm/launcher/instance.cpp @@ -47,7 +47,7 @@ Error Instance::LoadConfigs(const oci::IndexContentDescriptor& imageDescriptor) return AOS_ERROR_WRAP(ErrorEnum::eNoMemory); } - auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int*) { ResetConfigs(); }); + auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int32_t*) { ResetConfigs(); }); if (auto err = mImageInfoProvider.GetItemConfig(imageDescriptor, *mItemConfig); !err.IsNone()) { return AOS_ERROR_WRAP(Error(err, "get item config failed")); } diff --git a/src/core/cm/launcher/node.cpp b/src/core/cm/launcher/node.cpp index 232803ade..9b58ae70d 100644 --- a/src/core/cm/launcher/node.cpp +++ b/src/core/cm/launcher/node.cpp @@ -206,7 +206,7 @@ Error Node::ReserveResources(const InstanceIdent& instanceIdent, const String& r } *availableRAM -= reqRAM; - auto restoreRAM = DeferRelease(reinterpret_cast(1), [&](int*) { *availableRAM += reqRAM; }); + auto restoreRAM = DeferRelease(reinterpret_cast(1), [&](int32_t*) { *availableRAM += reqRAM; }); // Adjust available CPU auto availableCPU = GetPtrToAvailableCPU(runtimeID); @@ -219,7 +219,7 @@ Error Node::ReserveResources(const InstanceIdent& instanceIdent, const String& r } *availableCPU -= reqCPU; - auto restoreCPU = DeferRelease(reinterpret_cast(1), [&](int*) { *availableCPU += reqCPU; }); + auto restoreCPU = DeferRelease(reinterpret_cast(1), [&](int32_t*) { *availableCPU += reqCPU; }); // Adjust max number of instances auto maxNumInstances = GetPtrToMaxNumInstances(runtimeID); @@ -232,11 +232,11 @@ Error Node::ReserveResources(const InstanceIdent& instanceIdent, const String& r } (*maxNumInstances)--; - auto restoreMaxNumInstances = DeferRelease(reinterpret_cast(1), [&](int*) { (*maxNumInstances)++; }); + auto restoreMaxNumInstances = DeferRelease(reinterpret_cast(1), [&](int32_t*) { (*maxNumInstances)++; }); // Adjust shared resources auto curIt = reqResources.begin(); - auto restoreResources = DeferRelease(reinterpret_cast(1), [&](int*) { + auto restoreResources = DeferRelease(reinterpret_cast(1), [&](int32_t*) { for (auto restoreIt = reqResources.begin(); restoreIt != curIt; ++restoreIt) { auto availableResource = mAvailableResources.FindIf( [restoreIt](const ResourceInfo& info) { return info.mName == restoreIt->mName; }); diff --git a/src/core/cm/launcher/nodemanager.cpp b/src/core/cm/launcher/nodemanager.cpp index 6e5d03bc7..768125315 100644 --- a/src/core/cm/launcher/nodemanager.cpp +++ b/src/core/cm/launcher/nodemanager.cpp @@ -133,7 +133,7 @@ Error NodeManager::LoadSMDataForActiveInstances( continue; } - auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int*) { instance->ResetConfigs(); }); + auto releaseConfigs = DeferRelease(reinterpret_cast(1), [&](int32_t*) { instance->ResetConfigs(); }); if (auto err = instance->LoadConfigs(*imageDescriptor); !err.IsNone()) { LOG_ERR() << "Can't load instance configs" << Log::Field("instanceID", instanceID) << Log::Field(AOS_ERROR_WRAP(err)); diff --git a/src/core/cm/launcher/storagestate.cpp b/src/core/cm/launcher/storagestate.cpp index 4c2daf2f0..0f478efc4 100644 --- a/src/core/cm/launcher/storagestate.cpp +++ b/src/core/cm/launcher/storagestate.cpp @@ -87,16 +87,17 @@ Error StorageState::SetupStateStorage(const InstanceIdent& instanceIdent, const auto availableStorage = *mAvailableStorage; *mAvailableStorage = *mAvailableStorage - requestedStorageSize; auto restoreStorageSize - = DeferRelease(reinterpret_cast(1), [&](int*) { *mAvailableStorage = availableStorage; }); + = DeferRelease(reinterpret_cast(1), [&](int32_t*) { *mAvailableStorage = availableStorage; }); // Check available state size if (requestedStateSize > *mAvailableState) { return AOS_ERROR_WRAP(Error(ErrorEnum::eNoMemory, "not enough state space")); } - auto availableState = *mAvailableState; - *mAvailableState = *mAvailableState - requestedStateSize; - auto restoreStateSize = DeferRelease(reinterpret_cast(1), [&](int*) { *mAvailableState = availableState; }); + auto availableState = *mAvailableState; + *mAvailableState = *mAvailableState - requestedStateSize; + auto restoreStateSize + = DeferRelease(reinterpret_cast(1), [&](int32_t*) { *mAvailableState = availableState; }); // Setup storage and state if (auto err = mStorageStateManager->Setup(instanceIdent, setupParams, storagePath, statePath); !err.IsNone()) { diff --git a/src/core/common/crypto/asn1.cpp b/src/core/common/crypto/asn1.cpp index dbe040a09..57d491096 100644 --- a/src/core/common/crypto/asn1.cpp +++ b/src/core/common/crypto/asn1.cpp @@ -10,7 +10,7 @@ namespace aos::crypto::asn1 { RetWithError> ConvertTimeToASN1Str(const Time& time) { - int day = 0, month = 0, year = 0, hour = 0, min = 0, sec = 0; + int32_t day = 0, month = 0, year = 0, hour = 0, min = 0, sec = 0; auto err = time.GetDate(&day, &month, &year); if (!err.IsNone()) { diff --git a/src/core/common/crypto/cryptohelper.hpp b/src/core/common/crypto/cryptohelper.hpp index df8e6b4ae..3961ed212 100644 --- a/src/core/common/crypto/cryptohelper.hpp +++ b/src/core/common/crypto/cryptohelper.hpp @@ -28,7 +28,7 @@ struct RecipientID { * CMS transport information. */ struct TransRecipientInfo { - int mVersion; + int32_t mVersion; RecipientID mRID; asn1::AlgorithmIdentifier mKeyEncryptionAlgorithm; StaticArray mEncryptedKey; @@ -47,7 +47,7 @@ struct EncryptedContentInfo { * CMS envelope data. */ struct EnvelopeData { - int mVersion; + int32_t mVersion; // skip OriginatorInfo originatorInfo `asn1:"optional,implicit,tag:0"` StaticArray mRecipientInfos; // `asn1:"set"` EncryptedContentInfo mEncryptedContent; diff --git a/src/core/common/crypto/itf/asn1.hpp b/src/core/common/crypto/itf/asn1.hpp index e171e86ca..a42436b97 100644 --- a/src/core/common/crypto/itf/asn1.hpp +++ b/src/core/common/crypto/itf/asn1.hpp @@ -33,8 +33,8 @@ using ObjectIdentifier = StaticString; * ASN1 value. */ struct ASN1Value { - int mTagClass {}; - int mTagNumber {}; + int32_t mTagClass {}; + int32_t mTagNumber {}; bool mIsConstructed {}; Array mValue; @@ -51,7 +51,7 @@ struct ASN1Value { * @param isConstructed indicates whether this value is a constructed type (true) or a primitive type (false). * @param content raw content of the ASN.1 value. */ - ASN1Value(int tagClass, int tagNumber, bool isConstructed, const Array& content) + ASN1Value(int32_t tagClass, int32_t tagNumber, bool isConstructed, const Array& content) : mTagClass(tagClass) , mTagNumber(tagNumber) , mIsConstructed(isConstructed) @@ -271,7 +271,7 @@ struct ASN1ParseOptions { /** * Optional tag to match during parsing. */ - Optional mTag; + Optional mTag; }; /** @@ -327,7 +327,7 @@ class ASN1DecoderItf { * @param[out] value result integer. * @return ASN1ParseResult. */ - virtual ASN1ParseResult ReadInteger(const Array& data, const ASN1ParseOptions& opt, int& value) = 0; + virtual ASN1ParseResult ReadInteger(const Array& data, const ASN1ParseOptions& opt, int32_t& value) = 0; /** * Reads a large ASN.1 INTEGER (BigInt) as a byte array. diff --git a/src/core/common/crypto/itf/privkey.hpp b/src/core/common/crypto/itf/privkey.hpp index 63a50783f..922d32c46 100644 --- a/src/core/common/crypto/itf/privkey.hpp +++ b/src/core/common/crypto/itf/privkey.hpp @@ -67,7 +67,7 @@ struct SignOptions { * PKCS1v15 decryption options. */ struct PKCS1v15DecryptionOptions { - int mKeySize = 0; + int32_t mKeySize = 0; }; /** diff --git a/src/core/common/crypto/mbedtls/cryptoprovider.cpp b/src/core/common/crypto/mbedtls/cryptoprovider.cpp index b23847f3c..61b6575b2 100644 --- a/src/core/common/crypto/mbedtls/cryptoprovider.cpp +++ b/src/core/common/crypto/mbedtls/cryptoprovider.cpp @@ -32,8 +32,8 @@ extern "C" { // The following functions became private in mbedtls since 3.6.0. // As a workaround declare them below. -int mbedtls_x509_get_name(unsigned char** p, const unsigned char* end, mbedtls_x509_name* cur); -int mbedtls_x509_write_names(unsigned char** p, unsigned char* start, mbedtls_asn1_named_data* first); +int mbedtls_x509_get_name(uint8_t** p, const uint8_t* end, mbedtls_x509_name* cur); // NOSONAR cpp:M23_058 +int mbedtls_x509_write_names(uint8_t** p, uint8_t* start, mbedtls_asn1_named_data* first); // NOSONAR cpp:M23_058 } namespace aos::crypto { @@ -48,12 +48,12 @@ static constexpr auto cMbedTLSASN1Universal = 0; * Static **********************************************************************************************************************/ -static int ASN1EncodeDERSequence(const Array>& items, unsigned char** p, unsigned char* start) +static int32_t ASN1EncodeDERSequence(const Array>& items, uint8_t** p, uint8_t* start) { - size_t len = 0; - [[maybe_unused]] int ret = 0; + size_t len = 0; + [[maybe_unused]] int32_t ret = 0; - for (int i = items.Size() - 1; i >= 0; i--) { + for (int32_t i = items.Size() - 1; i >= 0; i--) { const auto& item = items[i]; MBEDTLS_ASN1_CHK_ADD(len, mbedtls_asn1_write_raw_buffer(p, start, item.Get(), item.Size())); } @@ -64,13 +64,13 @@ static int ASN1EncodeDERSequence(const Array>& items, unsigned ch return len; } -static int ASN1EncodeObjectIds(const Array& oids, unsigned char** p, unsigned char* start) +static int32_t ASN1EncodeObjectIds(const Array& oids, uint8_t** p, uint8_t* start) { size_t len = 0; // cppcheck-suppress variableScope - int ret; + int32_t ret; - for (int i = oids.Size() - 1; i >= 0; i--) { + for (int32_t i = oids.Size() - 1; i >= 0; i--) { const auto& oid = oids[i]; mbedtls_asn1_buf resOID = {}; @@ -96,10 +96,10 @@ static int ASN1EncodeObjectIds(const Array& oids, unsign return len; } -static int ASN1EncodeBigInt(const Array& number, unsigned char** p, unsigned char* start) +static int32_t ASN1EncodeBigInt(const Array& number, uint8_t** p, uint8_t* start) { - size_t len = 0; - [[maybe_unused]] int ret = 0; + size_t len = 0; + [[maybe_unused]] int32_t ret = 0; // Implementation currently uses a little endian integer format to make ECDSA::Sign(PKCS11)/Verify(mbedtls) // combination work. @@ -111,12 +111,12 @@ static int ASN1EncodeBigInt(const Array& number, unsigned char** p, uns return len; } -static Error ASN1RemoveTag(const Array& src, Array& dst, int tag) +static Error ASN1RemoveTag(const Array& src, Array& dst, int32_t tag) { uint8_t* p = const_cast(src.Get()); size_t len = 0; - int ret = mbedtls_asn1_get_tag(&p, src.end(), &len, tag); + int32_t ret = mbedtls_asn1_get_tag(&p, src.end(), &len, tag); if (ret < 0) { return ret; } @@ -140,7 +140,7 @@ static Error ParseDN(const mbedtls_x509_name& dn, String& result) { (void)result.Resize(result.MaxSize()); - int ret = mbedtls_x509_dn_gets(result.Get(), result.Size(), &dn); + int32_t ret = mbedtls_x509_dn_gets(result.Get(), result.Size(), &dn); if (ret <= 0) { return AOS_ERROR_WRAP(ret); } @@ -163,7 +163,7 @@ static Error ParsePrivateKey(const String& pemCAKey, mbedtls_pk_context& privKey const char* pers = "test"; - int ret = mbedtls_ctr_drbg_seed( + int32_t ret = mbedtls_ctr_drbg_seed( &ctrDrbg, mbedtls_entropy_func, &entropy, reinterpret_cast(pers), strlen(pers)); if (ret != 0) { return AOS_ERROR_WRAP(ret); @@ -197,7 +197,7 @@ static Error CreateClientCert(const mbedtls_x509_csr& csr, const mbedtls_pk_cont return AOS_ERROR_WRAP(err); } - int ret = mbedtls_x509write_crt_set_subject_name(&clientCert, subject.Get()); + int32_t ret = mbedtls_x509write_crt_set_subject_name(&clientCert, subject.Get()); if (ret != 0) { return AOS_ERROR_WRAP(ret); @@ -262,7 +262,8 @@ static Error CreateClientCert(const mbedtls_x509_csr& csr, const mbedtls_pk_cont return aos::ErrorEnum::eNone; } -Error GetASN1Object(const uint8_t** pp, long& length, int& tag, int& xclass, bool& isConstructed, long size) +Error GetASN1Object( + const uint8_t** pp, int64_t& length, int32_t& tag, int32_t& xclass, bool& isConstructed, int64_t size) { if (pp == nullptr || *pp == nullptr || size <= 0) { return AOS_ERROR_WRAP(ErrorEnum::eInvalidArgument); @@ -275,7 +276,7 @@ Error GetASN1Object(const uint8_t** pp, long& length, int& tag, int& xclass, boo uint8_t firstByte = *p; xclass = firstByte & MBEDTLS_ASN1_TAG_CLASS_MASK; isConstructed = (firstByte & MBEDTLS_ASN1_CONSTRUCTED) != 0; - int tagNumber = firstByte & MBEDTLS_ASN1_TAG_VALUE_MASK; + int32_t tagNumber = firstByte & MBEDTLS_ASN1_TAG_VALUE_MASK; p++; // Handle long-form tag. @@ -298,13 +299,13 @@ Error GetASN1Object(const uint8_t** pp, long& length, int& tag, int& xclass, boo tag = tagNumber; // Read length. - size_t len = 0; - int ret = mbedtls_asn1_get_len(const_cast(&p), end, &len); + size_t len = 0; + int32_t ret = mbedtls_asn1_get_len(const_cast(&p), end, &len); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } - length = static_cast(len); + length = static_cast(len); // Set pointer to start of content. *pp = p; @@ -314,7 +315,7 @@ Error GetASN1Object(const uint8_t** pp, long& length, int& tag, int& xclass, boo asn1::ASN1ParseResult ReadASN1Container(const Array& data, const asn1::ASN1ParseOptions& opt, asn1::ASN1ReaderItf& asn1reader, - int expectedUniversalTag) // MBEDTLS_ASN1_SEQUENCE or MBEDTLS_ASN1_SET + int32_t expectedUniversalTag) // MBEDTLS_ASN1_SEQUENCE or MBEDTLS_ASN1_SET { if (opt.mOptional && data.Size() == 0) { return {ErrorEnum::eNone, {}}; @@ -322,10 +323,10 @@ asn1::ASN1ParseResult ReadASN1Container(const Array& data, const asn1:: const uint8_t* p = data.Get(); - long length = 0; - int tag = 0; - int xclass = 0; - bool isConstructed = false; + int64_t length = 0; + int32_t tag = 0; + int32_t xclass = 0; + bool isConstructed = false; // Parse ASN.1 header: tag + length, pointer moves to content start Error err = GetASN1Object(&p, length, tag, xclass, isConstructed, data.Size()); @@ -367,16 +368,16 @@ asn1::ASN1ParseResult ReadASN1Container(const Array& data, const asn1:: } // Iterate over the elements inside the container - const unsigned char* elemPtr = p; - size_t bytesLeft = static_cast(length); + const uint8_t* elemPtr = p; + size_t bytesLeft = static_cast(length); while (bytesLeft > 0) { - long elemLength = 0; - int elemTag = 0; - int elemClass = 0; + int64_t elemLength = 0; + int32_t elemTag = 0; + int32_t elemClass = 0; - const unsigned char* nextPtr = elemPtr; - err = GetASN1Object(&nextPtr, elemLength, elemTag, elemClass, isConstructed, static_cast(bytesLeft)); + const uint8_t* nextPtr = elemPtr; + err = GetASN1Object(&nextPtr, elemLength, elemTag, elemClass, isConstructed, static_cast(bytesLeft)); if (!err.IsNone()) { return {AOS_ERROR_WRAP(Error(ErrorEnum::eFailed, "failed to parse element")), {}}; } @@ -414,7 +415,7 @@ Error VerifyRSASignature(const RSAPublicKey& pubKey, mbedtls_md_type_t hash, x50 mbedtls_rsa_init(&rsa); [[maybe_unused]] auto releaseRSA = DeferRelease(&rsa, mbedtls_rsa_free); - int ret = mbedtls_rsa_import_raw(&rsa, pubKey.GetN().Get(), pubKey.GetN().Size(), nullptr, 0, // P - unused + int32_t ret = mbedtls_rsa_import_raw(&rsa, pubKey.GetN().Get(), pubKey.GetN().Size(), nullptr, 0, // P - unused nullptr, 0, // Q - unused nullptr, 0, // D - unused pubKey.GetE().Get(), pubKey.GetE().Size()); @@ -517,7 +518,7 @@ Error VerifyECDSASignature(const ECDSAPublicKey& pubKey, const Array& d oidBuf.tag = MBEDTLS_ASN1_OID; mbedtls_ecp_group_id grpID; - int ret = mbedtls_oid_get_ec_grp(&oidBuf, &grpID); + int32_t ret = mbedtls_oid_get_ec_grp(&oidBuf, &grpID); if (ret != 0) { return AOS_ERROR_WRAP(ret); } @@ -703,7 +704,7 @@ Error MbedTLSCryptoProvider::PEMToX509Certs(const String& pemBlob, Array(pemBlob.CStr()), pemBlob.Size() + 1); + int32_t ret = mbedtls_x509_crt_parse(&crt, reinterpret_cast(pemBlob.CStr()), pemBlob.Size() + 1); if (ret != 0) { return AOS_ERROR_WRAP(ret); } @@ -760,7 +761,7 @@ Error MbedTLSCryptoProvider::DERToX509Cert(const Array& derBlob, x509:: mbedtls_x509_crt_init(&crt); [[maybe_unused]] auto freeCRT = DeferRelease(&crt, mbedtls_x509_crt_free); - int ret = mbedtls_x509_crt_parse_der(&crt, derBlob.Get(), derBlob.Size()); + int32_t ret = mbedtls_x509_crt_parse_der(&crt, derBlob.Get(), derBlob.Size()); if (ret != 0) { return AOS_ERROR_WRAP(ret); } @@ -772,7 +773,7 @@ Error MbedTLSCryptoProvider::ASN1EncodeDN(const String& commonName, Array& dn, String& resu (void)result.Resize(result.MaxSize()); - int len = mbedtls_x509_dn_gets(result.Get(), result.Size(), &tmpDN); + int32_t len = mbedtls_x509_dn_gets(result.Get(), result.Size(), &tmpDN); mbedtls_asn1_free_named_data_list_shallow(tmpDN.next); if (len < 0) { @@ -849,7 +850,7 @@ Error MbedTLSCryptoProvider::ASN1EncodeObjectIds(const Array& number, Arra (void)asn1Value.Resize(asn1Value.MaxSize()); uint8_t* p = asn1Value.Get() + asn1Value.Size(); - int len = crypto::ASN1EncodeBigInt(number, &p, asn1Value.Get()); + int32_t len = crypto::ASN1EncodeBigInt(number, &p, asn1Value.Get()); if (len < 0) { return len; } @@ -881,7 +882,7 @@ Error MbedTLSCryptoProvider::ASN1EncodeDERSequence(const Array>& uint8_t* start = asn1Value.Get(); uint8_t* p = asn1Value.Get() + asn1Value.Size(); - int len = crypto::ASN1EncodeDERSequence(items, &p, start); + int32_t len = crypto::ASN1EncodeDERSequence(items, &p, start); if (len < 0) { return len; } @@ -975,8 +976,7 @@ RetWithError MbedTLSCryptoProvider::RandInt(uint64_t maxValue) uint64_t result; - if (auto ret = mbedtls_ctr_drbg_random(&ctrDrbg, reinterpret_cast(&result), sizeof(result)); - ret != 0) { + if (auto ret = mbedtls_ctr_drbg_random(&ctrDrbg, reinterpret_cast(&result), sizeof(result)); ret != 0) { return {0, AOS_ERROR_WRAP(ret)}; } @@ -1042,7 +1042,7 @@ RetWithError MbedTLSCryptoProvider::CreateUUIDv5(const uuid::UUID& s (void)sha1.Resize(sha1.MaxSize()); - int ret = mbedtls_sha1(buffer.Get(), buffer.Size(), sha1.Get()); + int32_t ret = mbedtls_sha1(buffer.Get(), buffer.Size(), sha1.Get()); if (ret != 0) { return {{}, AOS_ERROR_WRAP(ret)}; } @@ -1154,19 +1154,19 @@ Error MbedTLSCryptoProvider::Verify(const Array& rootCerts, // Load root certificates. for (const auto& r : rootCerts) { - int ret = mbedtls_x509_crt_parse(&root, r.mRaw.Get(), r.mRaw.Size()); + int32_t ret = mbedtls_x509_crt_parse(&root, r.mRaw.Get(), r.mRaw.Size()); if (ret != 0) { return AOS_ERROR_WRAP(ret); } } // Load intermediate certificates. - if (int ret = mbedtls_x509_crt_parse(&interm, cert.mRaw.Get(), cert.mRaw.Size()); ret != 0) { + if (int32_t ret = mbedtls_x509_crt_parse(&interm, cert.mRaw.Get(), cert.mRaw.Size()); ret != 0) { return AOS_ERROR_WRAP(ret); } for (const auto& i : intermCerts) { - int ret = mbedtls_x509_crt_parse(&interm, i.mRaw.Get(), i.mRaw.Size()); + int32_t ret = mbedtls_x509_crt_parse(&interm, i.mRaw.Get(), i.mRaw.Size()); if (ret != 0) { return AOS_ERROR_WRAP(ret); } @@ -1175,7 +1175,7 @@ Error MbedTLSCryptoProvider::Verify(const Array& rootCerts, // Verify target certificate. uint32_t flags = 0; - int ret = mbedtls_x509_crt_verify( + int32_t ret = mbedtls_x509_crt_verify( &interm, &root, nullptr, nullptr, &flags, &MbedTLSCryptoProvider::VerifyTime, &curTime); if (ret != 0) { char vrfyBuff[256]; @@ -1202,10 +1202,10 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadStruct( return {AOS_ERROR_WRAP(ErrorEnum::eFailed), {}}; } - int tag = *p++; - int xclass = tag & MBEDTLS_ASN1_TAG_CLASS_MASK; - int tagnum = tag & MBEDTLS_ASN1_TAG_VALUE_MASK; - bool isConstructed = (tag & MBEDTLS_ASN1_CONSTRUCTED) != 0; + int32_t tag = *p++; + int32_t xclass = tag & MBEDTLS_ASN1_TAG_CLASS_MASK; + int32_t tagnum = tag & MBEDTLS_ASN1_TAG_VALUE_MASK; + bool isConstructed = (tag & MBEDTLS_ASN1_CONSTRUCTED) != 0; // Validate tag if specified if (opt.mTag.HasValue()) { @@ -1234,7 +1234,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadStruct( // Read length size_t len = 0; - int ret = mbedtls_asn1_get_len(&p, end, &len); + int32_t ret = mbedtls_asn1_get_len(&p, end, &len); if (ret != 0) { return {AOS_ERROR_WRAP(ErrorEnum::eFailed), {}}; } @@ -1273,7 +1273,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadSequence( } asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadInteger( - const Array& data, const asn1::ASN1ParseOptions& opt, int& value) + const Array& data, const asn1::ASN1ParseOptions& opt, int32_t& value) { if (opt.mOptional && data.Size() == 0) { return {ErrorEnum::eNotFound, data}; @@ -1282,7 +1282,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadInteger( const uint8_t* p = data.Get(); const uint8_t* end = p + data.Size(); - int ret = mbedtls_asn1_get_int(const_cast(&p), end, &value); + int32_t ret = mbedtls_asn1_get_int(const_cast(&p), end, &value); if (ret != 0) { if (opt.mOptional) { return {AOS_ERROR_WRAP(ErrorEnum::eNotFound), data}; @@ -1311,7 +1311,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadBigInt( mbedtls_mpi_init(&mpi); [[maybe_unused]] auto mpiRelease = DeferRelease(&mpi, mbedtls_mpi_free); - int ret = mbedtls_asn1_get_mpi(const_cast(&p), end, &mpi); + int32_t ret = mbedtls_asn1_get_mpi(const_cast(&p), end, &mpi); if (ret != 0) { if (opt.mOptional) { return {AOS_ERROR_WRAP(ErrorEnum::eNotFound), data}; @@ -1346,7 +1346,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadOID( mbedtls_asn1_buf buf {}; // Parse the OID tag and length - int ret = mbedtls_asn1_get_tag(const_cast(&p), end, &buf.len, MBEDTLS_ASN1_OID); + int32_t ret = mbedtls_asn1_get_tag(const_cast(&p), end, &buf.len, MBEDTLS_ASN1_OID); if (ret != 0) { if (opt.mOptional) { return {AOS_ERROR_WRAP(ErrorEnum::eNotFound), data}; @@ -1462,8 +1462,8 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadOctetString( const uint8_t* p = data.Get(); const uint8_t* end = p + data.Size(); - size_t len = 0; - int ret = mbedtls_asn1_get_tag(const_cast(&p), end, &len, MBEDTLS_ASN1_OCTET_STRING); + size_t len = 0; + int32_t ret = mbedtls_asn1_get_tag(const_cast(&p), end, &len, MBEDTLS_ASN1_OCTET_STRING); if (ret != 0) { if (opt.mOptional) { @@ -1499,10 +1499,10 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadRawValue( const uint8_t* p = data.Get(); - long len = 0; - int tag = 0; - int xclass = 0; - bool isConstructed = false; + int64_t len = 0; + int32_t tag = 0; + int32_t xclass = 0; + bool isConstructed = false; Error err = GetASN1Object(&p, len, tag, xclass, isConstructed, data.Size()); if (!err.IsNone()) { @@ -1617,7 +1617,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::Init(const Array& key, c mbedtls_cipher_init(&mCtx); auto releaseCtx = DeferRelease(&mCtx, mbedtls_cipher_free); - int ret = mbedtls_cipher_setup(&mCtx, info); + int32_t ret = mbedtls_cipher_setup(&mCtx, info); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } @@ -1629,7 +1629,7 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::Init(const Array& key, c // Set key (in bits) ret = mbedtls_cipher_setkey( - &mCtx, key.Get(), static_cast(key.Size() * 8), encrypt ? MBEDTLS_ENCRYPT : MBEDTLS_DECRYPT); + &mCtx, key.Get(), static_cast(key.Size() * 8), encrypt ? MBEDTLS_ENCRYPT : MBEDTLS_DECRYPT); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } @@ -1671,8 +1671,8 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::EncryptBlock(const Array (void)output.Resize(output.MaxSize()); - size_t outLen = 0; - int ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); + size_t outLen = 0; + int32_t ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } @@ -1698,8 +1698,8 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::DecryptBlock(const Array (void)output.Resize(output.MaxSize()); - size_t outLen = 0; - int ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); + size_t outLen = 0; + int32_t ret = mbedtls_cipher_update(&mCtx, input.Get(), input.Size(), output.Get(), &outLen); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } @@ -1719,8 +1719,8 @@ Error MbedTLSCryptoProvider::MbedTLSAESCipher::Finalize(Array& output) return AOS_ERROR_WRAP(err); } - size_t outLen = 0; - int ret = mbedtls_cipher_finish(&mCtx, output.Get(), &outLen); + size_t outLen = 0; + int32_t ret = mbedtls_cipher_finish(&mCtx, output.Get(), &outLen); if (ret != 0) { mbedtls_cipher_free(&mCtx); mInitialized = false; @@ -1809,8 +1809,8 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( auto rsa = mbedtls_pk_rsa(*mPrivKey); (void)mResult.Resize(mResult.MaxSize()); - size_t olen = 0; - int ret = mbedtls_rsa_pkcs1_decrypt( + size_t olen = 0; + int32_t ret = mbedtls_rsa_pkcs1_decrypt( rsa, mbedtls_ctr_drbg_random, mDRBG, &olen, mCipher.Get(), mResult.Get(), mResult.Size()); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); @@ -1834,9 +1834,9 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( (void)mResult.Resize(mResult.MaxSize()); - size_t olen = 0; - int ret = mbedtls_rsa_rsaes_oaep_decrypt(rsa, mbedtls_ctr_drbg_random, mDRBG, nullptr, 0, // label - &olen, mCipher.Get(), mResult.Get(), mResult.Size()); + size_t olen = 0; + int32_t ret = mbedtls_rsa_rsaes_oaep_decrypt(rsa, mbedtls_ctr_drbg_random, mDRBG, nullptr, 0, // label + &olen, mCipher.Get(), mResult.Get(), mResult.Size()); if (ret != 0) { return AOS_ERROR_WRAP(ErrorEnum::eFailed); } @@ -1864,7 +1864,7 @@ Error MbedTLSCryptoProvider::MbedTLSRSAPrivKey::Decrypt( const char* pers = "test"; - int ret = mbedtls_ctr_drbg_seed( + int32_t ret = mbedtls_ctr_drbg_seed( &ctrDrbg, mbedtls_entropy_func, &entropy, reinterpret_cast(pers), strlen(pers)); if (ret != 0) { return AOS_ERROR_WRAP(ret); @@ -1882,7 +1882,7 @@ MbedTLSCryptoProvider::MbedTLSRSAPrivKey::~MbedTLSRSAPrivKey() * Private **********************************************************************************************************************/ -int MbedTLSCryptoProvider::VerifyTime(void* data, mbedtls_x509_crt* crt, int, uint32_t* flags) +int32_t MbedTLSCryptoProvider::VerifyTime(void* data, mbedtls_x509_crt* crt, int32_t, uint32_t* flags) { const auto time = static_cast(data); @@ -1930,8 +1930,8 @@ Error MbedTLSCryptoProvider::ParseX509CertPublicKey(const mbedtls_pk_context* pk return ParseECKey(mbedtls_pk_ec(*pk), cert); default: - LOG_ERR() << "Unsupported certificate public key algorithm: type=" << static_cast(mbedtls_pk_get_type(pk)) - << ", only RSA and ECDSA are supported"; + LOG_ERR() << "Unsupported certificate public key algorithm: type=" + << static_cast(mbedtls_pk_get_type(pk)) << ", only RSA and ECDSA are supported"; return AOS_ERROR_WRAP(ErrorEnum::eNotSupported); } @@ -2134,8 +2134,8 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed } if (!memcmp(next->buf.p, MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER, tagLen)) { - unsigned char* p = next->buf.p + tagLen; - err = mbedtls_asn1_get_tag(&p, p + next->buf.len - 2 - tagLen, &tagLen, MBEDTLS_ASN1_OCTET_STRING); + uint8_t* p = next->buf.p + tagLen; + err = mbedtls_asn1_get_tag(&p, p + next->buf.len - 2 - tagLen, &tagLen, MBEDTLS_ASN1_OCTET_STRING); if (err != 0) { return AOS_ERROR_WRAP(err); } @@ -2154,8 +2154,8 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed } if (!memcmp(next->buf.p, MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER, tagLen)) { - unsigned char* p = next->buf.p + tagLen; - size_t len; + uint8_t* p = next->buf.p + tagLen; + size_t len; err = mbedtls_asn1_get_tag(&p, next->buf.p + next->buf.len, &len, MBEDTLS_ASN1_OCTET_STRING); if (err != 0) { @@ -2192,8 +2192,8 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed } if (!memcmp(next->buf.p, MBEDTLS_OID_ISSUER_ALT_NAME, tagLen)) { - unsigned char* p = next->buf.p + tagLen; - size_t len; + uint8_t* p = next->buf.p + tagLen; + size_t len; // Get OCTET STRING containing the extension value ret = mbedtls_asn1_get_tag(&p, next->buf.p + next->buf.len, &len, MBEDTLS_ASN1_OCTET_STRING); @@ -2201,7 +2201,7 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed return AOS_ERROR_WRAP(ret); } - unsigned char* end = p + len; + uint8_t* end = p + len; // Iterate over GeneralNames sequence while (p < end) { @@ -2213,7 +2213,7 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed return AOS_ERROR_WRAP(ret); } - unsigned char* gnEnd = p + gnLen; + uint8_t* gnEnd = p + gnLen; // Parse context-specific tag 6 (GEN_URI) ret = mbedtls_asn1_get_tag(&p, gnEnd, &gnLen, MBEDTLS_ASN1_CONTEXT_SPECIFIC | 6); @@ -2286,7 +2286,7 @@ Error MbedTLSCryptoProvider::SetCSRAlternativeNames(mbedtls_x509write_csr& csr, sanList[i].node.san.unstructured_name.tag = MBEDTLS_ASN1_IA5_STRING; sanList[i].node.san.unstructured_name.len = templ.mDNSNames[i].Size(); sanList[i].node.san.unstructured_name.p - = reinterpret_cast(const_cast(templ.mDNSNames[i].Get())); + = reinterpret_cast(const_cast(templ.mDNSNames[i].Get())); sanList[i].next = (i < dnsNameCount - 1) ? &sanList[i + 1] : nullptr; } diff --git a/src/core/common/crypto/mbedtls/cryptoprovider.hpp b/src/core/common/crypto/mbedtls/cryptoprovider.hpp index 7b1f43b61..78895884d 100644 --- a/src/core/common/crypto/mbedtls/cryptoprovider.hpp +++ b/src/core/common/crypto/mbedtls/cryptoprovider.hpp @@ -295,7 +295,7 @@ class MbedTLSCryptoProvider : public CryptoProviderItf { * @return ASN1ParseResult. */ asn1::ASN1ParseResult ReadInteger( - const Array& data, const asn1::ASN1ParseOptions& opt, int& value) override; + const Array& data, const asn1::ASN1ParseOptions& opt, int32_t& value) override; /** * Reads a large ASN.1 INTEGER (BigInt) as a byte array. @@ -397,8 +397,8 @@ class MbedTLSCryptoProvider : public CryptoProviderItf { mutable mbedtls_pk_context mPrivKey; }; - static int VerifyTime(void* data, mbedtls_x509_crt* crt, int depth, uint32_t* flags); - static RetWithError