Skip to content

Commit 2ec293f

Browse files
mykola-kobets-epamal1img
mykola-kobets-epam
authored and
al1img
committed
common: fix lint errors
Signed-off-by: Mykola Kobets <[email protected]> Reviewed-by: Mykhailo Lohvynenko <[email protected]> Reviewed-by: Oleksandr Grytsov <[email protected]> Reviewed-by: Mykola Solianko <[email protected]>
1 parent e43b4ed commit 2ec293f

File tree

10 files changed

+39
-38
lines changed

10 files changed

+39
-38
lines changed

‎src/core/common/crypto/crypto.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,9 +638,9 @@ using ObjectIdentifier = StaticString<cASN1ObjIdLen>;
638638
* ASN1 value.
639639
*/
640640
struct ASN1Value {
641-
int mTagClass;
642-
int mTagNumber;
643-
bool mIsConstructed;
641+
int mTagClass {};
642+
int mTagNumber {};
643+
bool mIsConstructed {};
644644
Array<uint8_t> mValue;
645645

646646
/**
@@ -817,7 +817,7 @@ struct ASN1ParseResult {
817817
* @param err error object.
818818
* @param remaining not parsed content.
819819
*/
820-
ASN1ParseResult(const Error err, const Array<uint8_t>& remaining)
820+
ASN1ParseResult(const Error& err, const Array<uint8_t>& remaining)
821821
: mError(err)
822822
, mRemaining(remaining)
823823
{

‎src/core/common/crypto/cryptohelper.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,8 @@ Error CryptoHelper::GetKeyForEnvelope(const TransRecipientInfo& info, Array<uint
909909
return DecryptCMSKey(info, *privKey, symmetricKey);
910910
}
911911

912-
Error CryptoHelper::DecryptCMSKey(const TransRecipientInfo& ktri, PrivateKeyItf& privKey, Array<uint8_t>& symmetricKey)
912+
Error CryptoHelper::DecryptCMSKey(
913+
const TransRecipientInfo& ktri, const PrivateKeyItf& privKey, Array<uint8_t>& symmetricKey)
913914
{
914915
if (ktri.mKeyEncryptionAlgorithm.mOID != cRSAEncryptionOid) {
915916
return AOS_ERROR_WRAP(Error(ErrorEnum::eInvalidArgument, "unknown public encryption OID"));

‎src/core/common/crypto/cryptohelper.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class CryptoHelper : public CryptoHelperItf {
250250
Error ParseRID(const Array<uint8_t>& data, RecipientID& content);
251251
Error ParseEncryptedContentInfo(const Array<uint8_t>& data, EncryptedContentInfo& content);
252252
Error GetKeyForEnvelope(const TransRecipientInfo& info, Array<uint8_t>& symmetricKey);
253-
Error DecryptCMSKey(const TransRecipientInfo& ktri, PrivateKeyItf& privKey, Array<uint8_t>& symmetricKey);
253+
Error DecryptCMSKey(const TransRecipientInfo& ktri, const PrivateKeyItf& privKey, Array<uint8_t>& symmetricKey);
254254
Error DecryptMessage(const EncryptedContentInfo& content, const Array<uint8_t>& symKey, Array<uint8_t>& message);
255255
Error DecodeMessage(AESCipherItf& decoder, const Array<uint8_t>& input, Array<uint8_t>& message);
256256

‎src/core/common/crypto/mbedtls/cryptoprovider.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,9 @@ asn1::ASN1ParseResult ReadASN1Container(const Array<uint8_t>& data, const asn1::
371371
size_t bytesLeft = static_cast<size_t>(length);
372372

373373
while (bytesLeft > 0) {
374-
long elemLength = 0;
375-
int elemTag = 0;
376-
int elemClass = 0;
377-
bool isConstructed = false;
374+
long elemLength = 0;
375+
int elemTag = 0;
376+
int elemClass = 0;
378377

379378
const unsigned char* nextPtr = elemPtr;
380379
err = GetASN1Object(&nextPtr, elemLength, elemTag, elemClass, isConstructed, static_cast<long>(bytesLeft));
@@ -413,7 +412,7 @@ Error VerifyRSASignature(const RSAPublicKey& pubKey, mbedtls_md_type_t hash, Pad
413412
{
414413
mbedtls_rsa_context rsa;
415414
mbedtls_rsa_init(&rsa);
416-
auto releaseRSA = DeferRelease(&rsa, mbedtls_rsa_free);
415+
[[maybe_unused]] auto releaseRSA = DeferRelease(&rsa, mbedtls_rsa_free);
417416

418417
int ret = mbedtls_rsa_import_raw(&rsa, pubKey.GetN().Get(), pubKey.GetN().Size(), nullptr, 0, // P - unused
419418
nullptr, 0, // Q - unused
@@ -500,16 +499,16 @@ Error VerifyECDSASignature(const ECDSAPublicKey& pubKey, const Array<uint8_t>& d
500499
mbedtls_ecp_keypair keypair;
501500

502501
mbedtls_ecp_group_init(&grp);
503-
auto grpRelease = DeferRelease(&grp, mbedtls_ecp_group_free);
502+
[[maybe_unused]] auto grpRelease = DeferRelease(&grp, mbedtls_ecp_group_free);
504503

505504
mbedtls_ecp_point_init(&ecPoint);
506-
auto QRelease = DeferRelease(&ecPoint, mbedtls_ecp_point_free);
505+
[[maybe_unused]] auto QRelease = DeferRelease(&ecPoint, mbedtls_ecp_point_free);
507506

508507
mbedtls_ecdsa_init(&ctx);
509-
auto ctxRelease = DeferRelease(&ctx, mbedtls_ecdsa_free);
508+
[[maybe_unused]] auto ctxRelease = DeferRelease(&ctx, mbedtls_ecdsa_free);
510509

511510
mbedtls_ecp_keypair_init(&keypair);
512-
auto keypairRelease = DeferRelease(&keypair, mbedtls_ecp_keypair_free);
511+
[[maybe_unused]] auto keypairRelease = DeferRelease(&keypair, mbedtls_ecp_keypair_free);
513512

514513
// Init public key.
515514
mbedtls_asn1_buf oidBuf;
@@ -547,10 +546,10 @@ Error VerifyECDSASignature(const ECDSAPublicKey& pubKey, const Array<uint8_t>& d
547546
mbedtls_mpi r, s;
548547

549548
mbedtls_mpi_init(&r);
550-
auto releaseR = DeferRelease(&r, mbedtls_mpi_free);
549+
[[maybe_unused]] auto releaseR = DeferRelease(&r, mbedtls_mpi_free);
551550

552551
mbedtls_mpi_init(&s);
553-
auto releaseS = DeferRelease(&s, mbedtls_mpi_free);
552+
[[maybe_unused]] auto releaseS = DeferRelease(&s, mbedtls_mpi_free);
554553

555554
size_t rsLen = signature.Size() / 2;
556555

@@ -1135,8 +1134,8 @@ Error MbedTLSCryptoProvider::Verify(const Array<x509::Certificate>& rootCerts,
11351134

11361135
mbedtls_x509_crt_init(&root);
11371136
mbedtls_x509_crt_init(&interm);
1138-
auto releaseRoot = DeferRelease(&root, mbedtls_x509_crt_free);
1139-
auto releaseInterm = DeferRelease(&interm, mbedtls_x509_crt_free);
1137+
[[maybe_unused]] auto releaseRoot = DeferRelease(&root, mbedtls_x509_crt_free);
1138+
[[maybe_unused]] auto releaseInterm = DeferRelease(&interm, mbedtls_x509_crt_free);
11401139

11411140
// Load root certificates.
11421141
for (const auto& r : rootCerts) {
@@ -1295,7 +1294,7 @@ asn1::ASN1ParseResult MbedTLSCryptoProvider::ReadBigInt(
12951294

12961295
mbedtls_mpi mpi;
12971296
mbedtls_mpi_init(&mpi);
1298-
auto mpiRelease = DeferRelease(&mpi, mbedtls_mpi_free);
1297+
[[maybe_unused]] auto mpiRelease = DeferRelease(&mpi, mbedtls_mpi_free);
12991298

13001299
int ret = mbedtls_asn1_get_mpi(const_cast<uint8_t**>(&p), end, &mpi);
13011300
if (ret != 0) {
@@ -1755,6 +1754,7 @@ const PublicKeyItf& MbedTLSCryptoProvider::MbedTLSRSAPrivKey::GetPublic() const
17551754
{
17561755
assert(false);
17571756

1757+
// cppcheck-suppress nullPointer
17581758
return *static_cast<PublicKeyItf*>(nullptr);
17591759
}
17601760

@@ -2201,13 +2201,13 @@ Error MbedTLSCryptoProvider::GetX509CertExtensions(x509::Certificate& cert, mbed
22012201
ret = mbedtls_asn1_get_tag(&p, gnEnd, &gnLen, MBEDTLS_ASN1_CONTEXT_SPECIFIC | 6);
22022202
if (ret == 0) {
22032203
StaticString<cURLLen> str;
2204-
if (auto err
2204+
if (auto insErr
22052205
= str.Insert(str.begin(), reinterpret_cast<char*>(p), reinterpret_cast<char*>(p) + gnLen);
2206-
!err.IsNone()) {
2207-
return AOS_ERROR_WRAP(err);
2206+
!insErr.IsNone()) {
2207+
return AOS_ERROR_WRAP(insErr);
22082208
}
22092209

2210-
if (auto err = cert.mIssuerURLs.PushBack(str); !err.IsNone()) {
2210+
if (auto pushErr = cert.mIssuerURLs.PushBack(str); !pushErr.IsNone()) {
22112211
return AOS_ERROR_WRAP(err);
22122212
}
22132213
}

‎src/core/common/monitoring/resourcemonitor.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace aos::monitoring {
1616
**********************************************************************************************************************/
1717

1818
// cppcheck-suppress constParameterReference
19-
Error ResourceMonitor::Init(const Config& config, iam::nodeinfoprovider::NodeInfoProviderItf& nodeInfoProvider,
19+
Error ResourceMonitor::Init(const Config& config, const iam::nodeinfoprovider::NodeInfoProviderItf& nodeInfoProvider,
2020
sm::resourcemanager::ResourceManagerItf& resourceManager, ResourceUsageProviderItf& resourceUsageProvider,
2121
SenderItf& monitorSender, alerts::SenderItf& alertSender, ConnectionPublisherItf& connectionPublisher)
2222
{

‎src/core/common/monitoring/resourcemonitor.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ResourceMonitor : public ResourceMonitorItf,
4646
* @param connectionPublisher connection publisher.
4747
* @return Error.
4848
*/
49-
Error Init(const Config& config, iam::nodeinfoprovider::NodeInfoProviderItf& nodeInfoProvider,
49+
Error Init(const Config& config, const iam::nodeinfoprovider::NodeInfoProviderItf& nodeInfoProvider,
5050
sm::resourcemanager::ResourceManagerItf& resourceManager, ResourceUsageProviderItf& resourceUsageProvider,
5151
SenderItf& monitorSender, alerts::SenderItf& alertSender, ConnectionPublisherItf& connectionPublisher);
5252

‎src/core/common/tests/crypto/providers/mbedtlsfactory.cpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ RetWithError<RSAPublicKey> ExtractRSAPublicKeyFromPrivateKey(const std::string&
6767
std::unique_ptr<mbedtls_mpi, decltype(&mbedtls_mpi_free)> mpiNPtr(&mpiN, mbedtls_mpi_free);
6868
std::unique_ptr<mbedtls_mpi, decltype(&mbedtls_mpi_free)> mpiEPtr(&mpiE, mbedtls_mpi_free);
6969

70-
if ((ret = mbedtls_rsa_export(rsa_context, mpiNPtr.get(), nullptr, nullptr, nullptr, mpiEPtr.get())) != 0) {
70+
if (mbedtls_rsa_export(rsa_context, mpiNPtr.get(), nullptr, nullptr, nullptr, mpiEPtr.get()) != 0) {
7171
return {{{}, {}}, aos::ErrorEnum::eInvalidArgument};
7272
}
7373

7474
StaticArray<uint8_t, cRSAModulusSize> n;
7575
StaticArray<uint8_t, cRSAPubExponentSize> e;
7676

77-
if ((ret = ConvertMbedtlsMpiToArray(mpiNPtr.get(), n)) != 0) {
77+
if (ConvertMbedtlsMpiToArray(mpiNPtr.get(), n) != 0) {
7878
return {{{}, {}}, aos::ErrorEnum::eInvalidArgument};
7979
}
8080

81-
if ((ret = ConvertMbedtlsMpiToArray(mpiEPtr.get(), e)) != 0) {
81+
if (ConvertMbedtlsMpiToArray(mpiEPtr.get(), e) != 0) {
8282
return {{{}, {}}, aos::ErrorEnum::eInvalidArgument};
8383
}
8484

@@ -91,7 +91,7 @@ RetWithError<ECDSAPublicKey> ExtractECDSAPublicKeyFromPrivateKey(const std::stri
9191
mbedtls_pk_context pk;
9292
mbedtls_pk_init(&pk);
9393

94-
std::unique_ptr<mbedtls_pk_context, decltype(&mbedtls_pk_free)> pkPtr(&pk, mbedtls_pk_free);
94+
[[maybe_unused]] auto pkRelease = DeferRelease(&pk, mbedtls_pk_free);
9595

9696
if ((ret = mbedtls_pk_parse_key(&pk, reinterpret_cast<const uint8_t*>(pemPrivKey.data()), pemPrivKey.size() + 1,
9797
nullptr, 0, nullptr, nullptr))
@@ -529,7 +529,7 @@ bool MBedTLSCryptoFactory::VerifyCertificate(const std::string& pemCert)
529529
mbedtls_x509_crt cert;
530530
mbedtls_x509_crt_init(&cert);
531531

532-
std::unique_ptr<mbedtls_x509_crt, decltype(&mbedtls_x509_crt_free)> certPtr(&cert, mbedtls_x509_crt_free);
532+
[[maybe_unused]] auto certRelease = DeferRelease(&cert, mbedtls_x509_crt_free);
533533

534534
int ret = mbedtls_x509_crt_parse(&cert, reinterpret_cast<const uint8_t*>(pemCert.c_str()), pemCert.size() + 1);
535535
if (ret != 0) {
@@ -546,10 +546,9 @@ bool MBedTLSCryptoFactory::VerifyCSR(const std::string& pemCSR)
546546
mbedtls_x509_csr csr;
547547
mbedtls_x509_csr_init(&csr);
548548

549-
std::unique_ptr<mbedtls_x509_csr, decltype(&mbedtls_x509_csr_free)> csrPtr(&csr, mbedtls_x509_csr_free);
549+
[[maybe_unused]] auto csrRelease = DeferRelease(&csr, mbedtls_x509_csr_free);
550550

551-
return mbedtls_x509_csr_parse(csrPtr.get(), reinterpret_cast<const uint8_t*>(pemCSR.c_str()), pemCSR.size() + 1)
552-
== 0;
551+
return mbedtls_x509_csr_parse(&csr, reinterpret_cast<const uint8_t*>(pemCSR.c_str()), pemCSR.size() + 1) == 0;
553552
}
554553

555554
bool MBedTLSCryptoFactory::VerifySignature(

‎src/core/common/tests/crypto/providers/opensslfactory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ bool OpenSSLCryptoFactory::VerifySignature(
594594
return false;
595595
}
596596

597-
auto freeKey = DeferRelease(evpKey, EVP_PKEY_free);
597+
[[maybe_unused]] auto freeKey = DeferRelease(evpKey, EVP_PKEY_free);
598598

599599
return VerifyWithEVP(evpKey, KeyTypeEnum::eRSA, signature, digest);
600600
}
@@ -607,7 +607,7 @@ bool OpenSSLCryptoFactory::VerifySignature(
607607
return false;
608608
}
609609

610-
auto freeKey = DeferRelease(evpKey, EVP_PKEY_free);
610+
[[maybe_unused]] auto freeKey = DeferRelease(evpKey, EVP_PKEY_free);
611611

612612
return VerifyWithEVP(evpKey, KeyTypeEnum::eECDSA, signature, digest);
613613
}

‎src/core/common/tools/algorithm.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ class AlgorithmItf {
131131
{
132132
assert(!IsEmpty());
133133

134+
// cppcheck-suppress returnTempReference
134135
return *begin();
135136
}
136137

‎src/core/common/tools/tests/memory.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ TEST(MemoryTest, DeferRelease)
194194

195195
EXPECT_CALL(deleter, Call(&dummy)).Times(1);
196196
{
197-
auto defer = DeferRelease(&dummy, deleter.AsStdFunction());
197+
[[maybe_unused]] auto defer = DeferRelease(&dummy, deleter.AsStdFunction());
198198
}
199199
}
200200

@@ -204,7 +204,7 @@ TEST(MemoryTest, DeferReleaseNoOpForNull)
204204

205205
EXPECT_CALL(deleter, Call(testing::_)).Times(0);
206206
{
207-
auto defer = DeferRelease(static_cast<int*>(nullptr), deleter.AsStdFunction());
207+
[[maybe_unused]] auto defer = DeferRelease(static_cast<int*>(nullptr), deleter.AsStdFunction());
208208
}
209209
}
210210

0 commit comments

Comments
 (0)