Skip to content

Commit 7d04796

Browse files
tcarmelveilleuxtcarmelveilleux
authored
Fix capitalization of VidVerification to VIDVerification (#38100)
* Update VidVerification->VIDVerification in ZAP XML * ZAP Regen * Run alchemy * Regen zap
1 parent afad586 commit 7d04796

File tree

145 files changed

+2431
-2439
lines changed

Some content is hidden

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

145 files changed

+2431
-2439
lines changed

‎examples/air-purifier-app/air-purifier-common/air-purifier-app.matter

+18-18
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@ cluster AdministratorCommissioning = 60 {
12021202

12031203
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
12041204
cluster OperationalCredentials = 62 {
1205-
revision 1; // NOTE: Default/not specifically set
1205+
revision 2;
12061206

12071207
enum CertificateChainTypeEnum : enum8 {
12081208
kDACCertificate = 1;
@@ -1228,14 +1228,14 @@ cluster OperationalCredentials = 62 {
12281228
fabric_id fabricID = 3;
12291229
node_id nodeID = 4;
12301230
char_string<32> label = 5;
1231-
optional octet_string<85> vidVerificationStatement = 6;
1231+
optional octet_string<85> VIDVerificationStatement = 6;
12321232
fabric_idx fabricIndex = 254;
12331233
}
12341234

12351235
fabric_scoped struct NOCStruct {
1236-
octet_string noc = 1;
1237-
nullable octet_string icac = 2;
1238-
optional octet_string vvsc = 3;
1236+
octet_string<400> noc = 1;
1237+
nullable octet_string<400> icac = 2;
1238+
optional octet_string<400> vvsc = 3;
12391239
fabric_idx fabricIndex = 254;
12401240
}
12411241

@@ -1257,7 +1257,7 @@ cluster OperationalCredentials = 62 {
12571257
}
12581258

12591259
response struct AttestationResponse = 1 {
1260-
octet_string<900> attestationElements = 0;
1260+
octet_string attestationElements = 0;
12611261
octet_string<64> attestationSignature = 1;
12621262
}
12631263

@@ -1276,7 +1276,7 @@ cluster OperationalCredentials = 62 {
12761276

12771277
response struct CSRResponse = 5 {
12781278
octet_string NOCSRElements = 0;
1279-
octet_string attestationSignature = 1;
1279+
octet_string<64> attestationSignature = 1;
12801280
}
12811281

12821282
request struct AddNOCRequest {
@@ -1288,8 +1288,8 @@ cluster OperationalCredentials = 62 {
12881288
}
12891289

12901290
request struct UpdateNOCRequest {
1291-
octet_string NOCValue = 0;
1292-
optional octet_string ICACValue = 1;
1291+
octet_string<400> NOCValue = 0;
1292+
optional octet_string<400> ICACValue = 1;
12931293
}
12941294

12951295
response struct NOCResponse = 8 {
@@ -1307,21 +1307,21 @@ cluster OperationalCredentials = 62 {
13071307
}
13081308

13091309
request struct AddTrustedRootCertificateRequest {
1310-
octet_string rootCACertificate = 0;
1310+
octet_string<400> rootCACertificate = 0;
13111311
}
13121312

1313-
request struct SetVidVerificationStatementRequest {
1313+
request struct SetVIDVerificationStatementRequest {
13141314
optional vendor_id vendorID = 0;
1315-
optional octet_string vidVerificationStatement = 1;
1316-
optional octet_string vvsc = 2;
1315+
optional octet_string<85> VIDVerificationStatement = 1;
1316+
optional octet_string<400> vvsc = 2;
13171317
}
13181318

1319-
request struct SignVidVerificationRequestRequest {
1319+
request struct SignVIDVerificationRequestRequest {
13201320
fabric_idx fabricIndex = 0;
13211321
octet_string<32> clientChallenge = 1;
13221322
}
13231323

1324-
response struct SignVidVerificationResponse = 14 {
1324+
response struct SignVIDVerificationResponse = 14 {
13251325
fabric_idx fabricIndex = 0;
13261326
int8u fabricBindingVersion = 1;
13271327
octet_string signature = 2;
@@ -1335,7 +1335,7 @@ cluster OperationalCredentials = 62 {
13351335
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
13361336
/** Sender is requesting to add the new node operational certificates. */
13371337
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1338-
/** Sender is requesting to update the node operational certificates. */
1338+
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
13391339
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
13401340
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
13411341
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
@@ -1344,9 +1344,9 @@ cluster OperationalCredentials = 62 {
13441344
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
13451345
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
13461346
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1347-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1347+
fabric command access(invoke: administer) SetVIDVerificationStatement(SetVIDVerificationStatementRequest): DefaultSuccess = 12;
13481348
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1349-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
1349+
command access(invoke: administer) SignVIDVerificationRequest(SignVIDVerificationRequestRequest): SignVIDVerificationResponse = 13;
13501350
}
13511351

13521352
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

‎examples/air-quality-sensor-app/air-quality-sensor-common/air-quality-sensor-app.matter

+18-18
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ cluster AdministratorCommissioning = 60 {
14771477

14781478
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
14791479
cluster OperationalCredentials = 62 {
1480-
revision 1; // NOTE: Default/not specifically set
1480+
revision 2;
14811481

14821482
enum CertificateChainTypeEnum : enum8 {
14831483
kDACCertificate = 1;
@@ -1503,14 +1503,14 @@ cluster OperationalCredentials = 62 {
15031503
fabric_id fabricID = 3;
15041504
node_id nodeID = 4;
15051505
char_string<32> label = 5;
1506-
optional octet_string<85> vidVerificationStatement = 6;
1506+
optional octet_string<85> VIDVerificationStatement = 6;
15071507
fabric_idx fabricIndex = 254;
15081508
}
15091509

15101510
fabric_scoped struct NOCStruct {
1511-
octet_string noc = 1;
1512-
nullable octet_string icac = 2;
1513-
optional octet_string vvsc = 3;
1511+
octet_string<400> noc = 1;
1512+
nullable octet_string<400> icac = 2;
1513+
optional octet_string<400> vvsc = 3;
15141514
fabric_idx fabricIndex = 254;
15151515
}
15161516

@@ -1532,7 +1532,7 @@ cluster OperationalCredentials = 62 {
15321532
}
15331533

15341534
response struct AttestationResponse = 1 {
1535-
octet_string<900> attestationElements = 0;
1535+
octet_string attestationElements = 0;
15361536
octet_string<64> attestationSignature = 1;
15371537
}
15381538

@@ -1551,7 +1551,7 @@ cluster OperationalCredentials = 62 {
15511551

15521552
response struct CSRResponse = 5 {
15531553
octet_string NOCSRElements = 0;
1554-
octet_string attestationSignature = 1;
1554+
octet_string<64> attestationSignature = 1;
15551555
}
15561556

15571557
request struct AddNOCRequest {
@@ -1563,8 +1563,8 @@ cluster OperationalCredentials = 62 {
15631563
}
15641564

15651565
request struct UpdateNOCRequest {
1566-
octet_string NOCValue = 0;
1567-
optional octet_string ICACValue = 1;
1566+
octet_string<400> NOCValue = 0;
1567+
optional octet_string<400> ICACValue = 1;
15681568
}
15691569

15701570
response struct NOCResponse = 8 {
@@ -1582,21 +1582,21 @@ cluster OperationalCredentials = 62 {
15821582
}
15831583

15841584
request struct AddTrustedRootCertificateRequest {
1585-
octet_string rootCACertificate = 0;
1585+
octet_string<400> rootCACertificate = 0;
15861586
}
15871587

1588-
request struct SetVidVerificationStatementRequest {
1588+
request struct SetVIDVerificationStatementRequest {
15891589
optional vendor_id vendorID = 0;
1590-
optional octet_string vidVerificationStatement = 1;
1591-
optional octet_string vvsc = 2;
1590+
optional octet_string<85> VIDVerificationStatement = 1;
1591+
optional octet_string<400> vvsc = 2;
15921592
}
15931593

1594-
request struct SignVidVerificationRequestRequest {
1594+
request struct SignVIDVerificationRequestRequest {
15951595
fabric_idx fabricIndex = 0;
15961596
octet_string<32> clientChallenge = 1;
15971597
}
15981598

1599-
response struct SignVidVerificationResponse = 14 {
1599+
response struct SignVIDVerificationResponse = 14 {
16001600
fabric_idx fabricIndex = 0;
16011601
int8u fabricBindingVersion = 1;
16021602
octet_string signature = 2;
@@ -1610,7 +1610,7 @@ cluster OperationalCredentials = 62 {
16101610
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
16111611
/** Sender is requesting to add the new node operational certificates. */
16121612
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1613-
/** Sender is requesting to update the node operational certificates. */
1613+
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
16141614
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
16151615
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
16161616
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
@@ -1619,9 +1619,9 @@ cluster OperationalCredentials = 62 {
16191619
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
16201620
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
16211621
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
1622-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1622+
fabric command access(invoke: administer) SetVIDVerificationStatement(SetVIDVerificationStatementRequest): DefaultSuccess = 12;
16231623
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
1624-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
1624+
command access(invoke: administer) SignVIDVerificationRequest(SignVIDVerificationRequestRequest): SignVIDVerificationResponse = 13;
16251625
}
16261626

16271627
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

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

+18-18
Original file line numberDiff line numberDiff line change
@@ -2631,7 +2631,7 @@ cluster AdministratorCommissioning = 60 {
26312631

26322632
/** This cluster is used to add or remove Operational Credentials on a Commissionee or Node, as well as manage the associated Fabrics. */
26332633
cluster OperationalCredentials = 62 {
2634-
revision 1; // NOTE: Default/not specifically set
2634+
revision 2;
26352635

26362636
enum CertificateChainTypeEnum : enum8 {
26372637
kDACCertificate = 1;
@@ -2657,14 +2657,14 @@ cluster OperationalCredentials = 62 {
26572657
fabric_id fabricID = 3;
26582658
node_id nodeID = 4;
26592659
char_string<32> label = 5;
2660-
optional octet_string<85> vidVerificationStatement = 6;
2660+
optional octet_string<85> VIDVerificationStatement = 6;
26612661
fabric_idx fabricIndex = 254;
26622662
}
26632663

26642664
fabric_scoped struct NOCStruct {
2665-
octet_string noc = 1;
2666-
nullable octet_string icac = 2;
2667-
optional octet_string vvsc = 3;
2665+
octet_string<400> noc = 1;
2666+
nullable octet_string<400> icac = 2;
2667+
optional octet_string<400> vvsc = 3;
26682668
fabric_idx fabricIndex = 254;
26692669
}
26702670

@@ -2686,7 +2686,7 @@ cluster OperationalCredentials = 62 {
26862686
}
26872687

26882688
response struct AttestationResponse = 1 {
2689-
octet_string<900> attestationElements = 0;
2689+
octet_string attestationElements = 0;
26902690
octet_string<64> attestationSignature = 1;
26912691
}
26922692

@@ -2705,7 +2705,7 @@ cluster OperationalCredentials = 62 {
27052705

27062706
response struct CSRResponse = 5 {
27072707
octet_string NOCSRElements = 0;
2708-
octet_string attestationSignature = 1;
2708+
octet_string<64> attestationSignature = 1;
27092709
}
27102710

27112711
request struct AddNOCRequest {
@@ -2717,8 +2717,8 @@ cluster OperationalCredentials = 62 {
27172717
}
27182718

27192719
request struct UpdateNOCRequest {
2720-
octet_string NOCValue = 0;
2721-
optional octet_string ICACValue = 1;
2720+
octet_string<400> NOCValue = 0;
2721+
optional octet_string<400> ICACValue = 1;
27222722
}
27232723

27242724
response struct NOCResponse = 8 {
@@ -2736,21 +2736,21 @@ cluster OperationalCredentials = 62 {
27362736
}
27372737

27382738
request struct AddTrustedRootCertificateRequest {
2739-
octet_string rootCACertificate = 0;
2739+
octet_string<400> rootCACertificate = 0;
27402740
}
27412741

2742-
request struct SetVidVerificationStatementRequest {
2742+
request struct SetVIDVerificationStatementRequest {
27432743
optional vendor_id vendorID = 0;
2744-
optional octet_string vidVerificationStatement = 1;
2745-
optional octet_string vvsc = 2;
2744+
optional octet_string<85> VIDVerificationStatement = 1;
2745+
optional octet_string<400> vvsc = 2;
27462746
}
27472747

2748-
request struct SignVidVerificationRequestRequest {
2748+
request struct SignVIDVerificationRequestRequest {
27492749
fabric_idx fabricIndex = 0;
27502750
octet_string<32> clientChallenge = 1;
27512751
}
27522752

2753-
response struct SignVidVerificationResponse = 14 {
2753+
response struct SignVIDVerificationResponse = 14 {
27542754
fabric_idx fabricIndex = 0;
27552755
int8u fabricBindingVersion = 1;
27562756
octet_string signature = 2;
@@ -2764,7 +2764,7 @@ cluster OperationalCredentials = 62 {
27642764
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
27652765
/** Sender is requesting to add the new node operational certificates. */
27662766
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
2767-
/** Sender is requesting to update the node operational certificates. */
2767+
/** This command SHALL replace the NOC and optional associated ICAC (if present) scoped under the accessing fabric upon successful validation of all arguments and preconditions. */
27682768
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
27692769
/** This command SHALL be used by an Administrative Node to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
27702770
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
@@ -2773,9 +2773,9 @@ cluster OperationalCredentials = 62 {
27732773
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
27742774
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
27752775
/** This command SHALL be used to update any of the accessing fabric's associated VendorID, VidVerificatioNStatement or VVSC (Vendor Verification Signing Certificate). */
2776-
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
2776+
fabric command access(invoke: administer) SetVIDVerificationStatement(SetVIDVerificationStatementRequest): DefaultSuccess = 12;
27772777
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given. */
2778-
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
2778+
command access(invoke: administer) SignVIDVerificationRequest(SignVIDVerificationRequestRequest): SignVIDVerificationResponse = 13;
27792779
}
27802780

27812781
/** The Group Key Management Cluster is the mechanism by which group keys are managed. */

0 commit comments

Comments
 (0)