diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 1dd178ebeb4a7c..f989ede4b43533 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1540,7 +1540,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 3660f4d9aef88d..9ef0f1ff6fe4ff 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1385,7 +1385,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 9f36feecb38ac0..192d27b2c8fff6 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1230,7 +1230,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 6d62ac5d73d286..97da0f40421653 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1198,7 +1198,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 34318b2bd76687..9ea4e7a9963e51 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1088,7 +1088,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index c16341fdac2f5d..c6a9904c988bdd 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1332,7 +1332,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 4a0201ab324ad0..141d0f66ecf8e0 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 6ee6d45cafdf04..b2b5e7487480f0 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1325,7 +1325,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 55e43daa753557..ff04b5f9934278 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index ac40c1e9c979e1..bd384a12d8524f 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index d407008d720a13..4570dcfa4b4ad1 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 942ffc8e054171..08849f0bb0845c 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1332,7 +1332,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 53fd7ed647c601..b60a868d1b3999 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1402,7 +1402,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 79dd3778e3fc34..3c6021167fc804 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1249,7 +1249,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 377a8919936651..bfdddb25db7e7e 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 31d9f9885c0b95..971e68e9f8ee8d 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1212,7 +1212,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index ecf9c833f48d17..0d7c1ffbde0ea6 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1101,7 +1101,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 8ccf9a9a8b3f88..638550bb8a7c23 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1199,7 +1199,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index c5a247912a27ff..bb699502abca33 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1199,7 +1199,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index ed884d5f553418..308151883ecf10 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1293,7 +1293,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 65da89abd1bc77..5f4d31853f35ed 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1228,7 +1228,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index db5f49bab877cd..1473357623a139 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1170,7 +1170,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 1e7ae971c5e075..75377e1ac9f1a8 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -317,7 +317,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index fd00e5818c7b1d..07fd85e68d3432 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -621,7 +621,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 1a58f22e330228..80d3b3e88cf779 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -624,7 +624,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index b73aac74549d42..a04c825fa58328 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1236,7 +1236,6 @@ client cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; @@ -1316,7 +1315,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index b73aac74549d42..a04c825fa58328 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1236,7 +1236,6 @@ client cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; @@ -1316,7 +1315,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index ef0af0160f78e5..ab85bf6228eb19 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -896,7 +896,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 13bc86a8e40a59..5448d745c86373 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -811,7 +811,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index fe249360f4dc01..76830d443cbb17 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -651,7 +651,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index b9dd70916122e2..9dedf82c5c8911 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1135,7 +1135,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 5d4e3f94c349b5..553ba3577bd5ca 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1236,7 +1236,6 @@ client cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; @@ -1337,7 +1336,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 18bc17eee1a5a6..3047552b9c7abe 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1429,7 +1429,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 94f083e5d56961..9efbdd12b4de60 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1249,7 +1249,6 @@ server cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; 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 35c4ec99e4ccd3..db51829d763a07 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: diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 90a9ddc9afa2b2..b6933d5f7d681e 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1771,7 +1771,6 @@ client cluster OperationalCredentials = 62 { kMissingCsr = 4; kTableFull = 5; kInvalidAdminSubject = 6; - kInsufficientPrivilege = 8; kFabricConflict = 9; kLabelConflict = 10; kInvalidFabricIndex = 11; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 723dc91cb1797a..93586fc2196954 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -11042,7 +11042,6 @@ class OperationalCertStatus(IntEnum): kMissingCsr = 0x04 kTableFull = 0x05 kInvalidAdminSubject = 0x06 - kInsufficientPrivilege = 0x08 kFabricConflict = 0x09 kLabelConflict = 0x0A kInvalidFabricIndex = 0x0B diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index e4dfadf90d0544..cd23e90e68d856 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -22492,7 +22492,6 @@ typedef NS_ENUM(uint8_t, MTROperationalCredentialsOperationalCertStatus) { MTROperationalCredentialsOperationalCertStatusMissingCsr = 0x04, MTROperationalCredentialsOperationalCertStatusTableFull = 0x05, MTROperationalCredentialsOperationalCertStatusInvalidAdminSubject = 0x06, - MTROperationalCredentialsOperationalCertStatusInsufficientPrivilege = 0x08, MTROperationalCredentialsOperationalCertStatusFabricConflict = 0x09, MTROperationalCredentialsOperationalCertStatusLabelConflict = 0x0A, MTROperationalCredentialsOperationalCertStatusInvalidFabricIndex = 0x0B, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 2bca6b715cf75d..441c044b5d65d3 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -1020,7 +1020,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OperationalCredentials: case EnumType::kMissingCsr: case EnumType::kTableFull: case EnumType::kInvalidAdminSubject: - case EnumType::kInsufficientPrivilege: case EnumType::kFabricConflict: case EnumType::kLabelConflict: case EnumType::kInvalidFabricIndex: diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 10a067fc1e3b53..828bece6f247ec 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -934,18 +934,17 @@ namespace OperationalCredentials { // Enum for OperationalCertStatus enum class OperationalCertStatus : uint8_t { - kSuccess = 0x00, - kInvalidPublicKey = 0x01, - kInvalidNodeOpId = 0x02, - kInvalidNOC = 0x03, - kMissingCsr = 0x04, - kTableFull = 0x05, - kInvalidAdminSubject = 0x06, - kInsufficientPrivilege = 0x08, - kFabricConflict = 0x09, - kLabelConflict = 0x0A, - kInvalidFabricIndex = 0x0B, - kUnknownEnumValue = 7, + kSuccess = 0x00, + kInvalidPublicKey = 0x01, + kInvalidNodeOpId = 0x02, + kInvalidNOC = 0x03, + kMissingCsr = 0x04, + kTableFull = 0x05, + kInvalidAdminSubject = 0x06, + kFabricConflict = 0x09, + kLabelConflict = 0x0A, + kInvalidFabricIndex = 0x0B, + kUnknownEnumValue = 7, }; } // namespace OperationalCredentials