diff --git a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp index ce29aaea9c5fb1..ee92614bc2a493 100644 --- a/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp +++ b/src/app/clusters/operational-credentials-server/operational-credentials-server.cpp @@ -508,22 +508,11 @@ bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandH } } - CHIP_ERROR err = CHIP_ERROR_INTERNAL; - - // Fetch current fabric - const FabricInfo * fabric = RetrieveCurrentFabric(commandObj); - if (fabric == nullptr) - { - SendNOCResponse(commandObj, commandPath, OperationalCertStatus::kInsufficientPrivilege, ourFabricIndex, - CharSpan::fromCharString("Current fabric not found")); - return true; - } - // Set Label on fabric. Any error on this is basically an internal error... // NOTE: if an UpdateNOC had caused a pending fabric, that pending fabric is // the one updated thereafter. Otherwise, the data is committed to storage // as soon as the update is done. - err = fabricTable.SetFabricLabel(ourFabricIndex, label); + CHIP_ERROR err = fabricTable.SetFabricLabel(ourFabricIndex, label); VerifyOrExit(err == CHIP_NO_ERROR, finalStatus = Status::Failure); finalStatus = Status::Success; @@ -606,10 +595,6 @@ OperationalCertStatus ConvertToNOCResponseStatus(CHIP_ERROR err) { return OperationalCertStatus::kInvalidAdminSubject; } - if (err == CHIP_ERROR_INSUFFICIENT_PRIVILEGE) - { - return OperationalCertStatus::kInsufficientPrivilege; - } return OperationalCertStatus::kInvalidNOC; } diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index 01c172b54172dc..cb35cbdf3666a1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -36,7 +36,6 @@ limitations under the License. - diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 9543c1c3414e94..feb959c3e6aba5 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -1277,8 +1277,6 @@ CHIP_ERROR DeviceCommissioner::ConvertFromOperationalCertStatus(OperationalCrede return CHIP_ERROR_INVALID_ADMIN_SUBJECT; case OperationalCertStatus::kFabricConflict: return CHIP_ERROR_FABRIC_EXISTS; - case OperationalCertStatus::kInsufficientPrivilege: - return CHIP_ERROR_INSUFFICIENT_PRIVILEGE; case OperationalCertStatus::kLabelConflict: return CHIP_ERROR_INVALID_ARGUMENT; case OperationalCertStatus::kInvalidFabricIndex: