@@ -389,8 +389,7 @@ CommissioningStage AutoCommissioner::GetNextCommissioningStageInternal(Commissio
389
389
case CommissioningStage::kSendAttestationRequest :
390
390
return CommissioningStage::kAttestationVerification ;
391
391
case CommissioningStage::kAttestationVerification :
392
- return mBypassDeviceAttestation ? CommissioningStage::kSendOpCertSigningRequest
393
- : CommissioningStage::kAttestationRevocationCheck ;
392
+ return CommissioningStage::kAttestationRevocationCheck ;
394
393
case CommissioningStage::kAttestationRevocationCheck :
395
394
return CommissioningStage::kSendOpCertSigningRequest ;
396
395
case CommissioningStage::kSendOpCertSigningRequest :
@@ -582,7 +581,6 @@ CHIP_ERROR AutoCommissioner::StartCommissioning(DeviceCommissioner * commissione
582
581
return CHIP_ERROR_INVALID_ARGUMENT;
583
582
}
584
583
mStopCommissioning = false ;
585
- mBypassDeviceAttestation = false ;
586
584
mCommissioner = commissioner;
587
585
mCommissioneeDeviceProxy = proxy;
588
586
mNeedsNetworkSetup =
@@ -697,7 +695,8 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
697
695
" Failed device attestation. Device vendor and/or product ID do not match the IDs expected. "
698
696
" Verify DAC certificate chain and certification declaration to ensure spec rules followed." );
699
697
}
700
- else if (report.stageCompleted == CommissioningStage::kAttestationVerification )
698
+
699
+ if (report.stageCompleted == CommissioningStage::kAttestationVerification )
701
700
{
702
701
ChipLogError (Controller, " Failed verifying attestation information. Now checking DAC chain revoked status." );
703
702
// don't error out until we check for DAC chain revocation status
0 commit comments