Skip to content

Commit 806f163

Browse files
gmarcosbgmarcosb
committed
Generated using ./scripts/tools/zap_regen_all.py
1 parent f633bc9 commit 806f163

File tree

151 files changed

+7561
-2974
lines changed

Some content is hidden

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

151 files changed

+7561
-2974
lines changed

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

+48-23
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
213213
}
214214

215215
enum ThreeLevelAutoEnum : enum8 {
216-
kLow = 0;
217-
kMedium = 1;
218-
kHigh = 2;
219-
kAutomatic = 3;
216+
kAuto = 0;
217+
kLow = 1;
218+
kMedium = 2;
219+
kHigh = 3;
220220
}
221221

222222
bitmap TestGlobalBitmap : bitmap32 {
@@ -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;
@@ -1217,6 +1217,8 @@ cluster OperationalCredentials = 62 {
12171217
kMissingCsr = 4;
12181218
kTableFull = 5;
12191219
kInvalidAdminSubject = 6;
1220+
kReservedForFutureUse = 7;
1221+
kReservedForFutureUse = 8;
12201222
kFabricConflict = 9;
12211223
kLabelConflict = 10;
12221224
kInvalidFabricIndex = 11;
@@ -1228,12 +1230,14 @@ cluster OperationalCredentials = 62 {
12281230
fabric_id fabricID = 3;
12291231
node_id nodeID = 4;
12301232
char_string<32> label = 5;
1233+
optional octet_string<85> vidVerificationStatement = 6;
12311234
fabric_idx fabricIndex = 254;
12321235
}
12331236

12341237
fabric_scoped struct NOCStruct {
1235-
fabric_sensitive octet_string noc = 1;
1236-
nullable fabric_sensitive octet_string icac = 2;
1238+
long_octet_string<400> noc = 1;
1239+
nullable long_octet_string<400> icac = 2;
1240+
optional long_octet_string<400> vvsc = 3;
12371241
fabric_idx fabricIndex = 254;
12381242
}
12391243

@@ -1255,7 +1259,7 @@ cluster OperationalCredentials = 62 {
12551259
}
12561260

12571261
response struct AttestationResponse = 1 {
1258-
octet_string<900> attestationElements = 0;
1262+
octet_string attestationElements = 0;
12591263
octet_string<64> attestationSignature = 1;
12601264
}
12611265

@@ -1264,7 +1268,7 @@ cluster OperationalCredentials = 62 {
12641268
}
12651269

12661270
response struct CertificateChainResponse = 3 {
1267-
octet_string<600> certificate = 0;
1271+
long_octet_string<600> certificate = 0;
12681272
}
12691273

12701274
request struct CSRRequestRequest {
@@ -1274,20 +1278,20 @@ cluster OperationalCredentials = 62 {
12741278

12751279
response struct CSRResponse = 5 {
12761280
octet_string NOCSRElements = 0;
1277-
octet_string attestationSignature = 1;
1281+
octet_string<64> attestationSignature = 1;
12781282
}
12791283

12801284
request struct AddNOCRequest {
1281-
octet_string<400> NOCValue = 0;
1282-
optional octet_string<400> ICACValue = 1;
1285+
long_octet_string<400> NOCValue = 0;
1286+
optional long_octet_string<400> ICACValue = 1;
12831287
octet_string<16> IPKValue = 2;
12841288
int64u caseAdminSubject = 3;
12851289
vendor_id adminVendorId = 4;
12861290
}
12871291

12881292
request struct UpdateNOCRequest {
1289-
octet_string NOCValue = 0;
1290-
optional octet_string ICACValue = 1;
1293+
long_octet_string<400> NOCValue = 0;
1294+
optional long_octet_string<400> ICACValue = 1;
12911295
}
12921296

12931297
response struct NOCResponse = 8 {
@@ -1305,25 +1309,46 @@ cluster OperationalCredentials = 62 {
13051309
}
13061310

13071311
request struct AddTrustedRootCertificateRequest {
1308-
octet_string rootCACertificate = 0;
1312+
long_octet_string<400> rootCACertificate = 0;
1313+
}
1314+
1315+
request struct SetVidVerificationStatementRequest {
1316+
optional vendor_id vendorID = 0;
1317+
optional octet_string<85> vidVerificationStatement = 1;
1318+
optional long_octet_string<400> vvsc = 2;
1319+
}
1320+
1321+
request struct SignVidVerificationRequestRequest {
1322+
fabric_idx fabricIndex = 0;
1323+
octet_string<32> clientChallenge = 1;
1324+
}
1325+
1326+
response struct SignVidVerificationResponse = 14 {
1327+
fabric_idx fabricIndex = 0;
1328+
int8u fabricBindingVersion = 1;
1329+
octet_string signature = 2;
13091330
}
13101331

1311-
/** Sender is requesting attestation information from the receiver. */
1332+
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
13121333
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1313-
/** Sender is requesting a device attestation certificate from the receiver. */
1334+
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
13141335
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1315-
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
1336+
/** This command SHALL be generated to execute the Node Operational CSR Procedure and subsequently return the NOCSR Information, in the form of a CSRResponse Command. */
13161337
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1317-
/** Sender is requesting to add the new node operational certificates. */
1338+
/** This command SHALL add a new NOC chain to the device and commission a new Fabric association upon successful validation of all arguments and preconditions. */
13181339
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1319-
/** Sender is requesting to update the node operational certificates. */
1340+
/** 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. */
13201341
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
1321-
/** 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. */
1342+
/** This command SHALL be used by an Administrator to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
13221343
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1323-
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
1344+
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
13241345
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1325-
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
1346+
/** This command SHALL add a Trusted Root CA Certificate, provided as its Matter Certificate Encoding representation, to the TrustedRootCertificates Attribute list and SHALL ensure the next AddNOC command executed uses the provided certificate as its root of trust. */
13261347
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1348+
/** This command SHALL be used to one or many of the following: */
1349+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1350+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given by generating the response described in Fabric Table Vendor ID Verification Procedure. */
1351+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
13271352
}
13281353

13291354
/** 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

+48-23
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ enum TestGlobalEnum : enum8 {
213213
}
214214

215215
enum ThreeLevelAutoEnum : enum8 {
216-
kLow = 0;
217-
kMedium = 1;
218-
kHigh = 2;
219-
kAutomatic = 3;
216+
kAuto = 0;
217+
kLow = 1;
218+
kMedium = 2;
219+
kHigh = 3;
220220
}
221221

222222
bitmap TestGlobalBitmap : bitmap32 {
@@ -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;
@@ -1492,6 +1492,8 @@ cluster OperationalCredentials = 62 {
14921492
kMissingCsr = 4;
14931493
kTableFull = 5;
14941494
kInvalidAdminSubject = 6;
1495+
kReservedForFutureUse = 7;
1496+
kReservedForFutureUse = 8;
14951497
kFabricConflict = 9;
14961498
kLabelConflict = 10;
14971499
kInvalidFabricIndex = 11;
@@ -1503,12 +1505,14 @@ cluster OperationalCredentials = 62 {
15031505
fabric_id fabricID = 3;
15041506
node_id nodeID = 4;
15051507
char_string<32> label = 5;
1508+
optional octet_string<85> vidVerificationStatement = 6;
15061509
fabric_idx fabricIndex = 254;
15071510
}
15081511

15091512
fabric_scoped struct NOCStruct {
1510-
fabric_sensitive octet_string noc = 1;
1511-
nullable fabric_sensitive octet_string icac = 2;
1513+
long_octet_string<400> noc = 1;
1514+
nullable long_octet_string<400> icac = 2;
1515+
optional long_octet_string<400> vvsc = 3;
15121516
fabric_idx fabricIndex = 254;
15131517
}
15141518

@@ -1530,7 +1534,7 @@ cluster OperationalCredentials = 62 {
15301534
}
15311535

15321536
response struct AttestationResponse = 1 {
1533-
octet_string<900> attestationElements = 0;
1537+
octet_string attestationElements = 0;
15341538
octet_string<64> attestationSignature = 1;
15351539
}
15361540

@@ -1539,7 +1543,7 @@ cluster OperationalCredentials = 62 {
15391543
}
15401544

15411545
response struct CertificateChainResponse = 3 {
1542-
octet_string<600> certificate = 0;
1546+
long_octet_string<600> certificate = 0;
15431547
}
15441548

15451549
request struct CSRRequestRequest {
@@ -1549,20 +1553,20 @@ cluster OperationalCredentials = 62 {
15491553

15501554
response struct CSRResponse = 5 {
15511555
octet_string NOCSRElements = 0;
1552-
octet_string attestationSignature = 1;
1556+
octet_string<64> attestationSignature = 1;
15531557
}
15541558

15551559
request struct AddNOCRequest {
1556-
octet_string<400> NOCValue = 0;
1557-
optional octet_string<400> ICACValue = 1;
1560+
long_octet_string<400> NOCValue = 0;
1561+
optional long_octet_string<400> ICACValue = 1;
15581562
octet_string<16> IPKValue = 2;
15591563
int64u caseAdminSubject = 3;
15601564
vendor_id adminVendorId = 4;
15611565
}
15621566

15631567
request struct UpdateNOCRequest {
1564-
octet_string NOCValue = 0;
1565-
optional octet_string ICACValue = 1;
1568+
long_octet_string<400> NOCValue = 0;
1569+
optional long_octet_string<400> ICACValue = 1;
15661570
}
15671571

15681572
response struct NOCResponse = 8 {
@@ -1580,25 +1584,46 @@ cluster OperationalCredentials = 62 {
15801584
}
15811585

15821586
request struct AddTrustedRootCertificateRequest {
1583-
octet_string rootCACertificate = 0;
1587+
long_octet_string<400> rootCACertificate = 0;
1588+
}
1589+
1590+
request struct SetVidVerificationStatementRequest {
1591+
optional vendor_id vendorID = 0;
1592+
optional octet_string<85> vidVerificationStatement = 1;
1593+
optional long_octet_string<400> vvsc = 2;
1594+
}
1595+
1596+
request struct SignVidVerificationRequestRequest {
1597+
fabric_idx fabricIndex = 0;
1598+
octet_string<32> clientChallenge = 1;
1599+
}
1600+
1601+
response struct SignVidVerificationResponse = 14 {
1602+
fabric_idx fabricIndex = 0;
1603+
int8u fabricBindingVersion = 1;
1604+
octet_string signature = 2;
15841605
}
15851606

1586-
/** Sender is requesting attestation information from the receiver. */
1607+
/** This command SHALL be generated to request the Attestation Information, in the form of an AttestationResponse Command. */
15871608
command access(invoke: administer) AttestationRequest(AttestationRequestRequest): AttestationResponse = 0;
1588-
/** Sender is requesting a device attestation certificate from the receiver. */
1609+
/** If the CertificateType is not a valid value per CertificateChainTypeEnum then the command SHALL fail with a Status Code of INVALID_COMMAND. */
15891610
command access(invoke: administer) CertificateChainRequest(CertificateChainRequestRequest): CertificateChainResponse = 2;
1590-
/** Sender is requesting a certificate signing request (CSR) from the receiver. */
1611+
/** This command SHALL be generated to execute the Node Operational CSR Procedure and subsequently return the NOCSR Information, in the form of a CSRResponse Command. */
15911612
command access(invoke: administer) CSRRequest(CSRRequestRequest): CSRResponse = 4;
1592-
/** Sender is requesting to add the new node operational certificates. */
1613+
/** This command SHALL add a new NOC chain to the device and commission a new Fabric association upon successful validation of all arguments and preconditions. */
15931614
command access(invoke: administer) AddNOC(AddNOCRequest): NOCResponse = 6;
1594-
/** Sender is requesting to update the node operational certificates. */
1615+
/** 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. */
15951616
fabric command access(invoke: administer) UpdateNOC(UpdateNOCRequest): NOCResponse = 7;
1596-
/** 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. */
1617+
/** This command SHALL be used by an Administrator to set the user-visible Label field for a given Fabric, as reflected by entries in the Fabrics attribute. */
15971618
fabric command access(invoke: administer) UpdateFabricLabel(UpdateFabricLabelRequest): NOCResponse = 9;
1598-
/** This command is used by Administrative Nodes to remove a given fabric index and delete all associated fabric-scoped data. */
1619+
/** This command is used by Administrators to remove a given Fabric and delete all associated fabric-scoped data. */
15991620
command access(invoke: administer) RemoveFabric(RemoveFabricRequest): NOCResponse = 10;
1600-
/** This command SHALL add a Trusted Root CA Certificate, provided as its CHIP Certificate representation. */
1621+
/** This command SHALL add a Trusted Root CA Certificate, provided as its Matter Certificate Encoding representation, to the TrustedRootCertificates Attribute list and SHALL ensure the next AddNOC command executed uses the provided certificate as its root of trust. */
16011622
command access(invoke: administer) AddTrustedRootCertificate(AddTrustedRootCertificateRequest): DefaultSuccess = 11;
1623+
/** This command SHALL be used to one or many of the following: */
1624+
fabric command access(invoke: administer) SetVidVerificationStatement(SetVidVerificationStatementRequest): DefaultSuccess = 12;
1625+
/** This command SHALL be used to request that the server authenticate the fabric associated with the FabricIndex given by generating the response described in Fabric Table Vendor ID Verification Procedure. */
1626+
command access(invoke: administer) SignVidVerificationRequest(SignVidVerificationRequestRequest): SignVidVerificationResponse = 13;
16021627
}
16031628

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

0 commit comments

Comments
 (0)