Skip to content

Commit 1304210

Browse files
bzbarsky-applepull[bot]
authored andcommitted
Align naming in Administrator Commissioning cluster XML with the spec. (#24318)
* Align naming in Administrator Commissioning cluster XML with the spec. * Regenerate generated code.
1 parent 1cf551d commit 1304210

File tree

67 files changed

+154
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+154
-124
lines changed

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ server cluster AdministratorCommissioning = 60 {
15611561

15621562
request struct OpenCommissioningWindowRequest {
15631563
INT16U commissioningTimeout = 0;
1564-
OCTET_STRING PAKEVerifier = 1;
1564+
OCTET_STRING PAKEPasscodeVerifier = 1;
15651565
INT16U discriminator = 2;
15661566
INT32U iterations = 3;
15671567
OCTET_STRING salt = 4;

examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1411,7 +1411,7 @@ server cluster AdministratorCommissioning = 60 {
14111411

14121412
request struct OpenCommissioningWindowRequest {
14131413
INT16U commissioningTimeout = 0;
1414-
OCTET_STRING PAKEVerifier = 1;
1414+
OCTET_STRING PAKEPasscodeVerifier = 1;
14151415
INT16U discriminator = 2;
14161416
INT32U iterations = 3;
14171417
OCTET_STRING salt = 4;

examples/bridge-app/bridge-common/bridge-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 {
12361236

12371237
request struct OpenCommissioningWindowRequest {
12381238
INT16U commissioningTimeout = 0;
1239-
OCTET_STRING PAKEVerifier = 1;
1239+
OCTET_STRING PAKEPasscodeVerifier = 1;
12401240
INT16U discriminator = 2;
12411241
INT32U iterations = 3;
12421242
OCTET_STRING salt = 4;

examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ server cluster AdministratorCommissioning = 60 {
10881088

10891089
request struct OpenCommissioningWindowRequest {
10901090
INT16U commissioningTimeout = 0;
1091-
OCTET_STRING PAKEVerifier = 1;
1091+
OCTET_STRING PAKEPasscodeVerifier = 1;
10921092
INT16U discriminator = 2;
10931093
INT32U iterations = 3;
10941094
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ server cluster AdministratorCommissioning = 60 {
907907

908908
request struct OpenCommissioningWindowRequest {
909909
INT16U commissioningTimeout = 0;
910-
OCTET_STRING PAKEVerifier = 1;
910+
OCTET_STRING PAKEPasscodeVerifier = 1;
911911
INT16U discriminator = 2;
912912
INT32U iterations = 3;
913913
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {
823823

824824
request struct OpenCommissioningWindowRequest {
825825
INT16U commissioningTimeout = 0;
826-
OCTET_STRING PAKEVerifier = 1;
826+
OCTET_STRING PAKEPasscodeVerifier = 1;
827827
INT16U discriminator = 2;
828828
INT32U iterations = 3;
829829
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {
972972

973973
request struct OpenCommissioningWindowRequest {
974974
INT16U commissioningTimeout = 0;
975-
OCTET_STRING PAKEVerifier = 1;
975+
OCTET_STRING PAKEPasscodeVerifier = 1;
976976
INT16U discriminator = 2;
977977
INT32U iterations = 3;
978978
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {
823823

824824
request struct OpenCommissioningWindowRequest {
825825
INT16U commissioningTimeout = 0;
826-
OCTET_STRING PAKEVerifier = 1;
826+
OCTET_STRING PAKEPasscodeVerifier = 1;
827827
INT16U discriminator = 2;
828828
INT32U iterations = 3;
829829
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {
972972

973973
request struct OpenCommissioningWindowRequest {
974974
INT16U commissioningTimeout = 0;
975-
OCTET_STRING PAKEVerifier = 1;
975+
OCTET_STRING PAKEPasscodeVerifier = 1;
976976
INT16U discriminator = 2;
977977
INT32U iterations = 3;
978978
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_fan_7N2TobIlOX.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ server cluster AdministratorCommissioning = 60 {
827827

828828
request struct OpenCommissioningWindowRequest {
829829
INT16U commissioningTimeout = 0;
830-
OCTET_STRING PAKEVerifier = 1;
830+
OCTET_STRING PAKEPasscodeVerifier = 1;
831831
INT16U discriminator = 2;
832832
INT32U iterations = 3;
833833
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {
836836

837837
request struct OpenCommissioningWindowRequest {
838838
INT16U commissioningTimeout = 0;
839-
OCTET_STRING PAKEVerifier = 1;
839+
OCTET_STRING PAKEPasscodeVerifier = 1;
840840
INT16U discriminator = 2;
841841
INT32U iterations = 3;
842842
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ server cluster AdministratorCommissioning = 60 {
965965

966966
request struct OpenCommissioningWindowRequest {
967967
INT16U commissioningTimeout = 0;
968-
OCTET_STRING PAKEVerifier = 1;
968+
OCTET_STRING PAKEPasscodeVerifier = 1;
969969
INT16U discriminator = 2;
970970
INT32U iterations = 3;
971971
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {
836836

837837
request struct OpenCommissioningWindowRequest {
838838
INT16U commissioningTimeout = 0;
839-
OCTET_STRING PAKEVerifier = 1;
839+
OCTET_STRING PAKEPasscodeVerifier = 1;
840840
INT16U discriminator = 2;
841841
INT32U iterations = 3;
842842
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {
836836

837837
request struct OpenCommissioningWindowRequest {
838838
INT16U commissioningTimeout = 0;
839-
OCTET_STRING PAKEVerifier = 1;
839+
OCTET_STRING PAKEPasscodeVerifier = 1;
840840
INT16U discriminator = 2;
841841
INT32U iterations = 3;
842842
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {
836836

837837
request struct OpenCommissioningWindowRequest {
838838
INT16U commissioningTimeout = 0;
839-
OCTET_STRING PAKEVerifier = 1;
839+
OCTET_STRING PAKEPasscodeVerifier = 1;
840840
INT16U discriminator = 2;
841841
INT32U iterations = 3;
842842
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ server cluster AdministratorCommissioning = 60 {
972972

973973
request struct OpenCommissioningWindowRequest {
974974
INT16U commissioningTimeout = 0;
975-
OCTET_STRING PAKEVerifier = 1;
975+
OCTET_STRING PAKEPasscodeVerifier = 1;
976976
INT16U discriminator = 2;
977977
INT32U iterations = 3;
978978
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ server cluster AdministratorCommissioning = 60 {
915915

916916
request struct OpenCommissioningWindowRequest {
917917
INT16U commissioningTimeout = 0;
918-
OCTET_STRING PAKEVerifier = 1;
918+
OCTET_STRING PAKEPasscodeVerifier = 1;
919919
INT16U discriminator = 2;
920920
INT32U iterations = 3;
921921
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ server cluster AdministratorCommissioning = 60 {
873873

874874
request struct OpenCommissioningWindowRequest {
875875
INT16U commissioningTimeout = 0;
876-
OCTET_STRING PAKEVerifier = 1;
876+
OCTET_STRING PAKEPasscodeVerifier = 1;
877877
INT16U discriminator = 2;
878878
INT32U iterations = 3;
879879
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ server cluster AdministratorCommissioning = 60 {
841841

842842
request struct OpenCommissioningWindowRequest {
843843
INT16U commissioningTimeout = 0;
844-
OCTET_STRING PAKEVerifier = 1;
844+
OCTET_STRING PAKEPasscodeVerifier = 1;
845845
INT16U discriminator = 2;
846846
INT32U iterations = 3;
847847
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ server cluster AdministratorCommissioning = 60 {
963963

964964
request struct OpenCommissioningWindowRequest {
965965
INT16U commissioningTimeout = 0;
966-
OCTET_STRING PAKEVerifier = 1;
966+
OCTET_STRING PAKEPasscodeVerifier = 1;
967967
INT16U discriminator = 2;
968968
INT32U iterations = 3;
969969
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ server cluster AdministratorCommissioning = 60 {
836836

837837
request struct OpenCommissioningWindowRequest {
838838
INT16U commissioningTimeout = 0;
839-
OCTET_STRING PAKEVerifier = 1;
839+
OCTET_STRING PAKEPasscodeVerifier = 1;
840840
INT16U discriminator = 2;
841841
INT32U iterations = 3;
842842
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {
823823

824824
request struct OpenCommissioningWindowRequest {
825825
INT16U commissioningTimeout = 0;
826-
OCTET_STRING PAKEVerifier = 1;
826+
OCTET_STRING PAKEPasscodeVerifier = 1;
827827
INT16U discriminator = 2;
828828
INT32U iterations = 3;
829829
OCTET_STRING salt = 4;

examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ server cluster AdministratorCommissioning = 60 {
823823

824824
request struct OpenCommissioningWindowRequest {
825825
INT16U commissioningTimeout = 0;
826-
OCTET_STRING PAKEVerifier = 1;
826+
OCTET_STRING PAKEPasscodeVerifier = 1;
827827
INT16U discriminator = 2;
828828
INT32U iterations = 3;
829829
OCTET_STRING salt = 4;

examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ server cluster AdministratorCommissioning = 60 {
10331033

10341034
request struct OpenCommissioningWindowRequest {
10351035
INT16U commissioningTimeout = 0;
1036-
OCTET_STRING PAKEVerifier = 1;
1036+
OCTET_STRING PAKEPasscodeVerifier = 1;
10371037
INT16U discriminator = 2;
10381038
INT32U iterations = 3;
10391039
OCTET_STRING salt = 4;

examples/dynamic-bridge-app/bridge-common/bridge-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,7 @@ server cluster AdministratorCommissioning = 60 {
12361236

12371237
request struct OpenCommissioningWindowRequest {
12381238
INT16U commissioningTimeout = 0;
1239-
OCTET_STRING PAKEVerifier = 1;
1239+
OCTET_STRING PAKEPasscodeVerifier = 1;
12401240
INT16U discriminator = 2;
12411241
INT32U iterations = 3;
12421242
OCTET_STRING salt = 4;

examples/light-switch-app/light-switch-common/light-switch-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ server cluster AdministratorCommissioning = 60 {
12831283

12841284
request struct OpenCommissioningWindowRequest {
12851285
INT16U commissioningTimeout = 0;
1286-
OCTET_STRING PAKEVerifier = 1;
1286+
OCTET_STRING PAKEPasscodeVerifier = 1;
12871287
INT16U discriminator = 2;
12881288
INT32U iterations = 3;
12891289
OCTET_STRING salt = 4;

examples/lighting-app/lighting-common/lighting-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 {
12341234

12351235
request struct OpenCommissioningWindowRequest {
12361236
INT16U commissioningTimeout = 0;
1237-
OCTET_STRING PAKEVerifier = 1;
1237+
OCTET_STRING PAKEPasscodeVerifier = 1;
12381238
INT16U discriminator = 2;
12391239
INT32U iterations = 3;
12401240
OCTET_STRING salt = 4;

examples/lighting-app/nxp/zap/lighting-on-off.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ server cluster AdministratorCommissioning = 60 {
10051005

10061006
request struct OpenCommissioningWindowRequest {
10071007
INT16U commissioningTimeout = 0;
1008-
OCTET_STRING PAKEVerifier = 1;
1008+
OCTET_STRING PAKEPasscodeVerifier = 1;
10091009
INT16U discriminator = 2;
10101010
INT32U iterations = 3;
10111011
OCTET_STRING salt = 4;

examples/lock-app/lock-common/lock-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ server cluster AdministratorCommissioning = 60 {
11071107

11081108
request struct OpenCommissioningWindowRequest {
11091109
INT16U commissioningTimeout = 0;
1110-
OCTET_STRING PAKEVerifier = 1;
1110+
OCTET_STRING PAKEPasscodeVerifier = 1;
11111111
INT16U discriminator = 2;
11121112
INT32U iterations = 3;
11131113
OCTET_STRING salt = 4;

examples/ota-provider-app/ota-provider-common/ota-provider-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ server cluster AdministratorCommissioning = 60 {
615615

616616
request struct OpenCommissioningWindowRequest {
617617
INT16U commissioningTimeout = 0;
618-
OCTET_STRING PAKEVerifier = 1;
618+
OCTET_STRING PAKEPasscodeVerifier = 1;
619619
INT16U discriminator = 2;
620620
INT32U iterations = 3;
621621
OCTET_STRING salt = 4;

examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ server cluster AdministratorCommissioning = 60 {
780780

781781
request struct OpenCommissioningWindowRequest {
782782
INT16U commissioningTimeout = 0;
783-
OCTET_STRING PAKEVerifier = 1;
783+
OCTET_STRING PAKEPasscodeVerifier = 1;
784784
INT16U discriminator = 2;
785785
INT32U iterations = 3;
786786
OCTET_STRING salt = 4;

examples/placeholder/linux/apps/app1/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ server cluster AdministratorCommissioning = 60 {
13111311

13121312
request struct OpenCommissioningWindowRequest {
13131313
INT16U commissioningTimeout = 0;
1314-
OCTET_STRING PAKEVerifier = 1;
1314+
OCTET_STRING PAKEPasscodeVerifier = 1;
13151315
INT16U discriminator = 2;
13161316
INT32U iterations = 3;
13171317
OCTET_STRING salt = 4;

examples/placeholder/linux/apps/app2/config.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ server cluster AdministratorCommissioning = 60 {
12881288

12891289
request struct OpenCommissioningWindowRequest {
12901290
INT16U commissioningTimeout = 0;
1291-
OCTET_STRING PAKEVerifier = 1;
1291+
OCTET_STRING PAKEPasscodeVerifier = 1;
12921292
INT16U discriminator = 2;
12931293
INT32U iterations = 3;
12941294
OCTET_STRING salt = 4;

examples/pump-app/pump-common/pump-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ server cluster AdministratorCommissioning = 60 {
894894

895895
request struct OpenCommissioningWindowRequest {
896896
INT16U commissioningTimeout = 0;
897-
OCTET_STRING PAKEVerifier = 1;
897+
OCTET_STRING PAKEPasscodeVerifier = 1;
898898
INT16U discriminator = 2;
899899
INT32U iterations = 3;
900900
OCTET_STRING salt = 4;

examples/pump-controller-app/pump-controller-common/pump-controller-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ server cluster AdministratorCommissioning = 60 {
793793

794794
request struct OpenCommissioningWindowRequest {
795795
INT16U commissioningTimeout = 0;
796-
OCTET_STRING PAKEVerifier = 1;
796+
OCTET_STRING PAKEPasscodeVerifier = 1;
797797
INT16U discriminator = 2;
798798
INT32U iterations = 3;
799799
OCTET_STRING salt = 4;

examples/temperature-measurement-app/esp32/main/temperature-measurement.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ server cluster AdministratorCommissioning = 60 {
628628

629629
request struct OpenCommissioningWindowRequest {
630630
INT16U commissioningTimeout = 0;
631-
OCTET_STRING PAKEVerifier = 1;
631+
OCTET_STRING PAKEPasscodeVerifier = 1;
632632
INT16U discriminator = 2;
633633
INT32U iterations = 3;
634634
OCTET_STRING salt = 4;

examples/thermostat/thermostat-common/thermostat.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ server cluster AdministratorCommissioning = 60 {
11871187

11881188
request struct OpenCommissioningWindowRequest {
11891189
INT16U commissioningTimeout = 0;
1190-
OCTET_STRING PAKEVerifier = 1;
1190+
OCTET_STRING PAKEPasscodeVerifier = 1;
11911191
INT16U discriminator = 2;
11921192
INT32U iterations = 3;
11931193
OCTET_STRING salt = 4;

examples/tv-app/tv-common/tv-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ server cluster AdministratorCommissioning = 60 {
12341234

12351235
request struct OpenCommissioningWindowRequest {
12361236
INT16U commissioningTimeout = 0;
1237-
OCTET_STRING PAKEVerifier = 1;
1237+
OCTET_STRING PAKEPasscodeVerifier = 1;
12381238
INT16U discriminator = 2;
12391239
INT32U iterations = 3;
12401240
OCTET_STRING salt = 4;

examples/tv-casting-app/tv-casting-common/tv-casting-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@ server cluster AdministratorCommissioning = 60 {
14511451

14521452
request struct OpenCommissioningWindowRequest {
14531453
INT16U commissioningTimeout = 0;
1454-
OCTET_STRING PAKEVerifier = 1;
1454+
OCTET_STRING PAKEPasscodeVerifier = 1;
14551455
INT16U discriminator = 2;
14561456
INT32U iterations = 3;
14571457
OCTET_STRING salt = 4;

examples/window-app/common/window-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ server cluster AdministratorCommissioning = 60 {
12461246

12471247
request struct OpenCommissioningWindowRequest {
12481248
INT16U commissioningTimeout = 0;
1249-
OCTET_STRING PAKEVerifier = 1;
1249+
OCTET_STRING PAKEPasscodeVerifier = 1;
12501250
INT16U discriminator = 2;
12511251
INT32U iterations = 3;
12521252
OCTET_STRING salt = 4;

src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(
8282
const Commands::OpenCommissioningWindow::DecodableType & commandData)
8383
{
8484
auto commissioningTimeout = System::Clock::Seconds16(commandData.commissioningTimeout);
85-
auto & pakeVerifier = commandData.PAKEVerifier;
85+
auto & pakeVerifier = commandData.PAKEPasscodeVerifier;
8686
auto & discriminator = commandData.discriminator;
8787
auto & iterations = commandData.iterations;
8888
auto & salt = commandData.salt;

0 commit comments

Comments
 (0)