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/** diff --git a/src/core/cm/alerts/alerts.cpp b/src/core/cm/alerts/alerts.cpp index 2242134a4..b5b48e677 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); @@ -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/config.hpp b/src/core/cm/imagemanager/config.hpp index 53f9cb496..262b6b4a4 100644 --- a/src/core/cm/imagemanager/config.hpp +++ b/src/core/cm/imagemanager/config.hpp @@ -27,11 +27,11 @@ struct Config { * @param other config to compare. * @return bool. */ - bool operator==(const Config& other) const + friend bool operator==(const Config& lhs, const Config& other) { - return mInstallPath == other.mInstallPath && mDownloadPath == other.mDownloadPath - && mUpdateItemTTL == other.mUpdateItemTTL && mRemoveOutdatedPeriod == other.mRemoveOutdatedPeriod; - } + return lhs.mInstallPath == other.mInstallPath && lhs.mDownloadPath == other.mDownloadPath + && lhs.mUpdateItemTTL == other.mUpdateItemTTL && lhs.mRemoveOutdatedPeriod == other.mRemoveOutdatedPeriod; + }; /** * Compares config. @@ -39,7 +39,7 @@ struct Config { * @param other config to compare. * @return bool. */ - bool operator!=(const Config& other) const { return !operator==(other); } + friend bool operator!=(const Config& lhs, const Config& other) { return !(lhs == other); }; }; } // namespace aos::cm::imagemanager diff --git a/src/core/cm/imagemanager/imagemanager.cpp b/src/core/cm/imagemanager/imagemanager.cpp index 9ec61bdbe..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()) { @@ -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) @@ -560,9 +558,9 @@ 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; }); + (void)mCondVar.Wait(lock, cRetryTimeout, [this]() { return mCancel; }); if (mCancel) { return ErrorEnum::eCanceled; @@ -609,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); @@ -792,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); } } @@ -948,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(); } }); @@ -996,13 +994,13 @@ Error ImageManager::LoadManifest(const String& digest, const ArrayRelease(); + (void)space->Release(); return; } if (space) { - space->Accept(); + (void)space->Accept(); } }); @@ -1044,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(); } }); @@ -1101,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); } @@ -1112,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); @@ -1121,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); @@ -1285,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; @@ -1300,7 +1298,7 @@ Error ImageManager::PerformDownload(const BlobInfo& blobInfo, const String& down return AOS_ERROR_WRAP(allocationErr); } - downloadingSpace->Accept(); + (void)downloadingSpace->Accept(); return err; } @@ -1420,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; @@ -1440,7 +1438,7 @@ void ImageManager::StopAction() LockGuard lock {mMutex}; mInProgress = false; - mCondVar.NotifyAll(); + (void)mCondVar.NotifyAll(); } void ImageManager::NotifyItemsStatusesChanged(const Array& statuses) @@ -1463,7 +1461,7 @@ void ImageManager::NotifyItemStatusChanged( { StaticArray status; - status.Resize(1); + (void)status.Resize(1); status[0].mItemID = itemID; status[0].mType = type; @@ -1685,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/imagemanager/itf/storage.hpp b/src/core/cm/imagemanager/itf/storage.hpp index bb033e80e..4c075ed88 100644 --- a/src/core/cm/imagemanager/itf/storage.hpp +++ b/src/core/cm/imagemanager/itf/storage.hpp @@ -29,11 +29,11 @@ struct ItemInfo { * @param rhs update item info to compare with. * @return bool. */ - bool operator==(const ItemInfo& rhs) const + friend bool operator==(const ItemInfo& lhs, const ItemInfo& rhs) { - return mItemID == rhs.mItemID && mVersion == rhs.mVersion && mIndexDigest == rhs.mIndexDigest - && mState == rhs.mState && mTimestamp == rhs.mTimestamp; - } + return lhs.mItemID == rhs.mItemID && lhs.mVersion == rhs.mVersion && lhs.mIndexDigest == rhs.mIndexDigest + && lhs.mState == rhs.mState && lhs.mTimestamp == rhs.mTimestamp; + }; /** * Compares update item info. @@ -41,7 +41,7 @@ struct ItemInfo { * @param rhs update item info to compare with. * @return bool. */ - bool operator!=(const ItemInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const ItemInfo& lhs, const ItemInfo& rhs) { return !(lhs == rhs); }; }; /** diff --git a/src/core/cm/launcher/balancer.cpp b/src/core/cm/launcher/balancer.cpp index 1e5ea27db..853b36819 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); } } @@ -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")); @@ -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; }); } @@ -437,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/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 a360a65c0..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")); } @@ -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; @@ -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/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/itf/types.hpp b/src/core/cm/launcher/itf/types.hpp index 5a340cf45..b18302279 100644 --- a/src/core/cm/launcher/itf/types.hpp +++ b/src/core/cm/launcher/itf/types.hpp @@ -65,14 +65,15 @@ struct InstanceInfo { * @param other instance info to compare with. * @return bool. */ - bool operator==(const InstanceInfo& rhs) const + friend bool operator==(const InstanceInfo& lhs, const InstanceInfo& rhs) { - return mInstanceIdent == rhs.mInstanceIdent && mManifestDigest == rhs.mManifestDigest && mNodeID == rhs.mNodeID - && mPrevNodeID == rhs.mPrevNodeID && mRuntimeID == rhs.mRuntimeID && mUID == rhs.mUID && mGID == rhs.mGID - && mTimestamp == rhs.mTimestamp && mState == rhs.mState && mIsUnitSubject == rhs.mIsUnitSubject - && mVersion == rhs.mVersion && mOwnerID == rhs.mOwnerID && mSubjectType == rhs.mSubjectType - && mLabels == rhs.mLabels && mPriority == rhs.mPriority && mDisableRebalancing == rhs.mDisableRebalancing; - } + return lhs.mInstanceIdent == rhs.mInstanceIdent && lhs.mManifestDigest == rhs.mManifestDigest + && lhs.mNodeID == rhs.mNodeID && lhs.mPrevNodeID == rhs.mPrevNodeID && lhs.mRuntimeID == rhs.mRuntimeID + && lhs.mUID == rhs.mUID && lhs.mGID == rhs.mGID && lhs.mTimestamp == rhs.mTimestamp + && lhs.mState == rhs.mState && lhs.mIsUnitSubject == rhs.mIsUnitSubject && lhs.mVersion == rhs.mVersion + && lhs.mOwnerID == rhs.mOwnerID && lhs.mSubjectType == rhs.mSubjectType && lhs.mLabels == rhs.mLabels + && lhs.mPriority == rhs.mPriority && lhs.mDisableRebalancing == rhs.mDisableRebalancing; + }; /** * Compares instance info. @@ -80,7 +81,7 @@ struct InstanceInfo { * @param rhs instance info to compare with. * @return bool. */ - bool operator!=(const InstanceInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const InstanceInfo& lhs, const InstanceInfo& rhs) { return !(lhs == rhs); }; }; /* @@ -102,12 +103,13 @@ struct RunInstanceRequest { * @param other run instance request to compare. * @return bool. */ - bool operator==(const RunInstanceRequest& other) const + friend bool operator==(const RunInstanceRequest& lhs, const RunInstanceRequest& other) { - return mItemID == other.mItemID && mUpdateItemType == other.mUpdateItemType && mVersion == other.mVersion - && mOwnerID == other.mOwnerID && mSubjectInfo == other.mSubjectInfo && mPriority == other.mPriority - && mNumInstances == other.mNumInstances && mLabels == other.mLabels; - } + return lhs.mItemID == other.mItemID && lhs.mUpdateItemType == other.mUpdateItemType + && lhs.mVersion == other.mVersion && lhs.mOwnerID == other.mOwnerID + && lhs.mSubjectInfo == other.mSubjectInfo && lhs.mPriority == other.mPriority + && lhs.mNumInstances == other.mNumInstances && lhs.mLabels == other.mLabels; + }; /** * Compares run instance request. @@ -115,7 +117,7 @@ struct RunInstanceRequest { * @param other run instance request to compare. * @return bool. */ - bool operator!=(const RunInstanceRequest& other) const { return !operator==(other); } + friend bool operator!=(const RunInstanceRequest& lhs, const RunInstanceRequest& other) { return !(lhs == other); }; }; /** @}*/ 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..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; }); @@ -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..768125315 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; } @@ -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)); @@ -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..0f478efc4 100644 --- a/src/core/cm/launcher/storagestate.cpp +++ b/src/core/cm/launcher/storagestate.cpp @@ -87,24 +87,25 @@ 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()) { 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/launcher/utils.hpp b/src/core/cm/launcher/utils.hpp index 65acd5b15..7c830f608 100644 --- a/src/core/cm/launcher/utils.hpp +++ b/src/core/cm/launcher/utils.hpp @@ -48,8 +48,8 @@ class FilterIterator { return tmp; } - bool operator==(const FilterIterator& other) const { return mIt == other.mIt; } - bool operator!=(const FilterIterator& other) const { return mIt != other.mIt; } + friend bool operator==(const FilterIterator& lhs, const FilterIterator& other) { return lhs.mIt == other.mIt; }; + friend bool operator!=(const FilterIterator& lhs, const FilterIterator& other) { return lhs.mIt != other.mIt; }; auto& operator*() const { return *mIt; } auto operator->() const { return mIt; } 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/itf/sminforeceiver.hpp b/src/core/cm/nodeinfoprovider/itf/sminforeceiver.hpp index 2662d69a0..6c41ba23d 100644 --- a/src/core/cm/nodeinfoprovider/itf/sminforeceiver.hpp +++ b/src/core/cm/nodeinfoprovider/itf/sminforeceiver.hpp @@ -26,10 +26,11 @@ struct SMInfo { * @param status SM status to compare with. * @return bool. */ - bool operator==(const SMInfo& status) const + friend bool operator==(const SMInfo& lhs, const SMInfo& status) { - return mNodeID == status.mNodeID && mResources == status.mResources && mRuntimes == status.mRuntimes; - } + return lhs.mNodeID == status.mNodeID && lhs.mResources == status.mResources + && lhs.mRuntimes == status.mRuntimes; + }; /** * Compares SM info. @@ -37,7 +38,7 @@ struct SMInfo { * @param status SM info to compare with. * @return bool. */ - bool operator!=(const SMInfo& status) const { return !operator==(status); } + friend bool operator!=(const SMInfo& lhs, const SMInfo& status) { return !(lhs == status); }; }; /** 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/itf/storage.hpp b/src/core/cm/storagestate/itf/storage.hpp index da5d7c99b..bc162d343 100644 --- a/src/core/cm/storagestate/itf/storage.hpp +++ b/src/core/cm/storagestate/itf/storage.hpp @@ -31,11 +31,11 @@ struct InstanceInfo { * @param instance instance to compare with. * @return bool. */ - bool operator==(const InstanceInfo& instance) const + friend bool operator==(const InstanceInfo& lhs, const InstanceInfo& instance) { - return mInstanceIdent == instance.mInstanceIdent && mStorageQuota == instance.mStorageQuota - && mStateQuota == instance.mStateQuota && mStateChecksum == instance.mStateChecksum; - } + return lhs.mInstanceIdent == instance.mInstanceIdent && lhs.mStorageQuota == instance.mStorageQuota + && lhs.mStateQuota == instance.mStateQuota && lhs.mStateChecksum == instance.mStateChecksum; + }; /** * Compares instance info. @@ -43,7 +43,7 @@ struct InstanceInfo { * @param instance instance to compare with. * @return bool. */ - bool operator!=(const InstanceInfo& instance) const { return !operator==(instance); } + friend bool operator!=(const InstanceInfo& lhs, const InstanceInfo& instance) { return !(lhs == instance); }; }; using InstanceInfoArray = StaticArray; 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/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/cm/updatemanager/config.hpp b/src/core/cm/updatemanager/config.hpp index 51037cb5a..361cd5bce 100644 --- a/src/core/cm/updatemanager/config.hpp +++ b/src/core/cm/updatemanager/config.hpp @@ -23,7 +23,10 @@ struct Config { * @param rhs config to compare. * @return bool. */ - bool operator==(const Config& rhs) const { return mUnitStatusSendTimeout == rhs.mUnitStatusSendTimeout; } + friend bool operator==(const Config& lhs, const Config& rhs) + { + return lhs.mUnitStatusSendTimeout == rhs.mUnitStatusSendTimeout; + }; /** * Compares config. @@ -31,7 +34,7 @@ struct Config { * @param other config to compare. * @return bool. */ - bool operator!=(const Config& rhs) const { return !operator==(rhs); } + friend bool operator!=(const Config& lhs, const Config& rhs) { return !(lhs == rhs); }; }; } // namespace aos::cm::updatemanager 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..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()) { @@ -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/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..b07971e2e 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) @@ -83,11 +83,11 @@ struct ASN1Value { * @param other another ASN1Value to compare with. * @return bool. */ - bool operator==(const ASN1Value& other) const + friend bool operator==(const ASN1Value& lhs, const ASN1Value& other) { - return mTagClass == other.mTagClass && mTagNumber == other.mTagNumber && mIsConstructed == other.mIsConstructed - && mValue == other.mValue; - } + return lhs.mTagClass == other.mTagClass && lhs.mTagNumber == other.mTagNumber + && lhs.mIsConstructed == other.mIsConstructed && lhs.mValue == other.mValue; + }; /** * Compares ASN1Value. @@ -95,7 +95,7 @@ struct ASN1Value { * @param other another ASN1Value to compare with. * @return bool. */ - bool operator!=(const ASN1Value& other) const { return !(*this == other); } + friend bool operator!=(const ASN1Value& lhs, const ASN1Value& other) { return !(lhs == other); }; }; /** @@ -119,14 +119,17 @@ struct Extension { * @param extension object to compare with. * @return bool. */ - bool operator==(const Extension& extension) const { return extension.mID == mID && extension.mValue == mValue; } + friend bool operator==(const Extension& lhs, const Extension& extension) + { + return extension.mID == lhs.mID && extension.mValue == lhs.mValue; + }; /** * Checks whether current object is not equal the the given one. * * @param extension object to compare with. * @return bool. */ - bool operator!=(const Extension& extension) const { return !operator==(extension); } + friend bool operator!=(const Extension& lhs, const Extension& extension) { return !(lhs == extension); }; }; /** @@ -245,10 +248,10 @@ struct ASN1ParseResult { * @param other another parse result to compare with. * @return bool. */ - bool operator==(const ASN1ParseResult& other) const + friend bool operator==(const ASN1ParseResult& lhs, const ASN1ParseResult& other) { - return mError == other.mError && mRemaining == other.mRemaining; - } + return lhs.mError == other.mError && lhs.mRemaining == other.mRemaining; + }; /** * Compares ASN1 parse results. @@ -256,7 +259,7 @@ struct ASN1ParseResult { * @param other another parse result to compare with. * @return bool. */ - bool operator!=(const ASN1ParseResult& other) const { return !(*this == other); } + friend bool operator!=(const ASN1ParseResult& lhs, const ASN1ParseResult& other) { return !(lhs == other); }; }; /** @@ -271,7 +274,7 @@ struct ASN1ParseOptions { /** * Optional tag to match during parsing. */ - Optional mTag; + Optional mTag; }; /** @@ -327,7 +330,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/cryptohelper.hpp b/src/core/common/crypto/itf/cryptohelper.hpp index 66f931785..e8fe27662 100644 --- a/src/core/common/crypto/itf/cryptohelper.hpp +++ b/src/core/common/crypto/itf/cryptohelper.hpp @@ -71,10 +71,10 @@ struct CertificateInfo { * @param rhs certificate info to compare with. * @return bool. */ - bool operator==(const CertificateInfo& rhs) const + friend bool operator==(const CertificateInfo& lhs, const CertificateInfo& rhs) { - return mCertificate == rhs.mCertificate && mFingerprint == rhs.mFingerprint; - } + return lhs.mCertificate == rhs.mCertificate && lhs.mFingerprint == rhs.mFingerprint; + }; /** * Compares certificate info. @@ -82,7 +82,7 @@ struct CertificateInfo { * @param rhs certificate info to compare with. * @return bool. */ - bool operator!=(const CertificateInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const CertificateInfo& lhs, const CertificateInfo& rhs) { return !(lhs == rhs); }; }; using CertificateInfoArray = StaticArray; @@ -100,10 +100,10 @@ struct CertificateChainInfo { * @param rhs certificate chain info to compare with. * @return bool. */ - bool operator==(const CertificateChainInfo& rhs) const + friend bool operator==(const CertificateChainInfo& lhs, const CertificateChainInfo& rhs) { - return mName == rhs.mName && mFingerprints == rhs.mFingerprints; - } + return lhs.mName == rhs.mName && lhs.mFingerprints == rhs.mFingerprints; + }; /** * Compares certificate chain info. @@ -111,7 +111,7 @@ struct CertificateChainInfo { * @param rhs certificate chain info to compare with. * @return bool. */ - bool operator!=(const CertificateChainInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const CertificateChainInfo& lhs, const CertificateChainInfo& rhs) { return !(lhs == rhs); }; }; using CertificateChainInfoArray = StaticArray; @@ -130,10 +130,10 @@ struct DecryptInfo { * @param rhs decryption info to compare with. * @return bool. */ - bool operator==(const DecryptInfo& rhs) const + friend bool operator==(const DecryptInfo& lhs, const DecryptInfo& rhs) { - return mBlockAlg == rhs.mBlockAlg && mBlockIV == rhs.mBlockIV && mBlockKey == rhs.mBlockKey; - } + return lhs.mBlockAlg == rhs.mBlockAlg && lhs.mBlockIV == rhs.mBlockIV && lhs.mBlockKey == rhs.mBlockKey; + }; /** * Compares decryption info. @@ -141,7 +141,7 @@ struct DecryptInfo { * @param rhs decryption info to compare with. * @return bool. */ - bool operator!=(const DecryptInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const DecryptInfo& lhs, const DecryptInfo& rhs) { return !(lhs == rhs); }; }; /** @@ -159,11 +159,11 @@ struct SignInfo { * @param rhs sign info to compare with. * @return bool. */ - bool operator==(const SignInfo& rhs) const + friend bool operator==(const SignInfo& lhs, const SignInfo& rhs) { - return mChainName == rhs.mChainName && mAlg == rhs.mAlg && mValue == rhs.mValue - && mTrustedTimestamp == rhs.mTrustedTimestamp && mOCSPValues == rhs.mOCSPValues; - } + return lhs.mChainName == rhs.mChainName && lhs.mAlg == rhs.mAlg && lhs.mValue == rhs.mValue + && lhs.mTrustedTimestamp == rhs.mTrustedTimestamp && lhs.mOCSPValues == rhs.mOCSPValues; + }; /** * Compares sign info. @@ -171,7 +171,7 @@ struct SignInfo { * @param rhs sign info to compare with. * @return bool. */ - bool operator!=(const SignInfo& rhs) const { return !operator==(rhs); } + friend bool operator!=(const SignInfo& lhs, const SignInfo& rhs) { return !(lhs == rhs); }; }; /** 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 3bd3e92f3..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; } @@ -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); + int32_t 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; } @@ -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); @@ -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,12 +257,13 @@ 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; } -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); } @@ -746,7 +747,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; } @@ -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,14 +773,14 @@ 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); + int32_t len = mbedtls_x509_dn_gets(result.Get(), result.Size(), &tmpDN); mbedtls_asn1_free_named_data_list_shallow(tmpDN.next); if (len < 0) { @@ -844,49 +845,49 @@ 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(); - int len = crypto::ASN1EncodeObjectIds(src, &p, start); + int32_t len = crypto::ASN1EncodeObjectIds(src, &p, start); if (len < 0) { return len; } - memmove(asn1Value.Get(), p, len); + (void)memmove(asn1Value.Get(), p, len); return asn1Value.Resize(len); } Error MbedTLSCryptoProvider::ASN1EncodeBigInt(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()); + int32_t len = crypto::ASN1EncodeBigInt(number, &p, asn1Value.Get()); if (len < 0) { 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(); - int len = crypto::ASN1EncodeDERSequence(items, &p, start); + int32_t len = crypto::ASN1EncodeDERSequence(items, &p, start); if (len < 0) { return len; } - memmove(asn1Value.Get(), p, len); + (void)memmove(asn1Value.Get(), p, len); return asn1Value.Resize(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)}; } @@ -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,9 +1040,9 @@ 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()); + 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,11 +1175,11 @@ 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]; - 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)); } @@ -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}; @@ -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); @@ -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}; @@ -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; @@ -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) { @@ -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; @@ -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()) { @@ -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); } /*********************************************************************************************************************** @@ -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); } @@ -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,15 +1669,15 @@ 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); + 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); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -1696,15 +1696,15 @@ 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); + 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); } - output.Resize(outLen); + (void)output.Resize(outLen); return ErrorEnum::eNone; } @@ -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; @@ -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,16 +1807,16 @@ 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( + 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); } - mResult.Resize(olen); + (void)mResult.Resize(olen); return ErrorEnum::eNone; } @@ -1830,18 +1830,18 @@ 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 - &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); } - mResult.Resize(olen); + (void)mResult.Resize(olen); return ErrorEnum::eNone; } @@ -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); } @@ -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; } @@ -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); } @@ -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; @@ -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) { @@ -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; @@ -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; } @@ -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/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