Skip to content

Commit 3f7f07e

Browse files
kkasperczyk-nokkasperczyk-no
committed
Revert "[nrf fromtree] Add a lint for SuccessOrExit without assignment. (project-chip#26854) (project-chip#27029)"
This reverts commit 29abb73.
1 parent 5ca1c92 commit 3f7f07e

25 files changed

+105
-96
lines changed

‎examples/platform/nxp/se05x/DeviceAttestationSe05xCredsExample_v2.cpp

+9-10
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ CHIP_ERROR ExampleSe05xDACProviderv2::SignWithDeviceAttestationKey(const ByteSpa
196196
};
197197

198198
tempBuf[0] = (uint8_t) TLV::TLVElementType::Structure;
199-
SuccessOrExit(err = se05xSetCertificate(START_CONTAINER_SE05X_ID, tempBuf, 1));
199+
SuccessOrExit(se05xSetCertificate(START_CONTAINER_SE05X_ID, tempBuf, 1));
200200

201201
for (int i = 1; i <= NO_OF_DEV_ATTEST_MSG_TAGS_TO_PARSE; i++)
202202
{
@@ -206,7 +206,6 @@ CHIP_ERROR ExampleSe05xDACProviderv2::SignWithDeviceAttestationKey(const ByteSpa
206206
{
207207
continue;
208208
}
209-
// TODO: Should this be setting err = tlverr?
210209
SuccessOrExit(tlverr);
211210

212211
// Transient binary object ids starting from location 0x7D300005 (TAG1_ID) to 0x7D30000D (TAG3_VALUE_ID)
@@ -216,35 +215,35 @@ CHIP_ERROR ExampleSe05xDACProviderv2::SignWithDeviceAttestationKey(const ByteSpa
216215
taglen = tagReader.GetLength();
217216
tempBuf[0] = tagReader.GetControlByte();
218217
tempBuf[1] = i;
219-
SuccessOrExit(err = se05xSetCertificate(TAG1_ID + (3 /* tag + length + value ids */ * (i - 1)), tempBuf, 2));
218+
SuccessOrExit(se05xSetCertificate(TAG1_ID + (3 /* tag + length + value ids */ * (i - 1)), tempBuf, 2));
220219
if (taglen > 256)
221220
{
222221
tempBuf[0] = taglen & 0xFF;
223222
tempBuf[1] = (taglen >> 8) & 0xFF;
224-
SuccessOrExit(err = se05xSetCertificate(TAG1_LEN_ID + (3 * (i - 1)), tempBuf, 2));
223+
SuccessOrExit(se05xSetCertificate(TAG1_LEN_ID + (3 * (i - 1)), tempBuf, 2));
225224
}
226225
else
227226
{
228227
tempBuf[0] = taglen;
229-
SuccessOrExit(err = se05xSetCertificate(TAG1_LEN_ID + (3 * (i - 1)), tempBuf, 1));
228+
SuccessOrExit(se05xSetCertificate(TAG1_LEN_ID + (3 * (i - 1)), tempBuf, 1));
230229
}
231230
if (taglen > 0)
232231
{
233-
SuccessOrExit(err = tagReader.Get(tagvalue));
234-
SuccessOrExit(err = se05xSetCertificate(TAG1_VALUE_ID + (3 * (i - 1)), tagvalue.data(), taglen));
232+
SuccessOrExit(tagReader.Get(tagvalue));
233+
SuccessOrExit(se05xSetCertificate(TAG1_VALUE_ID + (3 * (i - 1)), tagvalue.data(), taglen));
235234
}
236235
}
237236

238237
tempBuf[0] = (uint8_t) TLV::TLVElementType::EndOfContainer;
239-
SuccessOrExit(err = se05xSetCertificate(END_CONTAINER_SE05X_ID, tempBuf, 1));
238+
SuccessOrExit(se05xSetCertificate(END_CONTAINER_SE05X_ID, tempBuf, 1));
240239

241240
if ((tagReader.GetRemainingLength() + 1 /* End container */) >= 16)
242241
{
243242
/* Set attestation challenge */
244-
SuccessOrExit(err = se05xSetCertificate(ATTEST_CHALLENGE_ID, (message_to_sign.end() - 16), 16));
243+
SuccessOrExit(se05xSetCertificate(ATTEST_CHALLENGE_ID, (message_to_sign.end() - 16), 16));
245244
}
246245

247-
SuccessOrExit(err = se05xPerformInternalSign(DEV_ATTESTATION_KEY_SE05X_ID_IS, signature_se05x, &signature_se05x_len));
246+
SuccessOrExit(se05xPerformInternalSign(DEV_ATTESTATION_KEY_SE05X_ID_IS, signature_se05x, &signature_se05x_len));
248247

249248
err = chip::Crypto::EcdsaAsn1SignatureToRaw(chip::Crypto::kP256_FE_Length, ByteSpan{ signature_se05x, signature_se05x_len },
250249
out_signature_buffer);

‎src/access/AccessControl.cpp

+8-16
Original file line numberDiff line numberDiff line change
@@ -555,12 +555,11 @@ bool AccessControl::IsValid(const Entry & entry)
555555
size_t subjectCount = 0;
556556
size_t targetCount = 0;
557557

558-
CHIP_ERROR err = CHIP_NO_ERROR;
559-
SuccessOrExit(err = entry.GetAuthMode(authMode));
560-
SuccessOrExit(err = entry.GetFabricIndex(fabricIndex));
561-
SuccessOrExit(err = entry.GetPrivilege(privilege));
562-
SuccessOrExit(err = entry.GetSubjectCount(subjectCount));
563-
SuccessOrExit(err = entry.GetTargetCount(targetCount));
558+
SuccessOrExit(entry.GetAuthMode(authMode));
559+
SuccessOrExit(entry.GetFabricIndex(fabricIndex));
560+
SuccessOrExit(entry.GetPrivilege(privilege));
561+
SuccessOrExit(entry.GetSubjectCount(subjectCount));
562+
SuccessOrExit(entry.GetTargetCount(targetCount));
564563

565564
#if CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY > 1
566565
ChipLogProgress(DataManagement, "AccessControl: validating f=%u p=%c a=%c s=%d t=%d", fabricIndex,
@@ -583,7 +582,7 @@ bool AccessControl::IsValid(const Entry & entry)
583582
for (size_t i = 0; i < subjectCount; ++i)
584583
{
585584
NodeId subject;
586-
SuccessOrExit(err = entry.GetSubject(i, subject));
585+
SuccessOrExit(entry.GetSubject(i, subject));
587586
const bool kIsCase = authMode == AuthMode::kCase;
588587
const bool kIsGroup = authMode == AuthMode::kGroup;
589588
#if CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY > 1
@@ -595,7 +594,7 @@ bool AccessControl::IsValid(const Entry & entry)
595594
for (size_t i = 0; i < targetCount; ++i)
596595
{
597596
Entry::Target target;
598-
SuccessOrExit(err = entry.GetTarget(i, target));
597+
SuccessOrExit(entry.GetTarget(i, target));
599598
const bool kHasCluster = target.flags & Entry::Target::kCluster;
600599
const bool kHasEndpoint = target.flags & Entry::Target::kEndpoint;
601600
const bool kHasDeviceType = target.flags & Entry::Target::kDeviceType;
@@ -609,14 +608,7 @@ bool AccessControl::IsValid(const Entry & entry)
609608
return true;
610609

611610
exit:
612-
if (err != CHIP_NO_ERROR)
613-
{
614-
ChipLogError(DataManagement, "AccessControl: %s %" CHIP_ERROR_FORMAT, log, err.Format());
615-
}
616-
else
617-
{
618-
ChipLogError(DataManagement, "AccessControl: %s", log);
619-
}
611+
ChipLogError(DataManagement, "AccessControl: %s", log);
620612
return false;
621613
}
622614

‎src/app/CommandHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ Status CommandHandler::ProcessCommandDataIB(CommandDataIB::Parser & aCommandElem
326326
{
327327
ChipLogDetail(DataManagement, "Received command for Endpoint=%u Cluster=" ChipLogFormatMEI " Command=" ChipLogFormatMEI,
328328
concretePath.mEndpointId, ChipLogValueMEI(concretePath.mClusterId), ChipLogValueMEI(concretePath.mCommandId));
329-
SuccessOrExit(err = MatterPreCommandReceivedCallback(concretePath, GetSubjectDescriptor()));
329+
SuccessOrExit(MatterPreCommandReceivedCallback(concretePath, GetSubjectDescriptor()));
330330
mpCallback->DispatchCommand(*this, concretePath, commandDataReader);
331331
MatterPostCommandReceivedCallback(concretePath, GetSubjectDescriptor());
332332
}

‎src/app/WriteClient.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ CHIP_ERROR WriteClient::OnMessageReceived(Messaging::ExchangeContext * apExchang
460460
if (!mChunks.IsNull())
461461
{
462462
// Send the next chunk.
463-
SuccessOrExit(err = SendWriteRequest());
463+
SuccessOrExit(SendWriteRequest());
464464
}
465465
}
466466
else if (aPayloadHeader.HasMessageType(MsgType::StatusResponse))

‎src/app/reporting/Engine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ CHIP_ERROR Engine::BuildAndSendSingleReportData(ReadHandler * apReadHandler)
529529
}
530530
}
531531

532-
SuccessOrExit(err = reportDataBuilder.GetError());
532+
SuccessOrExit(reportDataBuilder.GetError());
533533
SuccessOrExit(err = reportDataWriter.UnreserveBuffer(kReservedSizeForMoreChunksFlag + kReservedSizeForIMRevision +
534534
kReservedSizeForEndOfReportMessage));
535535
if (hasMoreChunks)

‎src/app/server/Server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ CHIP_ERROR Server::Init(const ServerInitParams & initParams)
140140

141141
// Set up attribute persistence before we try to bring up the data model
142142
// handler.
143-
SuccessOrExit(err = mAttributePersister.Init(mDeviceStorage));
143+
SuccessOrExit(mAttributePersister.Init(mDeviceStorage));
144144
SetAttributePersistenceProvider(&mAttributePersister);
145145

146146
{

‎src/app/tests/integration/chip_im_initiator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ CHIP_ERROR SendReadRequest()
347347
chip::Platform::MakeUnique<chip::app::ReadClient>(chip::app::InteractionModelEngine::GetInstance(), &gExchangeManager,
348348
gMockDelegate, chip::app::ReadClient::InteractionType::Read);
349349

350-
SuccessOrExit(err = readClient->SendRequest(readPrepareParams));
350+
SuccessOrExit(readClient->SendRequest(readPrepareParams));
351351

352352
gMockDelegate.AdoptReadClient(std::move(readClient));
353353

‎src/controller/java/AndroidCommissioningWindowOpener.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ void AndroidCommissioningWindowOpener::OnOpenCommissioningWindowResponse(void *
121121
std::string QRCode;
122122
std::string manualPairingCode;
123123

124-
SuccessOrExit(status = ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(manualPairingCode));
125-
SuccessOrExit(status = QRCodeSetupPayloadGenerator(payload).payloadBase38Representation(QRCode));
124+
SuccessOrExit(ManualSetupPayloadGenerator(payload).payloadDecimalStringRepresentation(manualPairingCode));
125+
SuccessOrExit(QRCodeSetupPayloadGenerator(payload).payloadBase38Representation(QRCode));
126126

127127
if (self->mOnSuccessMethod != nullptr)
128128
{

‎src/controller/java/CHIPDeviceController-JNI.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ JNI_METHOD(void, write)
15561556
VerifyOrExit(device != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
15571557
VerifyOrExit(device->GetSecureSession().HasValue(), err = CHIP_ERROR_MISSING_SECURE_SESSION);
15581558
VerifyOrExit(attributeList != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
1559-
SuccessOrExit(err = JniReferences::GetInstance().GetListSize(attributeList, listSize));
1559+
SuccessOrExit(JniReferences::GetInstance().GetListSize(attributeList, listSize));
15601560

15611561
writeClient = Platform::New<app::WriteClient>(device->GetExchangeManager(), callback->GetChunkedWriteCallback(),
15621562
timedRequestTimeoutMs != 0 ? Optional<uint16_t>(timedRequestTimeoutMs)
@@ -1708,8 +1708,7 @@ JNI_METHOD(void, invoke)
17081708
"()Lchip/devicecontroller/model/ChipPathId;", &getClusterIdMethod));
17091709
SuccessOrExit(err = JniReferences::GetInstance().FindMethod(env, invokeElement, "getCommandId",
17101710
"()Lchip/devicecontroller/model/ChipPathId;", &getCommandIdMethod));
1711-
SuccessOrExit(
1712-
err = JniReferences::GetInstance().FindMethod(env, invokeElement, "getTlvByteArray", "()[B", &getTlvByteArrayMethod));
1711+
SuccessOrExit(JniReferences::GetInstance().FindMethod(env, invokeElement, "getTlvByteArray", "()[B", &getTlvByteArrayMethod));
17131712

17141713
endpointIdObj = env->CallObjectMethod(invokeElement, getEndpointIdMethod);
17151714
VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);

‎src/controller/python/chip/clusters/command.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ PyChipError pychip_CommandSender_SendCommand(void * appContext, DeviceProxy * de
153153
VerifyOrExit(writer != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
154154
reader.Init(payload, length);
155155
reader.Next();
156-
SuccessOrExit(err = writer->CopyContainer(TLV::ContextTag(CommandDataIB::Tag::kFields), reader));
156+
SuccessOrExit(writer->CopyContainer(TLV::ContextTag(CommandDataIB::Tag::kFields), reader));
157157
}
158158

159159
SuccessOrExit(err = sender->FinishCommand(timedRequestTimeoutMs != 0 ? Optional<uint16_t>(timedRequestTimeoutMs)
@@ -197,7 +197,7 @@ PyChipError pychip_CommandSender_SendGroupCommand(chip::GroupId groupId, chip::C
197197
VerifyOrExit(writer != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
198198
reader.Init(payload, length);
199199
reader.Next();
200-
SuccessOrExit(err = writer->CopyContainer(TLV::ContextTag(CommandDataIB::Tag::kFields), reader));
200+
SuccessOrExit(writer->CopyContainer(TLV::ContextTag(CommandDataIB::Tag::kFields), reader));
201201
}
202202

203203
SuccessOrExit(err = sender->FinishCommand(Optional<uint16_t>::Missing()));

‎src/controller/python/chip/internal/CommissionerImpl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -183,17 +183,17 @@ extern "C" chip::Controller::DeviceCommissioner * pychip_internal_Commissioner_N
183183
commissionerParams.controllerICAC = icacSpan;
184184
commissionerParams.controllerNOC = nocSpan;
185185

186-
SuccessOrExit(err = DeviceControllerFactory::GetInstance().Init(factoryParams));
187-
SuccessOrExit(err = DeviceControllerFactory::GetInstance().SetupCommissioner(commissionerParams, *result));
186+
SuccessOrExit(DeviceControllerFactory::GetInstance().Init(factoryParams));
187+
err = DeviceControllerFactory::GetInstance().SetupCommissioner(commissionerParams, *result);
188188

189-
SuccessOrExit(err = result->GetCompressedFabricIdBytes(compressedFabricIdSpan));
189+
SuccessOrExit(result->GetCompressedFabricIdBytes(compressedFabricIdSpan));
190190
ChipLogProgress(Support, "Setting up group data for Fabric Index %u with Compressed Fabric ID:",
191191
static_cast<unsigned>(result->GetFabricIndex()));
192192
ChipLogByteSpan(Support, compressedFabricIdSpan);
193193

194194
defaultIpk = chip::GroupTesting::DefaultIpkValue::GetDefaultIpk();
195-
SuccessOrExit(err = chip::Credentials::SetSingleIpkEpochKey(&gGroupDataProvider, result->GetFabricIndex(), defaultIpk,
196-
compressedFabricIdSpan));
195+
SuccessOrExit(chip::Credentials::SetSingleIpkEpochKey(&gGroupDataProvider, result->GetFabricIndex(), defaultIpk,
196+
compressedFabricIdSpan));
197197
}
198198
exit:
199199
ChipLogProgress(Controller, "Commissioner initialization status: %s", chip::ErrorStr(err));

‎src/crypto/CHIPCryptoPALOpenSSL.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
940940
out_buf_length = (out_secret.Length() == 0) ? out_secret.Capacity() : out_secret.Length();
941941
result = EVP_PKEY_derive(context, out_secret.Bytes(), &out_buf_length);
942942
VerifyOrExit(result == 1, error = CHIP_ERROR_INTERNAL);
943-
SuccessOrExit(error = out_secret.SetLength(out_buf_length));
943+
SuccessOrExit(out_secret.SetLength(out_buf_length));
944944

945945
exit:
946946
if (ec_key != nullptr)

‎src/crypto/CHIPCryptoPALPSA.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
589589
status = psa_raw_key_agreement(PSA_ALG_ECDH, context.key_id, remote_public_key.ConstBytes(), remote_public_key.Length(),
590590
out_secret.Bytes(), outputSize, &outputLength);
591591
VerifyOrExit(status == PSA_SUCCESS, error = CHIP_ERROR_INTERNAL);
592-
SuccessOrExit(error = out_secret.SetLength(outputLength));
592+
SuccessOrExit(out_secret.SetLength(outputLength));
593593

594594
exit:
595595
logPsaError(status);
@@ -1420,9 +1420,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
14201420
error = CHIP_ERROR_CERT_NOT_TRUSTED;
14211421
break;
14221422
default:
1423-
result = CertificateChainValidationResult::kInternalFrameworkError;
1424-
error = CHIP_ERROR_INTERNAL;
1425-
break;
1423+
SuccessOrExit((result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
14261424
}
14271425

14281426
exit:

‎src/crypto/CHIPCryptoPALmbedTLS.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
653653

654654
result = mbedtls_mpi_write_binary(&mpi_secret, out_secret.Bytes(), secret_length);
655655
VerifyOrExit(result == 0, error = CHIP_ERROR_INTERNAL);
656-
SuccessOrExit(error = out_secret.SetLength(secret_length));
656+
SuccessOrExit(out_secret.SetLength(secret_length));
657657

658658
exit:
659659
keypair = nullptr;
@@ -1537,9 +1537,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
15371537
error = CHIP_ERROR_CERT_NOT_TRUSTED;
15381538
break;
15391539
default:
1540-
result = CertificateChainValidationResult::kInternalFrameworkError;
1541-
error = CHIP_ERROR_INTERNAL;
1542-
break;
1540+
SuccessOrExit((result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
15431541
}
15441542

15451543
exit:

‎src/crypto/hsm/nxp/CHIPCryptoPALHsm_SE05X_P256.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ CHIP_ERROR P256KeypairHSM::ECDSA_sign_msg(const uint8_t * msg, size_t msg_length
190190
error = EcdsaAsn1SignatureToRaw(kP256_FE_Length, ByteSpan{ signature_se05x, signature_se05x_len }, out_raw_sig_span);
191191
SuccessOrExit(error);
192192

193-
SuccessOrExit(error = out_signature.SetLength(2 * kP256_FE_Length));
193+
SuccessOrExit(out_signature.SetLength(2 * kP256_FE_Length));
194194

195195
error = CHIP_NO_ERROR;
196196
exit:

‎src/platform/Infineon/CYW30739/FactoryDataProvider.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ CHIP_ERROR FactoryDataProvider::LoadKeypairFromDer(const ByteSpan & der_buffer,
111111
mbedtls_result = mbedtls_ecp_write_key(ecp, private_key.data(), private_key.size());
112112
VerifyOrExit(mbedtls_result == 0, error = CHIP_ERROR_INTERNAL);
113113

114-
SuccessOrExit(error = serializedKeypair.SetLength(public_key.size() + private_key.size()));
115-
SuccessOrExit(error = keypair.Deserialize(serializedKeypair));
114+
SuccessOrExit(serializedKeypair.SetLength(public_key.size() + private_key.size()));
115+
SuccessOrExit(keypair.Deserialize(serializedKeypair));
116116

117117
exit:
118118
if (mbedtls_result != 0)

‎src/platform/mbed/BLEManagerImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
770770
VerifyOrExit(mbed_err == BLE_ERROR_NONE, err = CHIP_ERROR(chip::ChipError::Range::kOS, mbed_err));
771771

772772
dev_id_info.Init();
773-
SuccessOrExit(err = ConfigurationMgr().GetBLEDeviceIdentificationInfo(dev_id_info));
773+
SuccessOrExit(ConfigurationMgr().GetBLEDeviceIdentificationInfo(dev_id_info));
774774
mbed_err = adv_data_builder.setServiceData(
775775
ShortUUID_CHIPoBLEService, mbed::make_Span<const uint8_t>(reinterpret_cast<uint8_t *>(&dev_id_info), sizeof dev_id_info));
776776
VerifyOrExit(mbed_err == BLE_ERROR_NONE, err = CHIP_ERROR(chip::ChipError::Range::kOS, mbed_err));

‎src/platform/nxp/common/crypto/CHIPCryptoPALTinyCrypt.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
599599
result = uECC_shared_secret(remote_public_key.ConstBytes() + 1, keypair->private_key, out_secret.Bytes());
600600
VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
601601

602-
SuccessOrExit(error = out_secret.SetLength(secret_length));
602+
SuccessOrExit(out_secret.SetLength(secret_length));
603603

604604
exit:
605605
keypair = nullptr;
@@ -1377,9 +1377,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
13771377
error = CHIP_ERROR_CERT_NOT_TRUSTED;
13781378
break;
13791379
default:
1380-
result = CertificateChainValidationResult::kInternalFrameworkError;
1381-
error = CHIP_ERROR_INTERNAL;
1382-
break;
1380+
SuccessOrExit((result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
13831381
}
13841382

13851383
exit:

‎src/platform/nxp/k32w/k32w0/crypto/CHIPCryptoPALNXPUltrafastP256.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
594594
out_secret.Bytes());
595595
VerifyOrExit(result == gSecEcdhSuccess_c, error = CHIP_ERROR_INTERNAL);
596596

597-
SuccessOrExit(error = out_secret.SetLength(secret_length));
597+
SuccessOrExit(out_secret.SetLength(secret_length));
598598
exit:
599599
keypair = nullptr;
600600
_log_mbedTLS_error(result);
@@ -1347,9 +1347,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
13471347
error = CHIP_ERROR_CERT_NOT_TRUSTED;
13481348
break;
13491349
default:
1350-
result = CertificateChainValidationResult::kInternalFrameworkError;
1351-
error = CHIP_ERROR_INTERNAL;
1352-
break;
1350+
SuccessOrExit((result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
13531351
}
13541352

13551353
exit:

‎src/platform/silabs/SiWx917/CHIPCryptoPALTinyCrypt.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ CHIP_ERROR P256Keypair::ECDH_derive_secret(const P256PublicKey & remote_public_k
569569
result = uECC_shared_secret(remote_public_key.ConstBytes() + 1, keypair->private_key, out_secret.Bytes());
570570
VerifyOrExit(result == UECC_SUCCESS, error = CHIP_ERROR_INTERNAL);
571571

572-
SuccessOrExit(error = out_secret.SetLength(secret_length));
572+
SuccessOrExit(out_secret.SetLength(secret_length));
573573

574574
exit:
575575
keypair = nullptr;
@@ -1378,9 +1378,7 @@ CHIP_ERROR ValidateCertificateChain(const uint8_t * rootCertificate, size_t root
13781378
error = CHIP_ERROR_CERT_NOT_TRUSTED;
13791379
break;
13801380
default:
1381-
result = CertificateChainValidationResult::kInternalFrameworkError;
1382-
error = CHIP_ERROR_INTERNAL;
1383-
break;
1381+
SuccessOrExit((result = CertificateChainValidationResult::kInternalFrameworkError, error = CHIP_ERROR_INTERNAL));
13841382
}
13851383

13861384
exit:

0 commit comments

Comments
 (0)